diff options
| -rwxr-xr-x | scripts/build/lb_binary_local-packagelists | 4 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_local-packagelists | 6 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_task-lists | 6 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/scripts/build/lb_binary_local-packagelists b/scripts/build/lb_binary_local-packagelists index b0d28ab7e..cef60658d 100755 --- a/scripts/build/lb_binary_local-packagelists +++ b/scripts/build/lb_binary_local-packagelists @@ -38,7 +38,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if Find_files config/package-lists/*.binary.list +if Find_files config/package-lists/*.list.binary then # Restoring cache Restore_cache cache/packages_chroot @@ -53,7 +53,7 @@ then mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp touch chroot/var/lib/dpkg/status - for PACKAGELIST in config/package-lists/*.binary.list + for PACKAGELIST in config/package-lists/*.list.binary do # Generate package list Expand_packagelist "${PACKAGELIST}" "config/package-lists" > chroot/root/"$(basename ${PACKAGELIST})" diff --git a/scripts/build/lb_chroot_local-packagelists b/scripts/build/lb_chroot_local-packagelists index a2160be73..eb93af953 100755 --- a/scripts/build/lb_chroot_local-packagelists +++ b/scripts/build/lb_chroot_local-packagelists @@ -41,10 +41,10 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/package-lists/*.chroot.list > /dev/null 2>&1 || \ - ls config/package-lists/*.chroot_${_PASS}.list > /dev/null 2>&1 +if ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \ + ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1 then - for LIST in config/package-lists/*.chroot.list config/package-lists/*.chroot_${_PASS}.list + for LIST in config/package-lists/*.list.chroot config/package-lists/*.list.chroot_${_PASS} do if [ -e "${LIST}" ] then diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists index 2bdffd8d5..57f5518b1 100755 --- a/scripts/build/lb_chroot_task-lists +++ b/scripts/build/lb_chroot_task-lists @@ -41,10 +41,10 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/task-lists/*.chroot.list > /dev/null 2>&1 || \ - ls config/task-lists/*.chroot_${_PASS}.list > /dev/null 2>&1 +if ls config/task-lists/*.list.chroot > /dev/null 2>&1 || \ + ls config/task-lists/*.list.chroot_${_PASS} > /dev/null 2>&1 then - for LIST in config/task-lists/*.chroot.list config/task-lists/*.chroot_${_PASS}.list + for LIST in config/task-lists/*.list.chroot config/task-lists/*.list.chroot_${_PASS} do if [ -e "${LIST}" ] then diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 597cfcf53..a3051b5e9 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -1393,7 +1393,7 @@ mkdir -p auto/scripts if [ "${CONFIG}" = "clone" ] # FIXME then # Read package selection - echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local-system.chroot.list + echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local.list.chroot LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system" # Read debconf questions |