From 97685e70eb99edaea1a9a420460ef05fd2b19dcd Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Sun, 25 Aug 2013 10:11:16 +0200 Subject: further auto hook fixes for live-build 3.0.5 --- auto/clean | 1 - auto/functions/compat | 2 +- auto/live-build/functions/00_init.sh | 8 ++++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/auto/clean b/auto/clean index 9e95855..0802004 100755 --- a/auto/clean +++ b/auto/clean @@ -6,7 +6,6 @@ rm -f build.log rm -f config/binary config/bootstrap config/chroot config/common config/source \ config/kanotix config/chroot_local-includes/root/build.conf config/chroot_local-packageslists/kanotix-flavours.list rm -f config/package-lists/compat.list.chroot -rmdir --ignore-fail-on-non-empty config/package-lists if [ -f config/all ]; then sed -i '/^. config\/kanotix/d' config/all [ ! -s config/all ] && rm -f config/all diff --git a/auto/functions/compat b/auto/functions/compat index e93c386..79f629a 100644 --- a/auto/functions/compat +++ b/auto/functions/compat @@ -87,7 +87,7 @@ Compat_packagelists() ( echo '# AUTOGENERATED from "lb config -p" option - DO NOT CHANGE' IFS=" " - for packagelist in $1 + for packagelist in $@ do echo "#include <$packagelist>" done diff --git a/auto/live-build/functions/00_init.sh b/auto/live-build/functions/00_init.sh index c57efaa..0f0b97c 100644 --- a/auto/live-build/functions/00_init.sh +++ b/auto/live-build/functions/00_init.sh @@ -7,3 +7,11 @@ do . "${_FILE}" fi done +Set_defaults() { + # hide this script from the real Set_defaults + # to make sure that no path is set to this local folder + mv local local.tmp + . /usr/share/live/build/functions/defaults.sh + Set_defaults "@" + mv local.tmp local +} -- cgit v1.0