summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-05-31 11:37:22 +0200
committerDaniel Baumann <daniel@debian.org>2012-05-31 13:04:55 +0200
commitdc6b3d90da99917b161b6fe76dc52cd7c45d10f9 (patch)
tree0211c57d6e1cfcd6c9c8159c5f0589f36755f6ab /scripts/build
parent5e91eadadc62a3a5adb985d63c773a786ae73380 (diff)
downloadvyos-live-build-dc6b3d90da99917b161b6fe76dc52cd7c45d10f9.tar.gz
vyos-live-build-dc6b3d90da99917b161b6fe76dc52cd7c45d10f9.zip
Moving firmware symlink creation to the end of binary_debian-installer in order to ensure to take only the latest packages into account that get into the image, regardless if they come from the archive or are localy included.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_debian-installer34
1 files changed, 17 insertions, 17 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 003051bc7..a3098984a 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -508,23 +508,6 @@ then
done
fi
- # Symlink firmware packages to /firmware
- if [ -n "${DI_FIRMWARE_PACKAGES}" ]
- then
- mkdir -p binary/firmware
- cd binary/firmware
-
- for _PACKAGE in ${DI_FIRMWARE_PACKAGES}
- do
- for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb")
- do
- ln -s ${_FILE} ./
- done
- done
-
- cd "${OLDPWD}"
- fi
-
if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
then
# Including base debian packages
@@ -581,6 +564,23 @@ then
Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release
done
+ # Symlink firmware packages to /firmware
+ if [ -n "${DI_FIRMWARE_PACKAGES}" ]
+ then
+ mkdir -p binary/firmware
+ cd binary/firmware
+
+ for _PACKAGE in ${DI_FIRMWARE_PACKAGES}
+ do
+ for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb")
+ do
+ ln -s ${_FILE} ./
+ done
+ done
+
+ cd "${OLDPWD}"
+ fi
+
# Udeb handling
mkdir binary.udeb
cd binary.udeb