From e738d188f4fc00513ff9cc7c79f4c6dee93462e9 Mon Sep 17 00:00:00 2001 From: mlradu Date: Fri, 9 Aug 2024 11:55:47 +0300 Subject: [PATCH 1/3] Switch to GNU Radio 3.10.5 Signed-off-by: mlradu --- .../11.install-gnuradio/files/trixie.list | 2 -- stages/05.adi-tools/11.install-gnuradio/run.sh | 15 +-------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 stages/05.adi-tools/11.install-gnuradio/files/trixie.list diff --git a/stages/05.adi-tools/11.install-gnuradio/files/trixie.list b/stages/05.adi-tools/11.install-gnuradio/files/trixie.list deleted file mode 100644 index 030fa457a5..0000000000 --- a/stages/05.adi-tools/11.install-gnuradio/files/trixie.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://deb.debian.org/debian trixie main -#deb-src http://deb.debian.org/debian trixie main diff --git a/stages/05.adi-tools/11.install-gnuradio/run.sh b/stages/05.adi-tools/11.install-gnuradio/run.sh index abda1f237c..4c1e13a070 100644 --- a/stages/05.adi-tools/11.install-gnuradio/run.sh +++ b/stages/05.adi-tools/11.install-gnuradio/run.sh @@ -7,25 +7,12 @@ # Author: Larisa Radu if [ "${CONFIG_GNURADIO}" = y ]; then - # Add trixie.list to sources.list - install -m 644 "${BASH_SOURCE%%/run.sh}"/files/trixie.list "${BUILD_DIR}/etc/apt/sources.list.d/trixie.list" - sed -i 's/deb /#deb /' "${BUILD_DIR}/etc/apt/sources.list" - -# Install Gnuradio 3.10.8 from Debian 13 Trixie. This version contains bug fixes from ADI libraries. +# Install Gnuradio 3.10.5 chroot "${BUILD_DIR}" << EOF - apt-get update apt-get install -y gnuradio gnuradio-dev --no-install-recommends EOF - # Comment trixie.list - sed -i 's/deb /#deb /' "${BUILD_DIR}/etc/apt/sources.list.d/trixie.list" - sed -i 's/#deb /deb /' "${BUILD_DIR}/etc/apt/sources.list" - -chroot "${BUILD_DIR}" << EOF - apt-get update -EOF - else echo "Gnuradio won't be installed because CONFIG_GNURADIO is set to 'n'." fi From 7967cc2390cd942fea3c4f849cd6e29db5d5a184 Mon Sep 17 00:00:00 2001 From: mlradu Date: Fri, 9 Aug 2024 15:12:22 +0300 Subject: [PATCH 2/3] Exclude Debian Trixie repository from export-sources stage Since GNU Radio is no longer installed from Debian Trixie, the repository can be excluded when downloading sources. Signed-off-by: mlradu --- .../01.deb-src-chroot/run-chroot-deb.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh b/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh index c7c5ab786d..b05900d7a0 100644 --- a/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh +++ b/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh @@ -13,11 +13,6 @@ sed -i '$ s/deb /deb-src /' /etc/apt/sources.list # Comment package installation from sources.list sed -i 's/deb /#deb /' /etc/apt/sources.list -if [ "${CONFIG_GNURADIO}" = y ]; then - # Uncomment sources installation from trixie.list in order to download sources for Gnuradio (in case it was set to be installed). - sed -i 's/#deb-src /deb-src /' /etc/apt/sources.list.d/trixie.list -fi - apt update cd /deb-src for package in $(dpkg -l | awk '/ii/ { print $2 }'); do @@ -34,10 +29,5 @@ sed -i 's/deb-src /#deb-src /' /etc/apt/sources.list # Uncomment package installation from sources.list sed -i 's/#deb /deb /' /etc/apt/sources.list -if [ "${CONFIG_GNURADIO}" = y ]; then - # Comment sources installation from trixie.list - sed -i 's/deb-src /#deb-src /' /etc/apt/sources.list.d/trixie.list -fi - apt update From 9511a378746f0aabb8044d8034f6d4a0bd2c8dc0 Mon Sep 17 00:00:00 2001 From: mlradu Date: Fri, 9 Aug 2024 15:36:06 +0300 Subject: [PATCH 3/3] 08.export-stage: check installation before exporting boot files sources Export sources if the boot files were downloaded from SWDownloads or Artifactory. If the boot files were installed via ADI APT Repository they will be downloaded later with 'apt'. Update stages numbering after adding an intermediate stage. Signed-off-by: mlradu --- stages/08.export-stage/02.export-sources/run.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/stages/08.export-stage/02.export-sources/run.sh b/stages/08.export-stage/02.export-sources/run.sh index b764d197a5..21f37be414 100644 --- a/stages/08.export-stage/02.export-sources/run.sh +++ b/stages/08.export-stage/02.export-sources/run.sh @@ -28,7 +28,8 @@ if [ "${EXPORT_SOURCES}" = y ]; then ######################## ADI boot sources ######################## - if [ "${CONFIG_XILINX_INTEL_BOOT_FILES}" = y ]; then + # Check if Xilinx and Intel boot files were downloaded or installed via ADI APT Package Repository + if [[ "${CONFIG_XILINX_INTEL_BOOT_FILES}" = y && "${USE_ADI_REPO_CARRIERS_BOOT}" = n ]]; then # Extract SHAs for Linux and HDL boot files in order to download the sources of the binaries from the same commit they were built. LINUX_SHA=$(sed -n 9p "${BUILD_DIR}/boot/$XILINX_INTEL_PROPERTIES" |cut -d"'" -f2) HDL_SHA=$(sed -n 5p "${BUILD_DIR}/boot/$XILINX_INTEL_PROPERTIES" |cut -d"'" -f2) @@ -38,7 +39,8 @@ if [ "${EXPORT_SOURCES}" = y ]; then https://github.com/analogdevicesinc/hdl/archive/${HDL_SHA}.zip fi - if [ "${CONFIG_RPI_BOOT_FILES}" = y ]; then + # Check if RPI boot files were downloaded or installed via ADI APT Package Repository + if [[ "${CONFIG_RPI_BOOT_FILES}" = y && "${USE_ADI_REPO_RPI_BOOT}" = n ]]; then if [[ ! -z ${ARTIFACTORY_RPI} ]]; then RPI_SHA=$(sed -n 2p "${BUILD_DIR}/boot/$RPI_ARTIFACTORY_PROPERTIES" |cut -d'=' -f2) else @@ -49,7 +51,7 @@ if [ "${EXPORT_SOURCES}" = y ]; then fi - ######################## Debootstrap package source ######################## + ######################## Debootstrap package source ######################## # Download debootstrap sources DEBOOTSTRAP_VERSION=$(debootstrap --version | cut -d' ' -f 2) @@ -63,7 +65,7 @@ if [ "${EXPORT_SOURCES}" = y ]; then mount --bind /kuiper-volume/sources/deb-src "${BUILD_DIR}/deb-src" chroot "${BUILD_DIR}" << EOF - bash stages/07.export-stage/03.export-sources/01.deb-src-chroot/run-chroot-deb.sh + bash stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh EOF umount "${BUILD_DIR}/deb-src" rm -r "${BUILD_DIR}/deb-src" @@ -76,7 +78,7 @@ EOF mount --bind /kuiper-volume/sources/deb-src-rpi "${BUILD_DIR}/deb-src-rpi" chroot "${BUILD_DIR}" << EOF - bash stages/07.export-stage/03.export-sources/01.deb-src-chroot/run-chroot-rpi.sh "${CONFIG_DESKTOP}" + bash stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-rpi.sh "${CONFIG_DESKTOP}" EOF umount "${BUILD_DIR}/deb-src-rpi" rm -r "${BUILD_DIR}/deb-src-rpi"