[SCM] live-build branch, debian-next, updated. debian/3.0_a46-1-10-g594e55a
Daniel Baumann
daniel at debian.org
Thu Apr 26 18:33:59 UTC 2012
The following commit has been merged in the debian-next branch:
commit 594e55a9d7ac928ba724c92381b22c8e5d7d87bc
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Apr 26 20:29:37 2012 +0200
Supporting arbitrary sections for packages in binary pool, needed for proper firmware package placement.
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index da3542d..6413225 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -174,8 +174,17 @@ Install_file() {
local FILE
FILE="${1}"
+ ARCHIVE_AREA="$(dpkg -I ${FILE} | awk '/^.*Section: / { print $2 }')"
+
+ if echo "${ARCHIVE_AREA}" | grep -qs /
+ then
+ ARCHIVE_AREA="main"
+ else
+ ARCHIVE_AREA="$(echo ${ARCHIVE_AREA} | awk -F/ '{ print $1 }')"
+ fi
+
local TARGET
- TARGET="${2}"
+ TARGET="${2}/${ARCHIVE_AREA}"
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
@@ -328,7 +337,12 @@ if [ "${DI_IMAGE_TYPE}" != "netboot" ]
then
# Downloading additional packages
mkdir -p chroot/binary.deb/archives/partial
- mkdir -p binary/pool/main
+
+ for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS} | sort -u)
+ do
+ mkdir -p binary/pool/${_ARCHIVE_AREA}
+ done
+
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
@@ -434,7 +448,7 @@ then
# We don't want to duplicate .debs of packages in binary/pool that are already
# installed to target/ via live-installer.
#
- # However, we need to force various packages' inclusion in binary/pool/main as
+ # However, we need to force various packages' inclusion in binary/pool as
# d-i does not support (for example) re-installing grub from target/ - the grub
# .debs must actually exist.
@@ -473,7 +487,7 @@ then
then
for FILE in binary.deb/archives/*.deb
do
- Install_file "${FILE}" "binary/pool/main"
+ Install_file "${FILE}" "binary/pool"
done
fi
@@ -484,7 +498,7 @@ then
then
for FILE in cache/packages_bootstrap/*.deb
do
- Install_file "${FILE}" "binary/pool/main"
+ Install_file "${FILE}" "binary/pool"
done
else
Echo_error "Could not find packages in cache/packages_bootstrap."
@@ -500,7 +514,7 @@ then
do
if [ -e "${FILE}" ]
then
- Install_file "${FILE}" "binary/pool/main"
+ Install_file "${FILE}" "binary/pool"
fi
done
fi
@@ -511,7 +525,7 @@ then
do
if [ -e "${FILE}" ]
then
- Install_file "${FILE}" "binary/pool/main"
+ Install_file "${FILE}" "binary/pool"
fi
done
fi
@@ -587,7 +601,7 @@ then
do
if [ -e "${FILE}" ]
then
- Install_file "${FILE}" "pool/main"
+ Install_file "${FILE}" "pool"
# Prefer local udebs over downloaded udebs
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
@@ -601,7 +615,7 @@ then
do
if [ -e "${FILE}" ]
then
- Install_file "${FILE}" "pool/main"
+ Install_file "${FILE}" "pool"
# Prefer local udebs over downloaded udebs
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
--
live-build
More information about the debian-live-changes
mailing list