summaryrefslogtreecommitdiff
path: root/auto/functions/compat
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2012-03-01 14:30:15 +0100
committerAndreas Loibl <andreas@andreas-loibl.de>2012-03-01 14:30:15 +0100
commitf40a33d0da0c3a3e58f27c02b0959b1d43bb25d1 (patch)
tree82473aecb978eb94b04c10605a2a2e3c3ca0940c /auto/functions/compat
parent344dc1493807c22fb3bda6a059facf5c328d8b79 (diff)
downloadkanotix-f40a33d0da0c3a3e58f27c02b0959b1d43bb25d1.zip
kanotix-f40a33d0da0c3a3e58f27c02b0959b1d43bb25d1.tar.gz
included live-build patches into local tree to make it build with unpatched live-build
Diffstat (limited to 'auto/functions/compat')
-rw-r--r--auto/functions/compat6
1 files changed, 3 insertions, 3 deletions
diff --git a/auto/functions/compat b/auto/functions/compat
index 061562b..a524c28 100644
--- a/auto/functions/compat
+++ b/auto/functions/compat
@@ -22,13 +22,13 @@ Compat_arguments ()
Compat_config ()
{
-[ -e config/chroot ] && cat <<eof >> config/chroot
+[ -e config/chroot ] && [ "$LB_ARCHIVES" ] && cat <<eof >> config/chroot
# Compat (Live-build 2 -> 3)
LB_REPOSITORIES="$LB_ARCHIVES"
LB_PACKAGES_LISTS="$LB_PACKAGE_LISTS"
eof
-[ -e config/bootstrap ] && cat <<eof >> config/bootstrap
+[ -e config/bootstrap ] && [ "$LB_ARCHITECTURES" ] && cat <<eof >> config/bootstrap
# Compat (Live-build 2 -> 3)
LB_ARCHITECTURE="$LB_ARCHITECTURES"
@@ -116,7 +116,7 @@ case "$LB_VERSION" in
Compat_dir chroot_local-hooks hooks - .chroot
;;
lb_binary_hooks)
- Compat_dir chroot_binary-hooks hooks - .binary
+ Compat_dir binary_local-hooks hooks - .binary
;;
lb_build|lb_clean)
trap Compat_clean EXIT