From edfacbd0634228d2848943abf3bdc3bfa26acd54 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 26 Dec 2017 21:50:31 +0000
Subject: [PATCH] conda: ship runtime.elf in board-specific packages.

This is so that backtraces may be symbolized.
---
 artiq/firmware/runtime/lib.rs             | 3 ++-
 conda/artiq-kc705-nist_clock/build.sh     | 2 +-
 conda/artiq-kc705-nist_qc2/build.sh       | 2 +-
 conda/artiq-sayma_amc-standalone/build.sh | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/artiq/firmware/runtime/lib.rs b/artiq/firmware/runtime/lib.rs
index fba23d853..a8991557e 100644
--- a/artiq/firmware/runtime/lib.rs
+++ b/artiq/firmware/runtime/lib.rs
@@ -247,7 +247,8 @@ pub extern fn abort() {
 pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
     println!("panic at {}:{}: {}", file, line, args);
 
-    println!("backtrace:");
+    println!("backtrace for software version {}:",
+             include_str!(concat!(env!("OUT_DIR"), "/git-describe")));
     let _ = backtrace_artiq::backtrace(|ip| {
         println!("{:#08x}", ip);
     });
diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh
index f0275be02..880719a42 100644
--- a/conda/artiq-kc705-nist_clock/build.sh
+++ b/conda/artiq-kc705-nist_clock/build.sh
@@ -6,4 +6,4 @@ mkdir -p $SOC_PREFIX
 V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H nist_clock
 cp misoc_nist_clock_kc705/gateware/top.bit $SOC_PREFIX
 cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX
-cp misoc_nist_clock_kc705/software/runtime/runtime.fbi $SOC_PREFIX
+cp misoc_nist_clock_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh
index b60f39b3e..403045dfa 100644
--- a/conda/artiq-kc705-nist_qc2/build.sh
+++ b/conda/artiq-kc705-nist_qc2/build.sh
@@ -6,4 +6,4 @@ mkdir -p $SOC_PREFIX
 V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H nist_qc2
 cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX
 cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
-cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $SOC_PREFIX
+cp misoc_nist_qc2_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
diff --git a/conda/artiq-sayma_amc-standalone/build.sh b/conda/artiq-sayma_amc-standalone/build.sh
index aa116befb..f256da963 100644
--- a/conda/artiq-sayma_amc-standalone/build.sh
+++ b/conda/artiq-sayma_amc-standalone/build.sh
@@ -6,4 +6,4 @@ mkdir -p $SOC_PREFIX
 V=1 $PYTHON -m artiq.gateware.targets.sayma_amc_standalone --rtm-csr-csv $SP_DIR/artiq/binaries/sayma_rtm/sayma_rtm_csr.csv
 cp misoc_standalone_sayma_amc/gateware/top.bit $SOC_PREFIX
 cp misoc_standalone_sayma_amc/software/bios/bios.bin $SOC_PREFIX
-cp misoc_standalone_sayma_amc/software/runtime/runtime.fbi $SOC_PREFIX
+cp misoc_standalone_sayma_amc/software/runtime/runtime.{elf,fbi} $SOC_PREFIX