manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replacing some references to live-helper with live-build.

This commit is contained in:
Daniel Baumann 2010-09-02 13:22:22 +02:00
parent 4d22ca948a
commit ce4581282e
14 changed files with 29 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -45,7 +45,7 @@ install:
# Installing executables # Installing executables
mkdir -p $(DESTDIR)/usr/bin mkdir -p $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/share/live/build/scripts/build/lh $(DESTDIR)/usr/share/live/build/scripts/build/live-helper $(DESTDIR)/usr/bin mv $(DESTDIR)/usr/share/live/build/scripts/build/lb $(DESTDIR)/usr/share/live/build/scripts/build/live-build $(DESTDIR)/usr/bin
# Installing documentation # Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-build mkdir -p $(DESTDIR)/usr/share/doc/live-build
@ -76,7 +76,7 @@ uninstall:
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live
# Uninstalling executables # Uninstalling executables
rm -f $(DESTDIR)/usr/bin/lh $(DESTDIR)/usr/bin/live-helper rm -f $(DESTDIR)/usr/bin/lb $(DESTDIR)/usr/bin/live-build
# Uninstalling documentation # Uninstalling documentation
rm -rf $(DESTDIR)/usr/share/doc/live-build rm -rf $(DESTDIR)/usr/share/doc/live-build

2
functions/common.sh
View File

@ -8,7 +8,7 @@
## under certain conditions; see COPYING for details. ## under certain conditions; see COPYING for details.
PACKAGE="live-helper" PACKAGE="live-build"
VERSION="2.0~a23-1" VERSION="2.0~a23-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')" CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"

12
functions/defaults.sh
View File

@ -961,7 +961,7 @@ Set_defaults ()
fi fi
# Set iso preparer # Set iso preparer
LH_ISO_PREPARER="${LH_ISO_PREPARER:-live-helper \$VERSION; http://packages.qa.debian.org/live-helper}" LH_ISO_PREPARER="${LH_ISO_PREPARER:-live-build \$VERSION; http://packages.qa.debian.org/live-build}"
# Set iso publisher # Set iso publisher
LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org}" LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER:-Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org}"
@ -1097,20 +1097,20 @@ Check_defaults ()
then then
# We're only checking when we're actually running the checks # We're only checking when we're actually running the checks
# that's why the check for emptyness of the version; # that's why the check for emptyness of the version;
# however, as live-helper always declares LH_CONFIG_VERSION # however, as live-build always declares LH_CONFIG_VERSION
# internally, this is safe assumption (no cases where it's unset, # internally, this is safe assumption (no cases where it's unset,
# except when bootstrapping the functions/defaults etc.). # except when bootstrapping the functions/defaults etc.).
CURRENT_CONFIG_VERSION="$(echo ${LH_CONFIG_VERSION} | awk -F. '{ print $1 }')" CURRENT_CONFIG_VERSION="$(echo ${LH_CONFIG_VERSION} | awk -F. '{ print $1 }')"
if [ ${CURRENT_CONFIG_VERSION} -ge 3 ] if [ ${CURRENT_CONFIG_VERSION} -ge 3 ]
then then
Echo_error "This config tree is too new for this version of live-helper (${VERSION})." Echo_error "This config tree is too new for this version of live-build (${VERSION})."
Echo_error "Aborting build, please get a new version of live-helper." Echo_error "Aborting build, please get a new version of live-build."
exit 1 exit 1
elif [ ${CURRENT_CONFIG_VERSION} -eq 1 ] elif [ ${CURRENT_CONFIG_VERSION} -eq 1 ]
then then
Echo_error "This config tree is too old for this version of live-helper (${VERSION})." Echo_error "This config tree is too old for this version of live-build (${VERSION})."
Echo_error "Aborting build, please repopulate the config tree." Echo_error "Aborting build, please repopulate the config tree."
exit 1 exit 1
elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ] elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ]
@ -1155,7 +1155,7 @@ Check_defaults ()
# grub or yaboot + usb # grub or yaboot + usb
case "${LH_BOOTLOADER}" in case "${LH_BOOTLOADER}" in
grub|yaboot) grub|yaboot)
Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-helper. Please use either another bootloader or a different image type." Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type."
exit 1 exit 1
;; ;;
esac esac

2
scripts/build/binary_grub
View File

@ -144,7 +144,7 @@ case "${LH_BINARY_IMAGES}" in
;; ;;
usb*|net) usb*|net)
Echo_warning "Bootloader in this image type not yet supported by live-helper." Echo_warning "Bootloader in this image type not yet supported by live-build."
Echo_warning "This would produce a not bootable image, aborting (FIXME)." Echo_warning "This would produce a not bootable image, aborting (FIXME)."
exit 1 exit 1
;; ;;

2
scripts/build/binary_grub2
View File

@ -118,7 +118,7 @@ case "${LH_BINARY_IMAGES}" in
;; ;;
usb*|net) usb*|net)
Echo_warning "Bootloader in this image type not yet supported by live-helper." Echo_warning "Bootloader in this image type not yet supported by live-build."
Echo_warning "This would produce a not bootable image, aborting (FIXME)." Echo_warning "This would produce a not bootable image, aborting (FIXME)."
exit 1 exit 1
;; ;;

4
scripts/build/binary_iso
View File

@ -75,7 +75,7 @@ fi
# Handle genisoimage generic options # Handle genisoimage generic options
GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot" GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
# Handle genisoimage live-helper specific options # Handle genisoimage live-build specific options
if [ "${_QUIET}" = "true" ] if [ "${_QUIET}" = "true" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
@ -139,7 +139,7 @@ case "${LH_BOOTLOADER}" in
;; ;;
*) *)
Echo_warning "Bootloader on your architecture not yet supported by live-helper." Echo_warning "Bootloader on your architecture not yet supported by live-build."
Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)." Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)."
sleep 5 sleep 5
;; ;;

2
scripts/build/chroot_hacks
View File

@ -166,7 +166,7 @@ esac
Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u" Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
# Ensure readable permissions on initramfs. loop-aes-utils sets umask to # Ensure readable permissions on initramfs. loop-aes-utils sets umask to
# protect GPG keys, which live-helper does not support. # protect GPG keys, which live-build does not support.
# Note: Use find rather than chmod on the wildcard, one never knows what # Note: Use find rather than chmod on the wildcard, one never knows what
# people might do in local hooks, and there might be no initrds at all. # people might do in local hooks, and there might be no initrds at all.
find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r

2
scripts/build/chroot_linux-image
View File

@ -56,7 +56,7 @@ EOF
# Diverting update-initramfs # Diverting update-initramfs
#if [ "${LH_INITRAMFS}" = "live-initramfs" ] #if [ "${LH_INITRAMFS}" = "live-initramfs" ]
#then #then
# mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-helper # mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
#fi #fi
if [ "${LH_LINUX_PACKAGES}" != "none" ] if [ "${LH_LINUX_PACKAGES}" != "none" ]

4
scripts/build/chroot_sources
View File

@ -27,7 +27,7 @@ Set_defaults
# Requiring stage file # Requiring stage file
Require_stagefile .stage/config .stage/bootstrap Require_stagefile .stage/config .stage/bootstrap
_LH_LOCAL_KEY_EMAIL="live-helper-local-key@invalid" _LH_LOCAL_KEY_EMAIL="live-build-local-key@invalid"
case "${1}" in case "${1}" in
install) install)
@ -242,7 +242,7 @@ case "${1}" in
Key-Length: 1024 Key-Length: 1024
Subkey-Type: ELG-E Subkey-Type: ELG-E
Subkey-Length: 1024 Subkey-Length: 1024
Name-Real: live-helper local packages key Name-Real: live-build local packages key
Name-Email: ${_LH_LOCAL_KEY_EMAIL} Name-Email: ${_LH_LOCAL_KEY_EMAIL}
Expire-Date: 0 Expire-Date: 0
%secring /root/local-package-keyring.sec %secring /root/local-package-keyring.sec

20
scripts/build/config
View File

@ -26,8 +26,8 @@ then
fi fi
# Setting static variables # Setting static variables
SYSTEM_LH_CONFFILE="/etc/default/live-helper" SYSTEM_LH_CONFFILE="/etc/default/live-build"
DESCRIPTION="$(Echo 'create configuration for live-helper(7)')" DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
USAGE="${PROGRAM} [--apt apt|aptitude]\n\ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\ \t [--apt-ftp-proxy URL]\n\
\t [--apt-http-proxy URL]\n\ \t [--apt-http-proxy URL]\n\
@ -172,10 +172,10 @@ Local_arguments ()
# Dump version # Dump version
if [ -x "$(which dpkg-query 2>/dev/null)" ] if [ -x "$(which dpkg-query 2>/dev/null)" ]
then then
VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-helper)" VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-build)"
fi fi
Echo "%s: This is live-helper version %s" "${0}" "${VERSION_DPKG:-${VERSION}}" Echo "%s: This is live-build version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"
# Dump conffile contents # Dump conffile contents
Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
@ -829,9 +829,9 @@ mkdir -p config
mkdir -p config/includes mkdir -p config/includes
mkdir -p config/templates mkdir -p config/templates
# Creating live-helper configuration # Creating live-build configuration
cat > config/common << EOF cat > config/common << EOF
# config/common - common options for live-helper(7) # config/common - common options for live-build(7)
# LH_CONFIG_VERSION: internal version of the configuration file format # LH_CONFIG_VERSION: internal version of the configuration file format
LH_CONFIG_VERSION="${CONFIG_VERSION}" LH_CONFIG_VERSION="${CONFIG_VERSION}"
@ -967,7 +967,7 @@ EOF
# Creating lh_bootstrap_* configuration # Creating lh_bootstrap_* configuration
cat > config/bootstrap << EOF cat > config/bootstrap << EOF
# config/bootstrap - options for live-helper(7), bootstrap stage # config/bootstrap - options for live-build(7), bootstrap stage
# \$LH_ARCHITECTURE: select chroot architecture # \$LH_ARCHITECTURE: select chroot architecture
# (Default: autodetected) # (Default: autodetected)
@ -1045,7 +1045,7 @@ mkdir -p config/chroot_local-preseed
mkdir -p config/chroot_sources mkdir -p config/chroot_sources
cat > config/chroot << EOF cat > config/chroot << EOF
# config/chroot - options for live-helper(7), chroot stage # config/chroot - options for live-build(7), chroot stage
# \$LH_CHROOT_FILESYSTEM: set chroot filesystem # \$LH_CHROOT_FILESYSTEM: set chroot filesystem
# (Default: ${LH_CHROOT_FILESYSTEM}) # (Default: ${LH_CHROOT_FILESYSTEM})
@ -1133,7 +1133,7 @@ mkdir -p config/binary_rootfs
mkdir -p config/binary_syslinux mkdir -p config/binary_syslinux
cat > config/binary << EOF cat > config/binary << EOF
# config/binary - options for live-helper(7), binary stage # config/binary - options for live-build(7), binary stage
# \$LH_BINARY_FILESYSTEM: set image filesystem # \$LH_BINARY_FILESYSTEM: set image filesystem
# (Default: ${LH_BINARY_FILESYSTEM}) # (Default: ${LH_BINARY_FILESYSTEM})
@ -1295,7 +1295,7 @@ EOF
# Creating lh_source_* configuration # Creating lh_source_* configuration
cat > config/source << EOF cat > config/source << EOF
# config/source - options for live-helper(7), source stage # config/source - options for live-build(7), source stage
# \$LH_SOURCE: set source option # \$LH_SOURCE: set source option
# (Default: ${LH_SOURCE}) # (Default: ${LH_SOURCE})

59
scripts/build/lh
View File

@ -1,59 +0,0 @@
#!/bin/sh
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
HELP="FIXME"
USAGE="FIXME"
case "${1}" in
-h|--help)
if [ -x "$(which man 2>/dev/null)" ]
then
man lh
exit 0
else
${0} --usage
exit 0
fi
;;
""|-u|--usage)
Usage
;;
-v|--version)
Version
;;
*)
COMMAND="${1}"
shift
if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ]
then
LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}"
elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
then
LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
then
LH=1 exec "${COMMAND}" "${@}"
else
Echo_error "no such script"
exit 1
fi
;;
esac

39
scripts/build/live-helper
View File

@ -1,39 +0,0 @@
#!/bin/sh
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
## On Debian systems, the complete text of the GNU General Public License
## can be found in /usr/share/common-licenses/GPL-3 file.
set -e
# Including common functions
. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
if [ -x "$(which man 2>/dev/null)" ]
then
man live-helper
exit 0
else
Echo "live-helper is a set of scripts to build Debian Live system images."
echo
Echo "The idea behind live-helper is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
echo
Echo "An introduction to live-helper can be found in the live-helper(7) manpage."
exit 0
fi

2
scripts/build/local
View File

@ -8,7 +8,7 @@
## under certain conditions; see COPYING for details. ## under certain conditions; see COPYING for details.
LH_BASE="${PWD}/live-helper" LH_BASE="${PWD}/live-build"
PATH="${LH_BASE}/helpers:${PATH}" PATH="${LH_BASE}/helpers:${PATH}"
export LH_BASE PATH export LH_BASE PATH

2
scripts/build/source_debian-live
View File

@ -29,7 +29,7 @@ then
exit 0 exit 0
fi fi
Echo_message "Begin copying live-helper configuration..." Echo_message "Begin copying live-build configuration..."
# Requiring stage file # Requiring stage file
Require_stagefile .stage/config .stage/bootstrap Require_stagefile .stage/config .stage/bootstrap