diff options
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 6 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_local-packages | 48 |
2 files changed, 6 insertions, 48 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 67af978dc..f91d3f32d 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -426,6 +426,12 @@ EOF fi fi + if Find_files chroot/root/packages/*.deb + then + gunzip < chroot/root/packages/Packages.gz | awk '/^Package: / { print $2 }' \ + >> chroot/root/chroot_packages + fi + # Update indices from cache if [ "${LB_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ] then diff --git a/scripts/build/lb_chroot_local-packages b/scripts/build/lb_chroot_local-packages deleted file mode 100755 index e5da1aa5e..000000000 --- a/scripts/build/lb_chroot_local-packages +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> -## -## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'queue install of local packages into chroot')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -Echo_message "Begin queueing installation of local packages..." - -# Requiring stage file -Require_stagefile .stage/config .stage/bootstrap - -# Checking stage file -Check_stagefile .stage/chroot_packages - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if Find_files chroot/root/packages/*.deb -then - gunzip < chroot/root/packages/Packages.gz | awk '/^Package: / { print $2 }' \ - >> chroot/root/chroot_packages - - # Creating stage file - Create_stagefile .stage/chroot_packages -fi |