[SCM] Debian Live build scripts branch, master, updated. 1.0.3-1-8-g57ea2c5
Daniel Baumann
daniel at debian.org
Sun Feb 8 09:36:53 UTC 2009
The following commit has been merged in the master branch:
commit d348a758fa94bdb92457e5e06597a4fe86604929
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Feb 8 10:27:12 2009 +0100
Splitting out win32-loader handling into own helper script.
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 30d2414..470cae0 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -58,6 +58,7 @@ lh_binary_syslinux ${*}
lh_binary_yaboot ${*}
lh_binary_silo ${*}
lh_binary_disk ${*}
+lh_binary_win32-loader ${*}
lh_binary_includes ${*}
lh_binary_local-includes ${*}
lh_binary_local-hooks ${*}
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index eefa31a..e37cc61 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -159,20 +159,5 @@ then
sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_TXT}|g" binary/README.txt
fi
-# Copying win32-loader
-if [ "${LH_WIN32_LOADER}" = "enabled" ]
-then
- case "${LH_ARCHITECTURE}" in
- amd64|i386)
- if Find_files /usr/lib/win32-loader/*
- then
- cp /usr/lib/win32-loader/* binary
- else
- Echo_warning "win32-loader inclusion is enabled but not found, ignoring."
- fi
- ;;
- esac
-fi
-
# Creating stage file
Create_stagefile .stage/binary_includes
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_binary_win32-loader
similarity index 59%
copy from helpers/lh_chroot_symlinks
copy to helpers/lh_binary_win32-loader
index 69cbd20..c9f8910 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_binary_win32-loader
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_symlinks(1) - convert symlinks
+# lh_binary_win32-loader(1) - copy win32-loader into binary
# Copyright (C) 2006-2009 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -13,7 +13,7 @@ set -e
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
# Setting static variables
-DESCRIPTION="$(Echo 'convert symlinks')"
+DESCRIPTION="$(Echo 'copy win32-loader into binary')"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -23,18 +23,13 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SYMLINKS}" != "enabled" ]
-then
- exit 0
-fi
-
-Echo_message "Begin converting symlinks..."
+Echo_message "Begin copying win32-loader..."
# Requiring stage file
Require_stagefile .stage/config .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/chroot_symlinks
+Check_stagefile .stage/binary_win32-loader
# Checking lock file
Check_lockfile .lock
@@ -42,17 +37,20 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking depends
-Check_package chroot/usr/bin/symlinks symlinks
-
-# Installing depends
-Install_package
-
-# Converting symlinks
-Chroot chroot "symlinks -c -r -s /"
-
-# Removing depends
-Remove_package
+# Copying win32-loader
+if [ "${LH_WIN32_LOADER}" = "enabled" ]
+then
+ case "${LH_ARCHITECTURE}" in
+ amd64|i386)
+ if Find_files /usr/lib/win32-loader/*
+ then
+ cp /usr/lib/win32-loader/* binary
+ else
+ Echo_warning "win32-loader inclusion is enabled but not found, ignoring."
+ fi
+ ;;
+ esac
+fi
# Creating stage file
-Create_stagefile .stage/chroot_symlinks
+Create_stagefile .stage/binary_win32-loader
diff --git a/manpages/lh_chroot_local-patches.en.1 b/manpages/lh_binary_win32-loader.en.1
similarity index 65%
copy from manpages/lh_chroot_local-patches.en.1
copy to manpages/lh_binary_win32-loader.en.1
index 5c84d8c..45fbc6c 100644
--- a/manpages/lh_chroot_local-patches.en.1
+++ b/manpages/lh_binary_win32-loader.en.1
@@ -1,19 +1,19 @@
-.TH LH_CHROOT_COPY 1 "2009\-01\-23" "1.0.2" "live\-helper"
+.TH LH_BINARY_WIN32\-LOADER 1 "2009\-01\-23" "1.0.2" "live\-helper"
.SH NAME
-lh_chroot_local-patches \- apply local patches against chroot
+lh_binary_win32\-loader \- install win32\-loader into binary
.SH SYNOPSIS
-\fBlh_chroot_local-patches\fR [\fIlive\-helper options\fR]
+\fBlh_binary_win32\-loader\fR [\fIlive\-helper options\fR]
.SH DESCRIPTION
-lh_chroot_local-patches is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It applies local patches against chroot.
+lh_binary_win32\-loader is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It installs win32\-loader into binary.
.SH OPTIONS
-lh_chroot_local-patches has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
+lh_binary_win32\-loader has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
.SH SEE ALSO
-\fIlh_chroot\fR(1)
+\fIlh_binary\fR(1)
.br
\fIlive\-helper\fR(7)
.PP
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index cbd93b5..bef9299 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -189,6 +189,8 @@ installs syslinux into binary
build harddisk binary image
.IP "\fBlh_binary_usb-hdd\fR(1)" 4
build binary usb-hdd image
+.IP "\fBlh_binary_win32-loader\fR(1)" 4
+installs win32-loader into binary
.IP "\fBlh_binary_yaboot\fR(1)" 4
installs yaboot into binary
.SS Source commands
--
Debian Live build scripts
More information about the debian-live-changes
mailing list