diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-03 22:42:41 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-03 22:42:41 +0200 |
| commit | aa0c0fb107cf821ca5b85e0f8156442eaa9c3dd7 (patch) | |
| tree | c71319a6411ac789246176d6d4056bf6b9013e1a /scripts/build | |
| parent | 4c903bab69b24f2a79cafc262273229a1b108044 (diff) | |
| download | vyos-live-build-aa0c0fb107cf821ca5b85e0f8156442eaa9c3dd7.tar.gz vyos-live-build-aa0c0fb107cf821ca5b85e0f8156442eaa9c3dd7.zip | |
Renaming internal .stage to .build for consistency within the configuration tree.
Diffstat (limited to 'scripts/build')
69 files changed, 217 insertions, 217 deletions
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary index 9c46fdac3..4a4f76b9e 100755 --- a/scripts/build/lb_binary +++ b/scripts/build/lb_binary @@ -14,7 +14,7 @@ set -e . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Automatically populating config tree -if [ -x auto/config ] && [ ! -e .stage/config ] +if [ -x auto/config ] && [ ! -e .build/config ] then Echo_message "Automatically populating config tree." lb config @@ -92,7 +92,7 @@ lb binary_virtual-hdd ${*} if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot - rm -f .stage/chroot_archives + rm -f .build/chroot_archives lb chroot_apt remove ${*} lb chroot_hostname remove ${*} lb chroot_resolv remove ${*} diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums index 59fa56c26..c23fe454d 100755 --- a/scripts/build/lb_binary_checksums +++ b/scripts/build/lb_binary_checksums @@ -30,10 +30,10 @@ then fi # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_checksums +Check_stagefile .build/binary_checksums # Checking lock file Check_lockfile .lock @@ -83,4 +83,4 @@ find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.list cd "${OLDPWD}" # Creating stage file -Create_stagefile .stage/binary_checksums +Create_stagefile .build/binary_checksums diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot index 6dd7eec9d..4314752d9 100755 --- a/scripts/build/lb_binary_chroot +++ b/scripts/build/lb_binary_chroot @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin copying chroot..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_chroot +Check_stagefile .build/binary_chroot # Checking lock file Check_lockfile .lock @@ -122,4 +122,4 @@ then fi # Creating stage file -Create_stagefile .stage/binary_chroot +Create_stagefile .build/binary_chroot diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index f2f7b20e6..f64ee266e 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -57,10 +57,10 @@ esac Echo_message "Begin installing debian-installer..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_debian-installer +Check_stagefile .build/binary_debian-installer # Checking lock file Check_lockfile .lock @@ -849,4 +849,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_debian-installer +Create_stagefile .build/binary_debian-installer diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk index e7b3216f7..7162db2c0 100755 --- a/scripts/build/lb_binary_disk +++ b/scripts/build/lb_binary_disk @@ -35,10 +35,10 @@ esac Echo_message "Begin installing disk information..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_disk +Check_stagefile .build/binary_disk # Checking lock file Check_lockfile .lock @@ -176,4 +176,4 @@ case "${LB_DEBIAN_INSTALLER}" in esac # Creating stage file -Create_stagefile .stage/binary_disk +Create_stagefile .build/binary_disk diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index b01a78431..5da02b70b 100755 --- a/scripts/build/lb_binary_grub +++ b/scripts/build/lb_binary_grub @@ -32,10 +32,10 @@ fi Echo_message "Begin installing grub..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_grub +Check_stagefile .build/binary_grub # Checking grub templates Check_templates grub @@ -306,4 +306,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_grub +Create_stagefile .build/binary_grub diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index bc61b58f0..8aa2295dc 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -32,10 +32,10 @@ fi Echo_message "Begin installing grub2..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_grub +Check_stagefile .build/binary_grub # Checking grub2 templates Check_templates grub2 @@ -276,4 +276,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_grub +Create_stagefile .build/binary_grub diff --git a/scripts/build/lb_binary_hdd b/scripts/build/lb_binary_hdd index 9663d19a1..9679e61ad 100755 --- a/scripts/build/lb_binary_hdd +++ b/scripts/build/lb_binary_hdd @@ -32,10 +32,10 @@ fi Echo_message "Begin building binary hdd image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc +Require_stagefile .build/config .build/bootstrap .build/chroot_proc # Checking stage file -Check_stagefile .stage/binary_hdd +Check_stagefile .build/binary_hdd # Checking lock file Check_lockfile .lock @@ -289,4 +289,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_hdd +Create_stagefile .build/binary_hdd diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks index eb19d54bc..889c3a12f 100755 --- a/scripts/build/lb_binary_hooks +++ b/scripts/build/lb_binary_hooks @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin executing hooks..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_hooks +Check_stagefile .build/binary_hooks # Checking lock file Check_lockfile .lock @@ -68,5 +68,5 @@ then done # Creating stage file - Create_stagefile .stage/binary_hooks + Create_stagefile .build/binary_hooks fi diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes index 1cdc61dc4..0bd183a56 100755 --- a/scripts/build/lb_binary_includes +++ b/scripts/build/lb_binary_includes @@ -32,10 +32,10 @@ fi Echo_message "Begin copying binary includes..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_includes +Check_stagefile .build/binary_includes # Checking lock file Check_lockfile .lock @@ -165,4 +165,4 @@ then fi # Creating stage file -Create_stagefile .stage/binary_includes +Create_stagefile .build/binary_includes diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso index 5898d6863..f7710d100 100755 --- a/scripts/build/lb_binary_iso +++ b/scripts/build/lb_binary_iso @@ -41,10 +41,10 @@ esac Echo_message "Begin building binary iso image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_iso +Check_stagefile .build/binary_iso # Checking lock file Check_lockfile .lock @@ -235,4 +235,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_iso +Create_stagefile .build/binary_iso diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image index 09bbcdc18..0997cea88 100755 --- a/scripts/build/lb_binary_linux-image +++ b/scripts/build/lb_binary_linux-image @@ -32,10 +32,10 @@ fi Echo_message "Begin install linux-image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_linux-image +Check_stagefile .build/binary_linux-image # Checking lock file Check_lockfile .lock @@ -89,4 +89,4 @@ case "${LB_INITRAMFS}" in esac # Creating stage file -Create_stagefile .stage/binary_linux-image +Create_stagefile .build/binary_linux-image diff --git a/scripts/build/lb_binary_local-includes b/scripts/build/lb_binary_local-includes index 4192331e1..84f7f3c07 100755 --- a/scripts/build/lb_binary_local-includes +++ b/scripts/build/lb_binary_local-includes @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin copying binary local includes..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_local-includes +Check_stagefile .build/binary_local-includes # Checking lock file Check_lockfile .lock @@ -53,5 +53,5 @@ then esac # Creating stage file - Create_stagefile .stage/binary_local-includes + Create_stagefile .build/binary_local-includes fi diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest index f5e5aabf7..32d79eaa7 100755 --- a/scripts/build/lb_binary_manifest +++ b/scripts/build/lb_binary_manifest @@ -32,10 +32,10 @@ fi Echo_message "Begin creating manifest..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_manifest +Check_stagefile .build/binary_manifest # Checking lock file Check_lockfile .lock @@ -68,4 +68,4 @@ echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $ cp chroot.packages.live binary.packages # Creating stage file -Create_stagefile .stage/binary_manifest +Create_stagefile .build/binary_manifest diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest index 2001a8569..71b2d0582 100755 --- a/scripts/build/lb_binary_memtest +++ b/scripts/build/lb_binary_memtest @@ -32,10 +32,10 @@ fi Echo_message "Begin installing memtest..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_memtest +Check_stagefile .build/binary_memtest # Checking lock file Check_lockfile .lock @@ -121,4 +121,4 @@ then fi # Creating stage file -Create_stagefile .stage/binary_memtest +Create_stagefile .build/binary_memtest diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_net index ba1ada5a4..250191680 100755 --- a/scripts/build/lb_binary_net +++ b/scripts/build/lb_binary_net @@ -37,10 +37,10 @@ fi Echo_message "Begin building binary netboot image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_net +Check_stagefile .build/binary_net # Checking lock file Check_lockfile .lock @@ -176,4 +176,4 @@ then fi # Creating stage file -Create_stagefile .stage/binary_net +Create_stagefile .build/binary_net diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists index 1835fde48..791802140 100755 --- a/scripts/build/lb_binary_package-lists +++ b/scripts/build/lb_binary_package-lists @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin installing local package lists..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_package-lists +Check_stagefile .build/binary_package-lists # Checking lock file Check_lockfile .lock @@ -130,5 +130,5 @@ then Save_cache cache/packages_chroot # Creating stage file - Create_stagefile .stage/binary_package-lists + Create_stagefile .build/binary_package-lists fi diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index df44f95c9..e0abbe0f7 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin building root filesystem image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap .stage/binary_chroot +Require_stagefile .build/config .build/bootstrap .build/binary_chroot # Checking stage file -Check_stagefile .stage/binary_rootfs +Check_stagefile .build/binary_rootfs # Checking lock file Check_lockfile .lock @@ -82,7 +82,7 @@ do fi # Creating stage file - Create_stagefile .stage/binary_rootfs + Create_stagefile .build/binary_rootfs exit 0 fi done @@ -501,4 +501,4 @@ do done # Creating stage file -Create_stagefile .stage/binary_rootfs +Create_stagefile .build/binary_rootfs diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index 90c445f2b..587955cd2 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -43,10 +43,10 @@ esac Echo_message "Begin installing silo..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_silo +Check_stagefile .build/binary_silo # Checking silo templates Check_templates silo @@ -236,4 +236,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_silo +Create_stagefile .build/binary_silo diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux index 687fb73f2..b07fd60cd 100755 --- a/scripts/build/lb_binary_syslinux +++ b/scripts/build/lb_binary_syslinux @@ -32,10 +32,10 @@ fi Echo_message "Begin installing syslinux..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_syslinux +Check_stagefile .build/binary_syslinux # Checking lock file Check_lockfile .lock @@ -263,4 +263,4 @@ case "${LB_BUILD_WITH_CHROOT}" in esac # Creating stage file -Create_stagefile .stage/binary_syslinux +Create_stagefile .build/binary_syslinux diff --git a/scripts/build/lb_binary_tar b/scripts/build/lb_binary_tar index d63078ccc..4e6e614de 100755 --- a/scripts/build/lb_binary_tar +++ b/scripts/build/lb_binary_tar @@ -32,10 +32,10 @@ fi Echo_message "Begin building binary harddisk image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_tar +Check_stagefile .build/binary_tar # Checking lock file Check_lockfile .lock @@ -66,4 +66,4 @@ case "${LB_COMPRESSION}" in esac # Creating stage file -Create_stagefile .stage/binary_tar +Create_stagefile .build/binary_tar diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd index f97229908..88755102e 100755 --- a/scripts/build/lb_binary_virtual-hdd +++ b/scripts/build/lb_binary_virtual-hdd @@ -32,10 +32,10 @@ fi Echo_message "Begin building binary virtual-hdd image..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc +Require_stagefile .build/config .build/bootstrap .build/chroot_proc # Checking stage file -Check_stagefile .stage/binary_virtual-hdd +Check_stagefile .build/binary_virtual-hdd # Checking lock file Check_lockfile .lock @@ -108,4 +108,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_virtual-hdd +Create_stagefile .build/binary_virtual-hdd diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader index c60aeb88c..6ac4576f0 100755 --- a/scripts/build/lb_binary_win32-loader +++ b/scripts/build/lb_binary_win32-loader @@ -32,10 +32,10 @@ fi Echo_message "Begin copying win32-loader..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_win32-loader +Check_stagefile .build/binary_win32-loader # Checking lock file Check_lockfile .lock @@ -100,4 +100,4 @@ EOF esac # Creating stage file -Create_stagefile .stage/binary_win32-loader +Create_stagefile .build/binary_win32-loader diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index 7b5da685a..8318318e0 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -32,10 +32,10 @@ fi Echo_message "Begin installing yaboot..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/binary_yaboot +Check_stagefile .build/binary_yaboot # Checking yaboot templates Check_templates yaboot @@ -281,4 +281,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/binary_yaboot +Create_stagefile .build/binary_yaboot diff --git a/scripts/build/lb_bootstrap b/scripts/build/lb_bootstrap index 921804bb7..9e9cdb09f 100755 --- a/scripts/build/lb_bootstrap +++ b/scripts/build/lb_bootstrap @@ -14,7 +14,7 @@ set -e . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Automatically populating config tree -if [ -x auto/config ] && [ ! -e .stage/config ] +if [ -x auto/config ] && [ ! -e .build/config ] then Echo_message "Automatically populating config tree." lb config diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/lb_bootstrap_cache index 6cea8e62f..9323f27b9 100755 --- a/scripts/build/lb_bootstrap_cache +++ b/scripts/build/lb_bootstrap_cache @@ -36,7 +36,7 @@ do Echo_message "Restoring bootstrap stage from cache..." # Checking stage file - Check_stagefile .stage/bootstrap_cache.restore + Check_stagefile .build/bootstrap_cache.restore if [ -d cache/stages_bootstrap ] then @@ -58,8 +58,8 @@ do fi # Creating stage file - Create_stagefile .stage/bootstrap_cache.restore - Create_stagefile .stage/bootstrap + Create_stagefile .build/bootstrap_cache.restore + Create_stagefile .build/bootstrap exit 0 fi @@ -69,7 +69,7 @@ do Echo_message "Saving bootstrap stage to cache..." # Checking stage file - Check_stagefile .stage/bootstrap_cache.save + Check_stagefile .build/bootstrap_cache.save # Checking lock file Check_lockfile .lock @@ -89,7 +89,7 @@ do fi # Creating stage file - Create_stagefile .stage/bootstrap_cache.save + Create_stagefile .build/bootstrap_cache.save ;; esac fi diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap index 4b439d3e1..4bd601dcd 100755 --- a/scripts/build/lb_bootstrap_cdebootstrap +++ b/scripts/build/lb_bootstrap_cdebootstrap @@ -40,8 +40,8 @@ Check_package /usr/bin/${LB_BOOTSTRAP} cdebootstrap lb testroot # Checking stage file -Check_stagefile .stage/bootstrap -Check_stagefile .stage/bootstrap_cache.restore +Check_stagefile .build/bootstrap +Check_stagefile .build/bootstrap_cache.restore # Checking lock file Check_lockfile .lock @@ -168,7 +168,7 @@ then rm -rf chroot/var/cache/bootstrap # Creating stage file - Create_stagefile .stage/bootstrap + Create_stagefile .build/bootstrap else Echo_error "Can't process file /usr/bin/${LB_BOOTSTRAP} (FIXME)" exit 1 diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/lb_bootstrap_copy index 7d7d4ecae..b0e1f7e52 100755 --- a/scripts/build/lb_bootstrap_copy +++ b/scripts/build/lb_bootstrap_copy @@ -38,7 +38,7 @@ Echo_message "Begin bootstrapping system..." lb testroot # Checking stage file -Check_stagefile .stage/bootstrap +Check_stagefile .build/bootstrap # Checking lock file Check_lockfile .lock @@ -53,4 +53,4 @@ tar c / --exclude /proc --exclude /sys --exclude "$(dirname ${PWD})" | tar xv cd .. # Creating stage file -Create_stagefile .stage/bootstrap +Create_stagefile .build/bootstrap diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap index b83ee0231..f5dd76839 100755 --- a/scripts/build/lb_bootstrap_debootstrap +++ b/scripts/build/lb_bootstrap_debootstrap @@ -40,8 +40,8 @@ Check_package /usr/sbin/debootstrap debootstrap lb testroot # Checking stage file -Check_stagefile .stage/bootstrap -Check_stagefile .stage/bootstrap_cache.restore +Check_stagefile .build/bootstrap +Check_stagefile .build/bootstrap_cache.restore # Checking lock file Check_lockfile .lock @@ -171,7 +171,7 @@ then rm -f chroot/var/cache/apt/archives/*.deb # Creating stage file - Create_stagefile .stage/bootstrap + Create_stagefile .build/bootstrap else Echo_error "Can't process file /usr/bin/debootstrap (FIXME)" exit 1 diff --git a/scripts/build/lb_build b/scripts/build/lb_build index 523cfcab2..cd20b3490 100755 --- a/scripts/build/lb_build +++ b/scripts/build/lb_build @@ -14,7 +14,7 @@ set -e . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Automatically populating config tree -if [ -x auto/config ] && [ ! -e .stage/config ] +if [ -x auto/config ] && [ ! -e .build/config ] then Echo_message "Automatically populating config tree." lb config diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index b81b801e1..71bcb71a6 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -14,7 +14,7 @@ set -e . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Automatically populating config tree -if [ -x auto/config ] && [ ! -e .stage/config ] +if [ -x auto/config ] && [ ! -e .build/config ] then Echo_message "Automatically populating config tree." lb config diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index 710b2e032..a280d7846 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install|install-binary) Echo_message "Configuring file /etc/apt/apt.conf" # Checking stage file - Check_stagefile .stage/chroot_apt + Check_stagefile .build/chroot_apt # Checking lock file Check_lockfile .lock @@ -222,7 +222,7 @@ EOF esac # Creating stage file - Create_stagefile .stage/chroot_apt + Create_stagefile .build/chroot_apt ;; remove) @@ -326,7 +326,7 @@ EOF rm -f chroot/etc/apt/preferences.d/progress.tmp.pref # Removing stage file - rm -f .stage/chroot_apt + rm -f .build/chroot_apt ;; *) diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 0feff85ea..064c247f4 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -28,7 +28,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap _LB_LOCAL_KEY_EMAIL="live-build-local-key@invalid" @@ -47,7 +47,7 @@ case "${1}" in Echo_message "Configuring file /etc/apt/sources.list" # Checking stage file - Check_stagefile .stage/chroot_archives + Check_stagefile .build/chroot_archives # Checking lock file Check_lockfile .lock @@ -563,7 +563,7 @@ EOF Save_cache cache/packages_chroot # Creating stage file - Create_stagefile .stage/chroot_archives + Create_stagefile .build/chroot_archives ;; remove) @@ -588,7 +588,7 @@ EOF [ ! -d chroot/root/packages ] then # Removing stage file - rm -f .stage/chroot_archives + rm -f .build/chroot_archives exit 0 fi @@ -829,7 +829,7 @@ EOF fi # Removing stage file - rm -f .stage/chroot_archives + rm -f .build/chroot_archives ;; *) diff --git a/scripts/build/lb_chroot_cache b/scripts/build/lb_chroot_cache index 3f94ee5d4..876b0259f 100755 --- a/scripts/build/lb_chroot_cache +++ b/scripts/build/lb_chroot_cache @@ -33,7 +33,7 @@ do Echo_message "Restoring chroot stage from cache..." # Checking stage file - Check_stagefile .stage/chroot_cache.restore + Check_stagefile .build/chroot_cache.restore if [ -d cache/stages_chroot ] then @@ -55,7 +55,7 @@ do fi # Creating stage file - Create_stagefile .stage/chroot_cache.restore + Create_stagefile .build/chroot_cache.restore exit 0 fi @@ -65,7 +65,7 @@ do Echo_message "Saving chroot stage to cache..." # Checking stage file - Check_stagefile .stage/chroot_cache.save + Check_stagefile .build/chroot_cache.save # Checking lock file Check_lockfile .lock @@ -85,7 +85,7 @@ do fi # Creating stage file - Create_stagefile .stage/chroot_cache.save + Create_stagefile .build/chroot_cache.save ;; esac fi diff --git a/scripts/build/lb_chroot_debianchroot b/scripts/build/lb_chroot_debianchroot index 92fa94301..f407607d8 100755 --- a/scripts/build/lb_chroot_debianchroot +++ b/scripts/build/lb_chroot_debianchroot @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /etc/debian_chroot" # Checking stage file - Check_stagefile .stage/chroot_debianchroot + Check_stagefile .build/chroot_debianchroot # Checking lock file Check_lockfile .lock @@ -50,7 +50,7 @@ case "${1}" in echo "live" > chroot/etc/debian_chroot # Creating stage file - Create_stagefile .stage/chroot_debianchroot + Create_stagefile .build/chroot_debianchroot ;; remove) @@ -72,7 +72,7 @@ case "${1}" in fi # Removing stage file - rm -f .stage/chroot_debianchroot + rm -f .build/chroot_debianchroot ;; *) diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/lb_chroot_devpts index ae0e42b64..2df01dc40 100755 --- a/scripts/build/lb_chroot_devpts +++ b/scripts/build/lb_chroot_devpts @@ -28,14 +28,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Begin mounting /dev/pts..." # Checking stage file - Check_stagefile .stage/chroot_devpts + Check_stagefile .build/chroot_devpts # Checking lock file Check_lockfile .lock @@ -53,7 +53,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile .stage/chroot_devpts + Create_stagefile .build/chroot_devpts ;; remove) @@ -77,7 +77,7 @@ case "${1}" in fi # Removing stage file - rm -f .stage/chroot_devpts + rm -f .build/chroot_devpts ;; *) diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg index 6c44151cb..ec4681b5d 100755 --- a/scripts/build/lb_chroot_dpkg +++ b/scripts/build/lb_chroot_dpkg @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /sbin/start-stop-daemon" # Checking stage file - Check_stagefile .stage/chroot_dpkg + Check_stagefile .build/chroot_dpkg # Checking lock file Check_lockfile .lock @@ -75,7 +75,7 @@ EOF ln -s /bin/true chroot/usr/sbin/flash-kernel # Creating stage file - Create_stagefile .stage/chroot_dpkg + Create_stagefile .build/chroot_dpkg ;; remove) @@ -113,7 +113,7 @@ EOF rm -f chroot/etc/dpkg/dpkg.cfg.d/live-build # Removing stage file - rm -f .stage/chroot_dpkg + rm -f .build/chroot_dpkg ;; *) diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index 6f471ce08..e5e5857d2 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin executing hacks..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_hacks +Check_stagefile .build/chroot_hacks # Checking lock file Check_lockfile .lock @@ -306,4 +306,4 @@ if [ "${LB_SWAP_FILE_PATH}" ]; then fi # Creating stage file -Create_stagefile .stage/chroot_hacks +Create_stagefile .build/chroot_hacks diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks index 409c66aad..d74598abc 100755 --- a/scripts/build/lb_chroot_hooks +++ b/scripts/build/lb_chroot_hooks @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin executing hooks..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_hooks +Check_stagefile .build/chroot_hooks # Checking lock file Check_lockfile .lock @@ -100,7 +100,7 @@ then Save_cache cache/packages_chroot # Creating stage file - Create_stagefile .stage/chroot_hooks + Create_stagefile .build/chroot_hooks fi # Remove bind mount of build config inside chroot. diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname index 8459a140a..af7158207 100755 --- a/scripts/build/lb_chroot_hostname +++ b/scripts/build/lb_chroot_hostname @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /etc/hostname" # Checking stage file - Check_stagefile .stage/chroot_hostname + Check_stagefile .build/chroot_hostname # Checking lock file Check_lockfile .lock @@ -59,7 +59,7 @@ EOF chmod 755 chroot/bin/hostname # Creating stage file - Create_stagefile .stage/chroot_hostname + Create_stagefile .build/chroot_hostname ;; remove) @@ -86,7 +86,7 @@ EOF fi # Removing stage file - rm -f .stage/chroot_hostname + rm -f .build/chroot_hostname ;; *) diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/lb_chroot_hosts index 9d3ba8b94..1e7a513f7 100755 --- a/scripts/build/lb_chroot_hosts +++ b/scripts/build/lb_chroot_hosts @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /etc/hosts" # Checking stage file - Check_stagefile .stage/chroot_hosts + Check_stagefile .build/chroot_hosts # Checking lock file Check_lockfile .lock @@ -61,7 +61,7 @@ EOF fi # Creating stage file - Create_stagefile .stage/chroot_hosts + Create_stagefile .build/chroot_hosts ;; remove) @@ -89,7 +89,7 @@ EOF fi # Removing stage file - rm -f .stage/chroot_hosts + rm -f .build/chroot_hosts ;; *) diff --git a/scripts/build/lb_chroot_includes b/scripts/build/lb_chroot_includes index 5b98a7844..32237b2f4 100755 --- a/scripts/build/lb_chroot_includes +++ b/scripts/build/lb_chroot_includes @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin copying chroot includes..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/includes.chroot +Check_stagefile .build/includes.chroot # Checking lock file Check_lockfile .lock @@ -46,5 +46,5 @@ then cd "${OLDPWD}" # Creating stage file - Create_stagefile .stage/chroot_includes + Create_stagefile .build/chroot_includes fi diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages index 81890babb..3565fb6b7 100755 --- a/scripts/build/lb_chroot_install-packages +++ b/scripts/build/lb_chroot_install-packages @@ -31,10 +31,10 @@ Set_defaults Echo_message "Begin installing packages (${_PASS} pass)..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_install-packages.${PASS} +Check_stagefile .build/chroot_install-packages.${PASS} # Checking lock file Check_lockfile .lock @@ -67,4 +67,4 @@ then fi # Creating stage file -Create_stagefile .stage/chroot_install-packages.${_PASS} +Create_stagefile .build/chroot_install-packages.${_PASS} diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/lb_chroot_interactive index 678c94ddd..cdc68c442 100755 --- a/scripts/build/lb_chroot_interactive +++ b/scripts/build/lb_chroot_interactive @@ -32,10 +32,10 @@ fi Echo_message "Begin interactive build..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_interactive +Check_stagefile .build/chroot_interactive # Checking lock file Check_lockfile .lock @@ -59,4 +59,4 @@ case "${LB_INTERACTIVE}" in esac # Creating stage file -Create_stagefile .stage/chroot_interactive +Create_stagefile .build/chroot_interactive diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 573d32dbb..1dd4544f6 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -25,10 +25,10 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_linux-image +Check_stagefile .build/chroot_linux-image # Checking lock file Check_lockfile .lock @@ -105,5 +105,5 @@ EOF fi # Creating stage file - Create_stagefile .stage/chroot_linux-image + Create_stagefile .build/chroot_linux-image fi diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages index feb89fa4b..654c7192b 100755 --- a/scripts/build/lb_chroot_live-packages +++ b/scripts/build/lb_chroot_live-packages @@ -25,10 +25,10 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_live-packages +Check_stagefile .build/chroot_live-packages # Checking lock file Check_lockfile .lock @@ -76,5 +76,5 @@ then esac # Creating stage file - Create_stagefile .stage/chroot_live-packages + Create_stagefile .build/chroot_live-packages fi diff --git a/scripts/build/lb_chroot_local-patches b/scripts/build/lb_chroot_local-patches index f119f3f67..ce4654ded 100755 --- a/scripts/build/lb_chroot_local-patches +++ b/scripts/build/lb_chroot_local-patches @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin applying chroot local patches..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_local-patches +Check_stagefile .build/chroot_local-patches # Checking lock file Check_lockfile .lock @@ -62,5 +62,5 @@ then Save_cache cache/packages_chroot # Creating stage file - Create_stagefile .stage/chroot_local-patches + Create_stagefile .build/chroot_local-patches fi diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists index 54fcf6f2e..5f408f11c 100755 --- a/scripts/build/lb_chroot_package-lists +++ b/scripts/build/lb_chroot_package-lists @@ -30,10 +30,10 @@ Set_defaults Echo_message "Begin queueing installation of package lists (${_PASS} pass)..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_package-lists.${_PASS} +Check_stagefile .build/chroot_package-lists.${_PASS} # Checking lock file Check_lockfile .lock @@ -51,7 +51,7 @@ then done # Creating stage file - Create_stagefile .stage/chroot_package-lists.${_PASS} + Create_stagefile .build/chroot_package-lists.${_PASS} fi # Handling local package lists @@ -72,5 +72,5 @@ then done # Creating stage file - Create_stagefile .stage/chroot_package-lists.${_PASS} + Create_stagefile .build/chroot_package-lists.${_PASS} fi diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed index 893b0f5ba..553510b09 100755 --- a/scripts/build/lb_chroot_preseed +++ b/scripts/build/lb_chroot_preseed @@ -27,10 +27,10 @@ Set_defaults Echo_message "Begin executing local preseeds..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_preseed +Check_stagefile .build/chroot_preseed # Checking lock file Check_lockfile .lock @@ -68,5 +68,5 @@ then Remove_package # Creating stage file - Create_stagefile .stage/chroot_preseed + Create_stagefile .build/chroot_preseed fi diff --git a/scripts/build/lb_chroot_proc b/scripts/build/lb_chroot_proc index e9982bf81..45ad6c6ca 100755 --- a/scripts/build/lb_chroot_proc +++ b/scripts/build/lb_chroot_proc @@ -28,14 +28,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Begin mounting /proc..." # Checking stage file - Check_stagefile .stage/chroot_proc + Check_stagefile .build/chroot_proc # Checking lock file Check_lockfile .lock @@ -56,7 +56,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile .stage/chroot_proc + Create_stagefile .build/chroot_proc ;; remove) @@ -88,7 +88,7 @@ case "${1}" in fi # Removing stage file - rm -f .stage/chroot_proc + rm -f .build/chroot_proc ;; *) diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv index d47c3edbf..c2f4b3748 100755 --- a/scripts/build/lb_chroot_resolv +++ b/scripts/build/lb_chroot_resolv @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /etc/resolv.conf" # Checking stage file - Check_stagefile .stage/chroot_resolv + Check_stagefile .build/chroot_resolv # Checking lock file Check_lockfile .lock @@ -64,7 +64,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile .stage/chroot_resolv + Create_stagefile .build/chroot_resolv ;; remove) @@ -91,7 +91,7 @@ case "${1}" in fi # Removing stage file - rm -f .stage/chroot_resolv + rm -f .build/chroot_resolv ;; *) diff --git a/scripts/build/lb_chroot_selinuxfs b/scripts/build/lb_chroot_selinuxfs index b3cf34166..bd5d6a962 100755 --- a/scripts/build/lb_chroot_selinuxfs +++ b/scripts/build/lb_chroot_selinuxfs @@ -28,7 +28,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) @@ -37,7 +37,7 @@ case "${1}" in Echo_message "Begin mounting /selinux..." # Checking stage file - Check_stagefile .stage/chroot_selinuxfs + Check_stagefile .build/chroot_selinuxfs # Checking lock file Check_lockfile .lock @@ -58,7 +58,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile .stage/chroot_selinuxfs + Create_stagefile .build/chroot_selinuxfs fi ;; @@ -88,7 +88,7 @@ case "${1}" in fi # Removing stage file - rm -f .stage/chroot_selinux + rm -f .build/chroot_selinux ;; *) diff --git a/scripts/build/lb_chroot_sysfs b/scripts/build/lb_chroot_sysfs index 77dc54a8b..af633fb14 100755 --- a/scripts/build/lb_chroot_sysfs +++ b/scripts/build/lb_chroot_sysfs @@ -28,14 +28,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Begin mounting /sys..." # Checking stage file - Check_stagefile .stage/chroot_sysfs + Check_stagefile .build/chroot_sysfs # Checking lock file Check_lockfile .lock @@ -56,7 +56,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile .stage/chroot_sysfs + Create_stagefile .build/chroot_sysfs ;; remove) @@ -82,7 +82,7 @@ case "${1}" in fi # Removing stage file - rm -f .stage/chroot_sysfs + rm -f .build/chroot_sysfs ;; *) diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc index efb65e048..497e57866 100755 --- a/scripts/build/lb_chroot_sysv-rc +++ b/scripts/build/lb_chroot_sysv-rc @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /usr/sbin/policy-rc.d" # Checking stage file - Check_stagefile .stage/chroot_sysv-rc + Check_stagefile .build/chroot_sysv-rc # Checking lock file Check_lockfile .lock @@ -56,7 +56,7 @@ EOF chmod 0755 chroot/usr/sbin/policy-rc.d # Creating stage file - Create_stagefile .stage/chroot_sysv-rc + Create_stagefile .build/chroot_sysv-rc ;; remove) @@ -78,7 +78,7 @@ EOF fi # Removing stage file - rm -f .stage/chroot_sysv-rc + rm -f .build/chroot_sysv-rc ;; *) diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists index ebc62c751..ac1197e07 100755 --- a/scripts/build/lb_chroot_task-lists +++ b/scripts/build/lb_chroot_task-lists @@ -30,10 +30,10 @@ Set_defaults Echo_message "Begin installation of task lists (${_PASS} pass)..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/chroot_task-lists.${_PASS} +Check_stagefile .build/chroot_task-lists.${_PASS} # Checking lock file Check_lockfile .lock @@ -147,5 +147,5 @@ then Save_cache cache/packages_chroot # Creating stage file - Create_stagefile .stage/chroot_task-lists.${_PASS} + Create_stagefile .build/chroot_task-lists.${_PASS} fi diff --git a/scripts/build/lb_chroot_tmpfs b/scripts/build/lb_chroot_tmpfs index 5feb53734..fe00e1d2c 100755 --- a/scripts/build/lb_chroot_tmpfs +++ b/scripts/build/lb_chroot_tmpfs @@ -30,14 +30,14 @@ then fi # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring tmpfs for /var/lib/dpkg" # Checking stage file - Check_stagefile .stage/chroot_tmpfs + Check_stagefile .build/chroot_tmpfs # Checking lock file Check_lockfile .lock @@ -52,7 +52,7 @@ case "${1}" in rm -rf chroot/var/lib/dpkg.tmp # Creating stage file - Create_stagefile .stage/chroot_tmpfs + Create_stagefile .build/chroot_tmpfs ;; remove) @@ -71,7 +71,7 @@ case "${1}" in mv chroot/var/lib/dpkg.tmp chroot/var/lib/dpkg # Removing stage file - rm -f .stage/chroot_tmpfs + rm -f .build/chroot_tmpfs ;; *) diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart index 47bdca6b4..915ded2bc 100755 --- a/scripts/build/lb_chroot_upstart +++ b/scripts/build/lb_chroot_upstart @@ -25,14 +25,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi Set_defaults # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap case "${1}" in install) Echo_message "Configuring file /sbin/initctl" # Checking stage file - Check_stagefile .stage/chroot_upstart + Check_stagefile .build/chroot_upstart # Checking lock file Check_lockfile .lock @@ -56,7 +56,7 @@ EOF chmod 0755 chroot/sbin/initctl # Creating stage file - Create_stagefile .stage/chroot_upstart + Create_stagefile .build/chroot_upstart ;; remove) @@ -78,7 +78,7 @@ EOF fi # Removing stage file - rm -f .stage/chroot_upstart + rm -f .build/chroot_upstart ;; *) diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index 46ccaea90..67282de7d 100755 --- a/scripts/build/lb_clean +++ b/scripts/build/lb_clean @@ -89,7 +89,7 @@ do rm -f chroot.packages.live chroot.packages.install - rm -f .stage/chroot* + rm -f .build/chroot* ;; --binary) @@ -104,7 +104,7 @@ do rm -rf binary rm -rf tftpboot - rm -f .stage/binary* + rm -f .build/binary* ;; --remove) @@ -118,12 +118,12 @@ do if [ -e auto/config ] then - rm -f .stage/config + rm -f .build/config fi ;; --stage) - rm -rf .stage + rm -rf .build ;; --source) @@ -136,7 +136,7 @@ do rm -rf source - rm -f .stage/source* + rm -f .build/source* ;; -h|--help) diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 987ce494f..645020356 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -1481,4 +1481,4 @@ then fi # Creating stage file -Create_stagefile .stage/config +Create_stagefile .build/config diff --git a/scripts/build/lb_source b/scripts/build/lb_source index e87edd437..928e88bfa 100755 --- a/scripts/build/lb_source +++ b/scripts/build/lb_source @@ -14,7 +14,7 @@ set -e . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Automatically populating config tree -if [ -x auto/config ] && [ ! -e .stage/config ] +if [ -x auto/config ] && [ ! -e .build/config ] then Echo_message "Automatically populating config tree." lb config diff --git a/scripts/build/lb_source_checksums b/scripts/build/lb_source_checksums index 44e9a35cb..4c8ac08a4 100755 --- a/scripts/build/lb_source_checksums +++ b/scripts/build/lb_source_checksums @@ -30,10 +30,10 @@ then fi # Requiring stage file -Require_stagefile .stage/config .stage/source_debian +Require_stagefile .build/config .build/source_debian # Checking stage file -Check_stagefile .stage/source_checksums +Check_stagefile .build/source_checksums # Checking lock file Check_lockfile .lock @@ -88,4 +88,4 @@ EOF done # Creating stage file -Create_stagefile .stage/source_checksums +Create_stagefile .build/source_checksums diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian index 4781e43af..eb4b11ed8 100755 --- a/scripts/build/lb_source_debian +++ b/scripts/build/lb_source_debian @@ -32,10 +32,10 @@ fi Echo_message "Begin downloading sources..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/source_debian +Check_stagefile .build/source_debian # Checking lock file Check_lockfile .lock @@ -149,4 +149,4 @@ do done # Creating stage file -Create_stagefile .stage/source_debian +Create_stagefile .build/source_debian diff --git a/scripts/build/lb_source_debian-live b/scripts/build/lb_source_debian-live index 62272710d..ff7bd287c 100755 --- a/scripts/build/lb_source_debian-live +++ b/scripts/build/lb_source_debian-live @@ -32,10 +32,10 @@ fi Echo_message "Begin copying live-build configuration..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/source_debian-live +Check_stagefile .build/source_debian-live # Checking lock file Check_lockfile .lock @@ -59,4 +59,4 @@ then fi # Creating stage file -Create_stagefile .stage/source_debian-live +Create_stagefile .build/source_debian-live diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk index c0974ab14..657306627 100755 --- a/scripts/build/lb_source_disk +++ b/scripts/build/lb_source_disk @@ -36,10 +36,10 @@ esac Echo_message "Begin installing disk information..." # Requiring stage file -Require_stagefile .stage/config .stage/bootstrap +Require_stagefile .build/config .build/bootstrap # Checking stage file -Check_stagefile .stage/source_disk +Check_stagefile .build/source_disk # Checking lock file Check_lockfile .lock @@ -126,4 +126,4 @@ case "${LB_DEBIAN_INSTALLER}" in esac # Creating stage file -Create_stagefile .stage/source_disk +Create_stagefile .build/source_disk diff --git a/scripts/build/lb_source_hdd b/scripts/build/lb_source_hdd index f9dadee82..4b133ff9b 100755 --- a/scripts/build/lb_source_hdd +++ b/scripts/build/lb_source_hdd @@ -37,10 +37,10 @@ fi Echo_message "Begin building source hdd image..." # Requiring stage file -Require_stagefile .stage/config .stage/source_debian +Require_stagefile .build/config .build/source_debian # Checking stage file -Check_stagefile .stage/source_hdd +Check_stagefile .build/source_hdd # Checking lock file Check_lockfile .lock @@ -139,4 +139,4 @@ fi Remove_package # Creating stage file -Create_stagefile .stage/source_hdd +Create_stagefile .build/source_hdd diff --git a/scripts/build/lb_source_iso b/scripts/build/lb_source_iso index d2bddbc1f..beb61bad5 100755 --- a/scripts/build/lb_source_iso +++ b/scripts/build/lb_source_iso @@ -41,10 +41,10 @@ esac Echo_message "Begin building source iso image..." # Requiring stage file -Require_stagefile .stage/config .stage/source_debian +Require_stagefile .build/config .build/source_debian # Checking stage file -Check_stagefile .stage/source_iso +Check_stagefile .build/source_iso # Checking lock file Check_lockfile .lock @@ -111,4 +111,4 @@ rm -f chroot/source.sh Remove_package # Creating stage file -Create_stagefile .stage/source_iso +Create_stagefile .build/source_iso diff --git a/scripts/build/lb_source_net b/scripts/build/lb_source_net index 8ddad15c4..9a1829e8f 100755 --- a/scripts/build/lb_source_net +++ b/scripts/build/lb_source_net @@ -37,10 +37,10 @@ fi Echo_message "Begin building source netboot image..." # Requiring stage file -Require_stagefile .stage/config .stage/source_debian +Require_stagefile .build/config .build/source_debian # Checking stage file -Check_stagefile .stage/source_net +Check_stagefile .build/source_net # Checking lock file Check_lockfile .lock @@ -71,4 +71,4 @@ case "${_COMPRESSION}" in esac # Creating stage file -Create_stagefile .stage/source_net +Create_stagefile .build/source_net diff --git a/scripts/build/lb_source_tar b/scripts/build/lb_source_tar index 75f2cc0d6..0f9396de2 100755 --- a/scripts/build/lb_source_tar +++ b/scripts/build/lb_source_tar @@ -38,10 +38,10 @@ Echo_message "Begin building source tarball..." Echo_message "This may take a while." # Requiring stage file -Require_stagefile .stage/config .stage/source_debian +Require_stagefile .build/config .build/source_debian # Checking stage file -Check_stagefile .stage/source_tar +Check_stagefile .build/source_tar # Checking lock file Check_lockfile .lock @@ -77,4 +77,4 @@ case "${LB_COMPRESSION}" in esac # Creating stage file -Create_stagefile .stage/source_tar +Create_stagefile .build/source_tar diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/lb_source_virtual-hdd index 1b7d3e507..52566694c 100755 --- a/scripts/build/lb_source_virtual-hdd +++ b/scripts/build/lb_source_virtual-hdd @@ -37,10 +37,10 @@ fi Echo_message "Begin building source virtual-hdd image..." # Requiring stage file -Require_stagefile .stage/config .stage/source_debian +Require_stagefile .build/config .build/source_debian # Checking stage file -Check_stagefile .stage/source_virtual-hdd +Check_stagefile .build/source_virtual-hdd # Checking lock file Check_lockfile .lock @@ -103,4 +103,4 @@ Save_cache cache/packages_binary Remove_package # Creating stage file -Create_stagefile .stage/source_virtual-hdd +Create_stagefile .build/source_virtual-hdd |