diff options
Diffstat (limited to 'auto')
| -rwxr-xr-x | auto/build | 4 | ||||
| -rwxr-xr-x | auto/clean | 2 | ||||
| -rwxr-xr-x | auto/config | 2 | ||||
| -rwxr-xr-x | auto/kanotix | 2 |
4 files changed, 4 insertions, 6 deletions
@@ -20,10 +20,6 @@ perl -pi -e "s%(32|64)(bit)%$bit\${2}%i; s|[0-9]+-[0-9]+:[0-9]+|$(date +%Y%m%d-% prebuild() { - # make current build configuration available for hooks inside chroot - mkdir -p config/chroot_local-includes/root - cat config/* 2>/dev/null | grep ^LB_ > config/chroot_local-includes/root/build.conf - for bootstrap_dir in cache/stages_bootstrap cache/bootstrap do if [ -d ${bootstrap_dir} ]; then @@ -4,7 +4,7 @@ rm -f build.log # Remove generated files 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 + config/kanotix config/chroot_local-packageslists/kanotix-flavours.list rm -f config/package-lists/compat.list.chroot if [ -f config/all ]; then sed -i '/^. config\/kanotix/d' config/all diff --git a/auto/config b/auto/config index eade4e0..c59bf4a 100755 --- a/auto/config +++ b/auto/config @@ -75,6 +75,8 @@ grep -wq mesa <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" mesa" grep -wq steam <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" steam steam-wheezy" grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox-wheezy" grep -wq silverlight <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" silverlight" +grep -wq spotify <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" spotify" +grep -wq -e hangouts -e talkplugin <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" hangouts" lb config noauto --linux-packages "$LB_LINUX_PACKAGES" --linux-flavours "$LB_LINUX_FLAVOURS" --repositories "$LB_REPOSITORIES" # Fetch kanotix-scripts if necessary diff --git a/auto/kanotix b/auto/kanotix index 45b9c97..deac58b 100755 --- a/auto/kanotix +++ b/auto/kanotix @@ -37,7 +37,7 @@ LB_KANOTIX_TMPFS_OPTIONS="${LB_KANOTIX_TMPFS_OPTIONS}" LB_KANOTIX_GFXOVERLAYS="${LB_KANOTIX_GFXOVERLAYS}" EOF -grep -q ". config/kanotix" config/all 2>/dev/null || echo ". config/kanotix" >> config/all +grep -q ". config/kanotix" config/all 2>/dev/null || echo "[ -r config/kanotix ] && . config/kanotix" >> config/all } # process Kanotix config values |