From 239aa1f4ea672b80769d57ad4085dd636871b539 2018-12-06 03:09:37 From: Unknown Date: 2018-12-06 03:09:37 Subject: [PATCH] a --- diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh index 3fc2db0..78ffe5c 100644 --- a/bootstrap.d/15-rpi-config.sh +++ b/bootstrap.d/15-rpi-config.sh @@ -191,7 +191,7 @@ if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then # Set permissions of the systemd-swap sources chown -R root:root "${R}/tmp/systemd-swap" - # Install package + # Install package - IMPROVE AND MAKE IT POSSIBLE WITHOUT VERSION NR. chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_4.0.1_any.deb # Enable service diff --git a/functions.sh b/functions.sh index 2332835..fc0b612 100644 --- a/functions.sh +++ b/functions.sh @@ -75,7 +75,7 @@ chroot_install_cc() { # Install c/c++ build environment inside the chroot if [ -z "${COMPILER_PACKAGES}" ] ; then COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }') - # Install COMPILER_PACKAGES in chroot + # Install COMPILER_PACKAGES in chroot - NEVER do "${COMPILER_PACKAGES}" -> breaks uboot chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} fi } @@ -83,7 +83,7 @@ chroot_install_cc() { chroot_remove_cc() { # Remove c/c++ build environment from the chroot if [ -n "${COMPILER_PACKAGES}" ] ; then - chroot_exec apt-get -qq -y --auto-remove purge "${COMPILER_PACKAGES}" + chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES} COMPILER_PACKAGES="" fi }