[SCM] live-build branch, debian-next, updated. debian/2.0_a27-1-5-g76dfb56

Daniel Baumann daniel at debian.org
Sun Sep 12 19:03:42 UTC 2010


The following commit has been merged in the debian-next branch:
commit 76dfb5608fb1a2b33b97067195269a0688fe92b3
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 12 21:01:06 2010 +0200

    Prefixing helper scripts to make 'out of source' usage usable (Closes: #572455).

diff --git a/scripts/build/lb b/scripts/build/lb
index 9715fc2..d0b10f7 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -39,7 +39,7 @@ case "${1}" in
 		;;
 
 	*)
-		COMMAND="${1}"
+		COMMAND="lb_${1}"
 		shift
 
 		if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
diff --git a/scripts/build/binary b/scripts/build/lb_binary
similarity index 100%
rename from scripts/build/binary
rename to scripts/build/lb_binary
diff --git a/scripts/build/binary_checksums b/scripts/build/lb_binary_checksums
similarity index 100%
rename from scripts/build/binary_checksums
rename to scripts/build/lb_binary_checksums
diff --git a/scripts/build/binary_chroot b/scripts/build/lb_binary_chroot
similarity index 100%
rename from scripts/build/binary_chroot
rename to scripts/build/lb_binary_chroot
diff --git a/scripts/build/binary_debian-installer b/scripts/build/lb_binary_debian-installer
similarity index 100%
rename from scripts/build/binary_debian-installer
rename to scripts/build/lb_binary_debian-installer
diff --git a/scripts/build/binary_disk b/scripts/build/lb_binary_disk
similarity index 100%
rename from scripts/build/binary_disk
rename to scripts/build/lb_binary_disk
diff --git a/scripts/build/binary_encryption b/scripts/build/lb_binary_encryption
similarity index 100%
rename from scripts/build/binary_encryption
rename to scripts/build/lb_binary_encryption
diff --git a/scripts/build/binary_grub b/scripts/build/lb_binary_grub
similarity index 100%
rename from scripts/build/binary_grub
rename to scripts/build/lb_binary_grub
diff --git a/scripts/build/binary_grub2 b/scripts/build/lb_binary_grub2
similarity index 100%
rename from scripts/build/binary_grub2
rename to scripts/build/lb_binary_grub2
diff --git a/scripts/build/binary_includes b/scripts/build/lb_binary_includes
similarity index 100%
rename from scripts/build/binary_includes
rename to scripts/build/lb_binary_includes
diff --git a/scripts/build/binary_iso b/scripts/build/lb_binary_iso
similarity index 100%
rename from scripts/build/binary_iso
rename to scripts/build/lb_binary_iso
diff --git a/scripts/build/binary_linux-image b/scripts/build/lb_binary_linux-image
similarity index 100%
rename from scripts/build/binary_linux-image
rename to scripts/build/lb_binary_linux-image
diff --git a/scripts/build/binary_local-hooks b/scripts/build/lb_binary_local-hooks
similarity index 100%
rename from scripts/build/binary_local-hooks
rename to scripts/build/lb_binary_local-hooks
diff --git a/scripts/build/binary_local-includes b/scripts/build/lb_binary_local-includes
similarity index 100%
rename from scripts/build/binary_local-includes
rename to scripts/build/lb_binary_local-includes
diff --git a/scripts/build/binary_local-packageslists b/scripts/build/lb_binary_local-packageslists
similarity index 100%
rename from scripts/build/binary_local-packageslists
rename to scripts/build/lb_binary_local-packageslists
diff --git a/scripts/build/binary_manifest b/scripts/build/lb_binary_manifest
similarity index 100%
rename from scripts/build/binary_manifest
rename to scripts/build/lb_binary_manifest
diff --git a/scripts/build/binary_memtest b/scripts/build/lb_binary_memtest
similarity index 100%
rename from scripts/build/binary_memtest
rename to scripts/build/lb_binary_memtest
diff --git a/scripts/build/binary_net b/scripts/build/lb_binary_net
similarity index 100%
rename from scripts/build/binary_net
rename to scripts/build/lb_binary_net
diff --git a/scripts/build/binary_rootfs b/scripts/build/lb_binary_rootfs
similarity index 100%
rename from scripts/build/binary_rootfs
rename to scripts/build/lb_binary_rootfs
diff --git a/scripts/build/binary_silo b/scripts/build/lb_binary_silo
similarity index 100%
rename from scripts/build/binary_silo
rename to scripts/build/lb_binary_silo
diff --git a/scripts/build/binary_syslinux b/scripts/build/lb_binary_syslinux
similarity index 100%
rename from scripts/build/binary_syslinux
rename to scripts/build/lb_binary_syslinux
diff --git a/scripts/build/binary_tar b/scripts/build/lb_binary_tar
similarity index 100%
rename from scripts/build/binary_tar
rename to scripts/build/lb_binary_tar
diff --git a/scripts/build/binary_usb b/scripts/build/lb_binary_usb
similarity index 100%
rename from scripts/build/binary_usb
rename to scripts/build/lb_binary_usb
diff --git a/scripts/build/binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd
similarity index 100%
rename from scripts/build/binary_virtual-hdd
rename to scripts/build/lb_binary_virtual-hdd
diff --git a/scripts/build/binary_win32-loader b/scripts/build/lb_binary_win32-loader
similarity index 100%
rename from scripts/build/binary_win32-loader
rename to scripts/build/lb_binary_win32-loader
diff --git a/scripts/build/binary_yaboot b/scripts/build/lb_binary_yaboot
similarity index 100%
rename from scripts/build/binary_yaboot
rename to scripts/build/lb_binary_yaboot
diff --git a/scripts/build/bootstrap b/scripts/build/lb_bootstrap
similarity index 100%
rename from scripts/build/bootstrap
rename to scripts/build/lb_bootstrap
diff --git a/scripts/build/bootstrap_cache b/scripts/build/lb_bootstrap_cache
similarity index 100%
rename from scripts/build/bootstrap_cache
rename to scripts/build/lb_bootstrap_cache
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
similarity index 100%
rename from scripts/build/bootstrap_cdebootstrap
rename to scripts/build/lb_bootstrap_cdebootstrap
diff --git a/scripts/build/bootstrap_copy b/scripts/build/lb_bootstrap_copy
similarity index 100%
rename from scripts/build/bootstrap_copy
rename to scripts/build/lb_bootstrap_copy
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
similarity index 100%
rename from scripts/build/bootstrap_debootstrap
rename to scripts/build/lb_bootstrap_debootstrap
diff --git a/scripts/build/build b/scripts/build/lb_build
similarity index 100%
rename from scripts/build/build
rename to scripts/build/lb_build
diff --git a/scripts/build/chroot b/scripts/build/lb_chroot
similarity index 100%
rename from scripts/build/chroot
rename to scripts/build/lb_chroot
diff --git a/scripts/build/chroot_apt b/scripts/build/lb_chroot_apt
similarity index 100%
rename from scripts/build/chroot_apt
rename to scripts/build/lb_chroot_apt
diff --git a/scripts/build/chroot_cache b/scripts/build/lb_chroot_cache
similarity index 100%
rename from scripts/build/chroot_cache
rename to scripts/build/lb_chroot_cache
diff --git a/scripts/build/chroot_debianchroot b/scripts/build/lb_chroot_debianchroot
similarity index 100%
rename from scripts/build/chroot_debianchroot
rename to scripts/build/lb_chroot_debianchroot
diff --git a/scripts/build/chroot_devpts b/scripts/build/lb_chroot_devpts
similarity index 100%
rename from scripts/build/chroot_devpts
rename to scripts/build/lb_chroot_devpts
diff --git a/scripts/build/chroot_dpkg b/scripts/build/lb_chroot_dpkg
similarity index 100%
rename from scripts/build/chroot_dpkg
rename to scripts/build/lb_chroot_dpkg
diff --git a/scripts/build/chroot_dpkg_tmpfs b/scripts/build/lb_chroot_dpkg_tmpfs
similarity index 100%
rename from scripts/build/chroot_dpkg_tmpfs
rename to scripts/build/lb_chroot_dpkg_tmpfs
diff --git a/scripts/build/chroot_hacks b/scripts/build/lb_chroot_hacks
similarity index 100%
rename from scripts/build/chroot_hacks
rename to scripts/build/lb_chroot_hacks
diff --git a/scripts/build/chroot_hooks b/scripts/build/lb_chroot_hooks
similarity index 100%
rename from scripts/build/chroot_hooks
rename to scripts/build/lb_chroot_hooks
diff --git a/scripts/build/chroot_hostname b/scripts/build/lb_chroot_hostname
similarity index 100%
rename from scripts/build/chroot_hostname
rename to scripts/build/lb_chroot_hostname
diff --git a/scripts/build/chroot_hosts b/scripts/build/lb_chroot_hosts
similarity index 100%
rename from scripts/build/chroot_hosts
rename to scripts/build/lb_chroot_hosts
diff --git a/scripts/build/chroot_install-packages b/scripts/build/lb_chroot_install-packages
similarity index 100%
rename from scripts/build/chroot_install-packages
rename to scripts/build/lb_chroot_install-packages
diff --git a/scripts/build/chroot_interactive b/scripts/build/lb_chroot_interactive
similarity index 100%
rename from scripts/build/chroot_interactive
rename to scripts/build/lb_chroot_interactive
diff --git a/scripts/build/chroot_linux-image b/scripts/build/lb_chroot_linux-image
similarity index 100%
rename from scripts/build/chroot_linux-image
rename to scripts/build/lb_chroot_linux-image
diff --git a/scripts/build/chroot_local-hooks b/scripts/build/lb_chroot_local-hooks
similarity index 100%
rename from scripts/build/chroot_local-hooks
rename to scripts/build/lb_chroot_local-hooks
diff --git a/scripts/build/chroot_local-includes b/scripts/build/lb_chroot_local-includes
similarity index 100%
rename from scripts/build/chroot_local-includes
rename to scripts/build/lb_chroot_local-includes
diff --git a/scripts/build/chroot_local-packages b/scripts/build/lb_chroot_local-packages
similarity index 100%
rename from scripts/build/chroot_local-packages
rename to scripts/build/lb_chroot_local-packages
diff --git a/scripts/build/chroot_local-packageslists b/scripts/build/lb_chroot_local-packageslists
similarity index 100%
rename from scripts/build/chroot_local-packageslists
rename to scripts/build/lb_chroot_local-packageslists
diff --git a/scripts/build/chroot_local-patches b/scripts/build/lb_chroot_local-patches
similarity index 100%
rename from scripts/build/chroot_local-patches
rename to scripts/build/lb_chroot_local-patches
diff --git a/scripts/build/chroot_local-preseed b/scripts/build/lb_chroot_local-preseed
similarity index 100%
rename from scripts/build/chroot_local-preseed
rename to scripts/build/lb_chroot_local-preseed
diff --git a/scripts/build/chroot_localization b/scripts/build/lb_chroot_localization
similarity index 100%
rename from scripts/build/chroot_localization
rename to scripts/build/lb_chroot_localization
diff --git a/scripts/build/chroot_packages b/scripts/build/lb_chroot_packages
similarity index 100%
rename from scripts/build/chroot_packages
rename to scripts/build/lb_chroot_packages
diff --git a/scripts/build/chroot_packageslists b/scripts/build/lb_chroot_packageslists
similarity index 100%
rename from scripts/build/chroot_packageslists
rename to scripts/build/lb_chroot_packageslists
diff --git a/scripts/build/chroot_preseed b/scripts/build/lb_chroot_preseed
similarity index 100%
rename from scripts/build/chroot_preseed
rename to scripts/build/lb_chroot_preseed
diff --git a/scripts/build/chroot_proc b/scripts/build/lb_chroot_proc
similarity index 100%
rename from scripts/build/chroot_proc
rename to scripts/build/lb_chroot_proc
diff --git a/scripts/build/chroot_resolv b/scripts/build/lb_chroot_resolv
similarity index 100%
rename from scripts/build/chroot_resolv
rename to scripts/build/lb_chroot_resolv
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/lb_chroot_selinuxfs
similarity index 100%
rename from scripts/build/chroot_selinuxfs
rename to scripts/build/lb_chroot_selinuxfs
diff --git a/scripts/build/chroot_sources b/scripts/build/lb_chroot_sources
similarity index 100%
rename from scripts/build/chroot_sources
rename to scripts/build/lb_chroot_sources
diff --git a/scripts/build/chroot_symlinks b/scripts/build/lb_chroot_symlinks
similarity index 100%
rename from scripts/build/chroot_symlinks
rename to scripts/build/lb_chroot_symlinks
diff --git a/scripts/build/chroot_sysfs b/scripts/build/lb_chroot_sysfs
similarity index 100%
rename from scripts/build/chroot_sysfs
rename to scripts/build/lb_chroot_sysfs
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc
similarity index 100%
rename from scripts/build/chroot_sysv-rc
rename to scripts/build/lb_chroot_sysv-rc
diff --git a/scripts/build/chroot_sysvinit b/scripts/build/lb_chroot_sysvinit
similarity index 100%
rename from scripts/build/chroot_sysvinit
rename to scripts/build/lb_chroot_sysvinit
diff --git a/scripts/build/chroot_tasks b/scripts/build/lb_chroot_tasks
similarity index 100%
rename from scripts/build/chroot_tasks
rename to scripts/build/lb_chroot_tasks
diff --git a/scripts/build/chroot_upstart b/scripts/build/lb_chroot_upstart
similarity index 100%
rename from scripts/build/chroot_upstart
rename to scripts/build/lb_chroot_upstart
diff --git a/scripts/build/clean b/scripts/build/lb_clean
similarity index 100%
rename from scripts/build/clean
rename to scripts/build/lb_clean
diff --git a/scripts/build/config b/scripts/build/lb_config
similarity index 100%
rename from scripts/build/config
rename to scripts/build/lb_config
diff --git a/scripts/build/local b/scripts/build/lb_local
similarity index 100%
rename from scripts/build/local
rename to scripts/build/lb_local
diff --git a/scripts/build/source b/scripts/build/lb_source
similarity index 100%
rename from scripts/build/source
rename to scripts/build/lb_source
diff --git a/scripts/build/source_checksums b/scripts/build/lb_source_checksums
similarity index 100%
rename from scripts/build/source_checksums
rename to scripts/build/lb_source_checksums
diff --git a/scripts/build/source_debian b/scripts/build/lb_source_debian
similarity index 100%
rename from scripts/build/source_debian
rename to scripts/build/lb_source_debian
diff --git a/scripts/build/source_debian-live b/scripts/build/lb_source_debian-live
similarity index 100%
rename from scripts/build/source_debian-live
rename to scripts/build/lb_source_debian-live
diff --git a/scripts/build/source_disk b/scripts/build/lb_source_disk
similarity index 100%
rename from scripts/build/source_disk
rename to scripts/build/lb_source_disk
diff --git a/scripts/build/source_iso b/scripts/build/lb_source_iso
similarity index 100%
rename from scripts/build/source_iso
rename to scripts/build/lb_source_iso
diff --git a/scripts/build/source_net b/scripts/build/lb_source_net
similarity index 100%
rename from scripts/build/source_net
rename to scripts/build/lb_source_net
diff --git a/scripts/build/source_tar b/scripts/build/lb_source_tar
similarity index 100%
rename from scripts/build/source_tar
rename to scripts/build/lb_source_tar
diff --git a/scripts/build/source_usb b/scripts/build/lb_source_usb
similarity index 100%
rename from scripts/build/source_usb
rename to scripts/build/lb_source_usb
diff --git a/scripts/build/source_virtual-hdd b/scripts/build/lb_source_virtual-hdd
similarity index 100%
rename from scripts/build/source_virtual-hdd
rename to scripts/build/lb_source_virtual-hdd
diff --git a/scripts/build/testroot b/scripts/build/lb_testroot
similarity index 100%
rename from scripts/build/testroot
rename to scripts/build/lb_testroot

-- 
live-build



More information about the debian-live-changes mailing list