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

Adding support for local apt conf.d snippets in archive definitions (Closes: #685791).

This commit is contained in:
Daniel Baumann 2012-12-04 12:07:51 +01:00 committed by Daniel Baumann
parent bc985a6a32
commit a70409e1f2
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
scripts/build/chroot_archives
View File

@ -229,6 +229,15 @@ EOF
fi fi
done done
# Adding apt configuration (chroot)
for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.chroot"
do
if [ -e "${_FILE}" ]
then
cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
fi
done
# Adding apt preferences (chroot) # Adding apt preferences (chroot)
for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.chroot" for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.chroot"
do do
@ -271,6 +280,15 @@ EOF
fi fi
done done
# Adding local apt configuration (chroot)
for FILE in config/archives/*.conf config/archives/*.conf.chroot
do
if [ -e "${FILE}" ]
then
cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)
fi
done
# Adding local apt preferences (chroot) # Adding local apt preferences (chroot)
for FILE in config/archives/*.pref config/archives/*.pref.chroot for FILE in config/archives/*.pref config/archives/*.pref.chroot
do do
@ -742,6 +760,7 @@ EOF
fi fi
# probably too bold, needs refinment (FIXME) # probably too bold, needs refinment (FIXME)
rm -f chroot/etc/apt/conf.d/*
rm -f chroot/etc/apt/preferences.d/* rm -f chroot/etc/apt/preferences.d/*
# Configure third-party archives # Configure third-party archives
@ -771,6 +790,15 @@ EOF
fi fi
done done
# Adding apt configuration (binary)
for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.binary"
do
if [ -e "${_FILE}" ]
then
cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
fi
done
# Adding apt preferences (binary) # Adding apt preferences (binary)
for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.binary" for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.binary"
do do
@ -813,6 +841,15 @@ EOF
fi fi
done done
# Adding local apt configuration (binary)
for FILE in config/archives/*.conf config/archives/*.conf.binary
do
if [ -e "${FILE}" ]
then
cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .binary)
fi
done
# Adding local apt preferences (binary) # Adding local apt preferences (binary)
for FILE in config/archives/*.pref config/archives/*.pref.binary for FILE in config/archives/*.pref config/archives/*.pref.binary
do do