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

binary_package-lists: avoid messing with dpkg's status file 

Instead of emptying the file temporarily, just tell APT to use /dev/null
instead of /var/lib/dpkg/status. Relates to #944983
This commit is contained in:
Raphaël Hertzog 2019-12-19 15:54:54 +01:00
parent 1682c5c8d1
commit 04ea46d07b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/build/binary_package-lists
View File

@ -71,8 +71,6 @@ then
fi fi
mkdir -p chroot/binary.deb/archives/partial mkdir -p chroot/binary.deb/archives/partial
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
for LIST in config/package-lists/*.list \ for LIST in config/package-lists/*.list \
config/package-lists/*.list.binary config/package-lists/*.list.binary
@ -83,7 +81,7 @@ then
Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})" Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
# Downloading additional packages # Downloading additional packages
Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install" Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o Dir::State::status=/dev/null --download-only install"
# Remove package list # Remove package list
rm chroot/root/"$(basename ${LIST})" rm chroot/root/"$(basename ${LIST})"
@ -151,7 +149,6 @@ then
rm -f chroot/bin/Packages rm -f chroot/bin/Packages
rm -rf chroot/binary.deb rm -rf chroot/binary.deb
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
# Removing depends # Removing depends
Remove_package Remove_package