diff --git a/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-rpi.sh b/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-rpi.sh deleted file mode 100644 index dc9404c4..00000000 --- a/stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-rpi.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -e -# SPDX-License-Identifier: BSD-3-Clause -# -# kuiper2.0 - Embedded Linux for Analog Devices Products -# -# Copyright (c) 2024 Analog Devices, Inc. -# Author: Larisa Radu - -CONFIG_DESKTOP=$1 - -# Comment package installation from sources.list -sed -i 's/deb /#deb /' /etc/apt/sources.list - -# Uncomment sources installation from raspi.list in order to download sources for RPI boot files and wifi firmware (in case they were set to be installed) -sed -i 's/#deb-src /deb-src /' /etc/apt/sources.list.d/raspi.list - -apt update -cd /deb-src-rpi -apt-get --download-only source raspberrypi-bootloader -if [ ${CONFIG_DESKTOP} = y ]; then - apt-get --download-only source firmware-brcm80211 -fi - -# Archive with compression level 6 (on a scale from 1 to 9 representing the trade-off between compression ratio and speed) -zip -r -6 "deb-src-rpi.zip" * -find . -not -name "deb-src-rpi.zip" -delete - -# Comment sources installation from raspi.list -sed -i 's/deb-src /#deb-src /' /etc/apt/sources.list.d/raspi.list - -# Uncomment package installation from sources.list -sed -i 's/#deb /deb /' /etc/apt/sources.list - -apt update 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.sh similarity index 74% rename from stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh rename to stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot.sh index b05900d7..b8b6c27c 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.sh @@ -6,12 +6,11 @@ # Copyright (c) 2024 Analog Devices, Inc. # Author: Larisa Radu -# Create an uncommented deb-src line in sources.list +# Create an uncommented deb-src line in sources.list and raspi.list sed -i 's/deb .*/&\n&/g' /etc/apt/sources.list 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 +sed -i 's/#deb-src /deb-src /' /etc/apt/sources.list.d/raspi.list apt update cd /deb-src @@ -26,8 +25,8 @@ find . -not -name "deb-src.zip" -delete # Comment sources installation from sources.list 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 +# Comment sources installation from raspi.list +sed -i 's/deb-src /#deb-src /' /etc/apt/sources.list.d/raspi.list apt update diff --git a/stages/08.export-stage/02.export-sources/run.sh b/stages/08.export-stage/02.export-sources/run.sh index 63155295..b835882b 100644 --- a/stages/08.export-stage/02.export-sources/run.sh +++ b/stages/08.export-stage/02.export-sources/run.sh @@ -6,50 +6,11 @@ # Copyright (c) 2024 Analog Devices, Inc. # Author: Larisa Radu -XILINX_INTEL_PROPERTIES="VERSION.txt" -RPI_PROPERTIES="rpi_archives_properties.txt" -RPI_ARTIFACTORY_PROPERTIES="rpi_git_properties.txt" - if [ "${EXPORT_SOURCES}" = y ]; then mkdir -p kuiper-volume/sources/debootstrap mkdir -p kuiper-volume/sources/deb-src - mkdir -p kuiper-volume/sources/deb-src-rpi - mkdir -p kuiper-volume/sources/adi-git - mkdir -p kuiper-volume/sources/adi-boot mkdir -p kuiper-volume/sources/pip-src - - - ######################## ADI git sources ######################## - - for repo in $(ls "${BUILD_DIR}/usr/local/src"); do - echo ${repo} - zip -r -6 /kuiper-volume/sources/adi-git/${repo}.zip ${BUILD_DIR}/usr/local/src/${repo}/* - done - - ######################## ADI boot sources ######################## - - # 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) - wget --progress=bar:force:noscroll -O /kuiper-volume/sources/adi-boot/linux_${RELEASE_XILINX_INTEL_BOOT_FILES}.zip \ - https://github.com/analogdevicesinc/linux/archive/${LINUX_SHA}.zip - wget --progress=bar:force:noscroll -O /kuiper-volume/sources/adi-boot/hdl_${RELEASE_XILINX_INTEL_BOOT_FILES}.zip \ - https://github.com/analogdevicesinc/hdl/archive/${HDL_SHA}.zip - fi - - # 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 - RPI_SHA=$(sed -n 6p "${BUILD_DIR}/boot/$RPI_PROPERTIES" |cut -d'=' -f2) - fi - wget --progress=bar:force:noscroll -O /kuiper-volume/sources/adi-boot/rpi_"${BRANCH_RPI_BOOT_FILES}".zip \ - https://github.com/analogdevicesinc/linux/archive/${RPI_SHA}.zip - fi ######################## Debootstrap package source ######################## @@ -70,24 +31,11 @@ if [ "${EXPORT_SOURCES}" = y ]; then mount --bind /kuiper-volume/sources/deb-src "${BUILD_DIR}/deb-src" chroot "${BUILD_DIR}" << EOF - bash stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot-deb.sh + bash stages/08.export-stage/02.export-sources/01.deb-src-chroot/run-chroot.sh EOF umount "${BUILD_DIR}/deb-src" rm -r "${BUILD_DIR}/deb-src" - - ######################## Raspberry Pi OS sources ######################## - - if [[ "${CONFIG_RPI_BOOT_FILES}" = y ]]; then - mkdir "${BUILD_DIR}/deb-src-rpi" - mount --bind /kuiper-volume/sources/deb-src-rpi "${BUILD_DIR}/deb-src-rpi" - -chroot "${BUILD_DIR}" << EOF - 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" - fi ######################## Pip packages sources ########################