Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to GNU Radio 3.10.5 #165

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Switch to GNU Radio 3.10.5 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e738d18
Switch to GNU Radio 3.10.5
mlradu Aug 9, 2024
7967cc2
Exclude Debian Trixie repository from export-sources stage
mlradu Aug 9, 2024
9511a37
08.export-stage: check installation before exporting boot files sources
mlradu Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions stages/05.adi-tools/11.install-gnuradio/files/trixie.list
View file
Open in desktop

This file was deleted.

15 changes: 1 addition & 14 deletions stages/05.adi-tools/11.install-gnuradio/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,12 @@
# Author: Larisa Radu <[email protected]>

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
10 changes: 0 additions & 10 deletions stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

12 changes: 7 additions & 5 deletions stages/08.export-stage/02.export-sources/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading