manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Install_file for udebs.

This commit is contained in:
Chris Lamb 2008-01-15 19:42:28 +00:00
parent 948730f93a
commit 1f436f7483
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
helpers/lh_binary_debian-installer
View File

@ -113,6 +113,7 @@ DESTDIR_GI="${DESTDIR}/gtk"
Install_file() { Install_file() {
local FILE="${1}" local FILE="${1}"
local TARGET="${2}"
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')" SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
@ -132,10 +133,10 @@ Install_file() {
esac esac
# Install directory # Install directory
mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}" mkdir -p "${TARGET}"/"${LETTER}"/"${SOURCE}"
# Move files # Move files
cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}" cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}"
} }
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
@ -255,7 +256,7 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
for FILE in binary.deb/archives/*.deb for FILE in binary.deb/archives/*.deb
do do
Install_file "${FILE}" Install_file "${FILE}" "binary/pool/main"
done done
fi fi
@ -264,7 +265,7 @@ if [ -d cache/packages_bootstrap ]
then then
for FILE in cache/packages_bootstrap/*.deb for FILE in cache/packages_bootstrap/*.deb
do do
Install_file "${FILE}" Install_file "${FILE}" "binary/pool/main"
done done
else else
Echo_error "E: Could not find cache/packages_bootstrap" Echo_error "E: Could not find cache/packages_bootstrap"
@ -274,12 +275,12 @@ fi
# Including local debs # Including local debs
for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
do do
Install_file "${FILE}" Install_file "${FILE}" "binary/pool/main"
done done
for FILE in ../config/binary_local-debs/*_all.deb for FILE in ../config/binary_local-debs/*_all.deb
do do
Install_file "${FILE}" Install_file "${FILE}" "binary/pool/main"
done done
# Generating deb indices # Generating deb indices
@ -326,30 +327,9 @@ if ls ../config/binary_local-udebs/*.udeb > /dev/null 2>&1
then then
for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb
do do
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')" Install_file "${FILE}" "pool/main"
if [ -z "${SOURCE}" ] # Prefer local udebs over downloaded udebs
then
SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
fi
case "${SOURCE}" in
lib?*)
LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
;;
*)
LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
;;
esac
# Install directory
mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
# Copy files
cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
# Prefere local udebs over downloaded udebs
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
done done
fi fi