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

Renaming config/chroot_packages to config/packages.chroot.

This commit is contained in:
Daniel Baumann 2011-09-07 15:59:48 +02:00
parent 65f626fe9c
commit e82aa25134
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/lb_chroot_apt
View File

@ -108,7 +108,7 @@ case "${1}" in
cp config/chroot_apt/preferences chroot/etc/apt/preferences
fi
if Find_files config/chroot_packages/*.deb
if Find_files config/packages.chroot/*.deb
then
echo >> chroot/etc/apt/preferences
echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences
@ -236,7 +236,7 @@ EOF
fi
fi
if Find_files config/chroot_packages/*.deb
if Find_files config/packages.chroot/*.deb
then
if [ -f chroot/etc/apt/preferences ]
then

22
scripts/build/lb_chroot_archives
View File

@ -277,39 +277,39 @@ EOF
fi
# Configure local package repository
if Find_files config/chroot_packages/*.deb
if Find_files config/packages.chroot/*.deb
then
rm -rf chroot/root/packages
mkdir -p chroot/root/packages
if [ "$(stat --printf %d config/chroot_packages)" = "$(stat --printf %d chroot/root/packages)" ]
if [ "$(stat --printf %d config/packages.chroot)" = "$(stat --printf %d chroot/root/packages)" ]
then
CP_OPTIONS="-l"
fi
# Copy packages
if Find_files config/chroot_packages/*_"${LB_ARCHITECTURES}".deb
if Find_files config/packages.chroot/*_"${LB_ARCHITECTURES}".deb
then
for FILE in config/chroot_packages/*_"${LB_ARCHITECTURES}".deb
for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb
do
if [ -L "${FILE}" ]
then
cp -L config/chroot_packages/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
cp -L config/packages.chroot/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
else
cp ${CP_OPTIONS} config/chroot_packages/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
cp ${CP_OPTIONS} config/packages.chroot/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
fi
done
fi
if Find_files config/chroot_packages/*_all.deb
if Find_files config/packages.chroot/*_all.deb
then
for FILE in config/chroot_packages/*_all.deb
for FILE in config/packages.chroot/*_all.deb
do
if [ -L "${FILE}" ]
then
cp -L config/chroot_packages/*_all.deb chroot/root/packages
cp -L config/packages.chroot/*_all.deb chroot/root/packages
else
cp ${CP_OPTIONS} config/chroot_packages/*_all.deb chroot/root/packages
cp ${CP_OPTIONS} config/packages.chroot/*_all.deb chroot/root/packages
fi
done
fi
@ -432,7 +432,7 @@ EOF
if Find_files chroot/root/packages/*.deb
then
gunzip < chroot/root/packages/Packages.gz | awk '/^Package: / { print $2 }' \
>> chroot/root/chroot_packages
>> chroot/root/packages.chroot
fi
# Update indices from cache

8
scripts/build/lb_chroot_install-packages
View File

@ -42,7 +42,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if [ -e chroot/root/chroot_packages ] && [ -s chroot/root/chroot_packages ]
if [ -e chroot/root/packages.chroot ] && [ -s chroot/root/packages.chroot ]
then
# Restoring cache
Restore_cache cache/packages_chroot
@ -50,16 +50,16 @@ then
# Installing packages
case "${LB_APT}" in
apt|apt-get)
Chroot chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install"
Chroot chroot "xargs --arg-file=/root/packages.chroot apt-get ${APT_OPTIONS} install"
;;
aptitude)
Chroot chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} install"
Chroot chroot "xargs --arg-file=/root/packages.chroot aptitude ${APTITUDE_OPTIONS} install"
;;
esac
# Tidying up
rm -f chroot/root/chroot_packages
rm -f chroot/root/packages.chroot
# Saving cache
Save_cache cache/packages_chroot

2
scripts/build/lb_chroot_linux-image
View File

@ -49,7 +49,7 @@ then
do
for PACKAGE in ${LB_LINUX_PACKAGES}
do
echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
echo ${PACKAGE}-${FLAVOUR} >> chroot/root/packages.chroot
done
done

4
scripts/build/lb_chroot_packagelists
View File

@ -47,7 +47,7 @@ then
for LIST in ${LB_PACKAGE_LISTS}
do
# Generating package list
Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
Expand_packagelist "${LIST}" >> chroot/root/packages.chroot
done
# Creating stage file
@ -67,7 +67,7 @@ then
then
# Generating package list
Expand_packagelist "$(basename ${LIST})" "config/package-lists" \
>> chroot/root/chroot_packages
>> chroot/root/packages.chroot
fi
done

2
scripts/build/lb_config
View File

@ -1163,7 +1163,7 @@ mkdir -p config/chroot_apt
mkdir -p config/hooks
mkdir -p config/local.chroot
mkdir -p config/chroot_local-patches
mkdir -p config/chroot_packages
mkdir -p config/packages.chroot
mkdir -p config/package-lists
mkdir -p config/chroot_local-preseed
mkdir -p config/task-lists