summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_includes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:50 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit4739146fc6c4de8b16418517bb882312c475195c (patch)
treea3c29d97d1ead4ad4fa532b1c6bfdb419f160e71 /helpers/lh_binary_includes
parent1863ed88740575342008ac5f694d03e944bcece2 (diff)
downloadlive-build-4739146fc6c4de8b16418517bb882312c475195c.zip
live-build-4739146fc6c4de8b16418517bb882312c475195c.tar.gz
Adding live-helper 1.0~a6-1.
Diffstat (limited to 'helpers/lh_binary_includes')
-rwxr-xr-xhelpers/lh_binary_includes59
1 files changed, 46 insertions, 13 deletions
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index e343d72..18ad540 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -41,15 +41,15 @@ Breakpoint "binary_includes: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
# Check includes
if [ ! -d "${LIVE_INCLUDES}" ]
then
@@ -62,18 +62,51 @@ then
fi
fi
-if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
-then
- cd "${LIVE_INCLUDES}"/common
- find . | cpio -dmpu "${OLDPWD}"/binary
- cd "${OLDPWD}"
-fi
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ ARCH="amd"
+ ;;
+
+ i386)
+ ARCH="386"
+ ;;
-if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
+ powerpc)
+ ARCH="ppc"
+ ;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
- cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
- find . | cpio -dmpu "${OLDPWD}"/binary
- cd "${OLDPWD}"
+ # Copying d-i templates
+ if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+ ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+ then
+ cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+ fi
+
+ if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+ ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+ then
+ cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+ fi
+
+ # Adjusting d-i templates
+ DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+ DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+ if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ then
+ DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+ DEBIAN_TOOLS_TXT="/tools/ and /install/floppy/"
+ else
+ DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+ DEBIAN_TOOLS_TXT="/tools/"
+ fi
+
+ sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html
+ 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
# Creating stage file