summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2010-09-09 12:07:55 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2010-09-09 12:07:55 +0200
commit140e47372b669942e86d27a4293d9a767a297816 (patch)
treeed70f3a6dacc97ecad45e77d08a18dd683d7405f /auto
parentb451f4c2357d7da5efd084dd44354f81d4e3b05c (diff)
downloadkanotix-140e47372b669942e86d27a4293d9a767a297816.zip
kanotix-140e47372b669942e86d27a4293d9a767a297816.tar.gz
update from lh to lb scheme
Diffstat (limited to 'auto')
-rwxr-xr-xauto/build22
-rwxr-xr-xauto/clean6
-rwxr-xr-xauto/config10
-rwxr-xr-xauto/kanotix46
4 files changed, 42 insertions, 42 deletions
diff --git a/auto/build b/auto/build
index 62e8d8b..7b7e26b 100755
--- a/auto/build
+++ b/auto/build
@@ -4,7 +4,7 @@
. config/common
. config/kanotix
bit=32
-[ "$LH_ARCHITECTURE" = "amd64" ] && bit=64
+[ "$LB_ARCHITECTURE" = "amd64" ] && bit=64
# Update kanotix-version (32/64-bit and timestamp)
[ ! -f config/chroot_local-includes/etc/kanotix-version ] && echo "Kanotix Hellfire 0000-00:00" > config/chroot_local-includes/etc/kanotix-version
@@ -13,12 +13,12 @@ perl -pi -e "s%(Kanotix|Excalibur|Hellfire)(32|64)%\${1}$bit%i; s%(32|64)(bit)%$
prebuild()
{
# Include nvidia-driver into chroot
- if [ "$LH_KANOTIX_NVIDIA" = "true" -a -f config/chroot_local-includes/usr/local/bin/install-nvidia-debian.sh ]; then
+ if [ "$LB_KANOTIX_NVIDIA" = "true" -a -f config/chroot_local-includes/usr/local/bin/install-nvidia-debian.sh ]; then
mkdir -p config/chroot_local-includes/usr/src
VER="$(grep -o ^VER=.* config/chroot_local-includes/usr/local/bin/install-nvidia-debian.sh|sed s/VER=//)"
- ARCH=; [ "$LH_ARCHITECTURE" = "amd64" ] && ARCH="_64"
+ ARCH=; [ "$LB_ARCHITECTURE" = "amd64" ] && ARCH="_64"
URL="http://download.nvidia.com/XFree86/Linux-x86$ARCH/$VER/NVIDIA-Linux-x86$ARCH-$VER.run"
- if [ "$LH_CACHE" = "false" ]; then
+ if [ "$LB_CACHE" = "false" ]; then
wget -N -P config/chroot_local-includes/usr/src "$URL"
else
mkdir -p cache
@@ -29,12 +29,12 @@ prebuild()
# make current build configuration available for hooks inside chroot
mkdir -p config/chroot_local-includes/root
- cat config/* 2>/dev/null | grep ^LH_ > config/chroot_local-includes/root/build.conf
+ cat config/* 2>/dev/null | grep ^LB_ > config/chroot_local-includes/root/build.conf
# Kanotix flavours
- if [ "$LH_KANOTIX_FLAVOURS" -a "$LH_KANOTIX_FLAVOURS" != "none" ]; then
+ if [ "$LB_KANOTIX_FLAVOURS" -a "$LB_KANOTIX_FLAVOURS" != "none" ]; then
echo "# DO NOT EDIT THIS FILE! It is auto-generated and will be deleted/ overwritten!" > config/chroot_local-packageslists/kanotix-flavours.list
- for FLAVOUR in $LH_KANOTIX_FLAVOURS
+ for FLAVOUR in $LB_KANOTIX_FLAVOURS
do
echo "#include <$FLAVOUR>" >> config/chroot_local-packageslists/kanotix-flavours.list
done
@@ -47,10 +47,10 @@ postbuild()
rm -f config/chroot_local-packageslists/kanotix-flavours.list
}
-if [ "$LH_KANOTIX_TMPFS" = "true" ]; then
+if [ "$LB_KANOTIX_TMPFS" = "true" ]; then
mkdir -p tmpfs
# build using tmpfs
- [ -z "$(stat --printf "%d\n" . tmpfs | uniq -u)" ] && mount -t tmpfs -o "$LH_KANOTIX_TMPFS_OPTIONS" tmpfs tmpfs
+ [ -z "$(stat --printf "%d\n" . tmpfs | uniq -u)" ] && mount -t tmpfs -o "$LB_KANOTIX_TMPFS_OPTIONS" tmpfs tmpfs
cd tmpfs
# delete everything except cache
find . -maxdepth 1 ! -name cache -exec rm -r '{}' \; 2>/dev/null
@@ -58,12 +58,12 @@ if [ "$LH_KANOTIX_TMPFS" = "true" ]; then
rsync -a .. . --exclude=tmpfs
# build
prebuild
- time lh build noauto ${@} 2>&1 | tee binary.log
+ time lb build noauto ${@} 2>&1 | tee binary.log
postbuild
cd ..
else
prebuild
- time lh build noauto ${@} 2>&1 | tee binary.log
+ time lb build noauto ${@} 2>&1 | tee binary.log
postbuild
fi
diff --git a/auto/clean b/auto/clean
index fa41233..fb17beb 100755
--- a/auto/clean
+++ b/auto/clean
@@ -31,7 +31,7 @@ while [ "$1" ]
do
case "$1" in
--help)
- lh clean noauto --help
+ lb clean noauto --help
echo -e "\nAdditional Options for Kanotix:\n\t[--tmpfs]\n"
exit 1
;;
@@ -40,7 +40,7 @@ do
[ "$(stat --printf "%d\n" . tmpfs | uniq -u)" ] && umount tmpfs
rmdir tmpfs
fi
- lh clean noauto --all
+ lb clean noauto --all
exit 1
;;
--tmpfs)
@@ -50,7 +50,7 @@ do
fi
;;
*)
- lh clean noauto "$1"
+ lb clean noauto "$1"
;;
esac
shift
diff --git a/auto/config b/auto/config
index fb81430..fbce55c 100755
--- a/auto/config
+++ b/auto/config
@@ -8,7 +8,7 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT"
. auto/kanotix
-lh config noauto \
+lb config noauto \
--iso-volume KANOTIX \
--iso-preparer kanotix.com \
--iso-publisher kanotix.com \
@@ -37,21 +37,21 @@ lh config noauto \
${@}
# hostname and username are configured in config/chroot_local-includes/etc/live/config.conf
-#lh config noauto \
+#lb config noauto \
# --hostname Kanotix \
# --username kanotix \
. config/bootstrap
# architecture depending stuff (e.g. kernel)
-case $LH_ARCHITECTURE in
+case $LB_ARCHITECTURE in
"amd64")
- lh config noauto \
+ lb config noauto \
--linux-flavours amd64 \
--linux-packages "linux-image-2.6 linux-headers-2.6"
;;
"i386")
- lh config noauto \
+ lb config noauto \
--linux-flavours 686-bigmem \
--linux-packages "linux-image-2.6 linux-headers-2.6"
;;
diff --git a/auto/kanotix b/auto/kanotix
index fb0aed3..c61e9cf 100755
--- a/auto/kanotix
+++ b/auto/kanotix
@@ -17,30 +17,30 @@ eof
write_kanotix_config()
{
-[ -z "${LH_KANOTIX_FLAVOURS}" ] && LH_KANOTIX_FLAVOURS="kanotix-master"
-[ -z "${LH_KANOTIX_NVIDIA}" ] && LH_KANOTIX_NVIDIA="true"
-[ -z "${LH_KANOTIX_TMPFS}" ] && [ -d tmpfs ] && LH_KANOTIX_TMPFS="true"
-[ -z "${LH_KANOTIX_TMPFS}" ] && LH_KANOTIX_TMPFS="false"
-[ -z "${LH_KANOTIX_TMPFS_OPTIONS}" ] && [ -f tmpfs/options ] && LH_KANOTIX_TMPFS_OPTIONS="$(<tmpfs/options)"
-[ -z "${LH_KANOTIX_TMPFS_OPTIONS}" ] && LH_KANOTIX_TMPFS_OPTIONS="defaults"
+[ -z "${LB_KANOTIX_FLAVOURS}" ] && LB_KANOTIX_FLAVOURS="kanotix-master"
+[ -z "${LB_KANOTIX_NVIDIA}" ] && LB_KANOTIX_NVIDIA="true"
+[ -z "${LB_KANOTIX_TMPFS}" ] && [ -d tmpfs ] && LB_KANOTIX_TMPFS="true"
+[ -z "${LB_KANOTIX_TMPFS}" ] && LB_KANOTIX_TMPFS="false"
+[ -z "${LB_KANOTIX_TMPFS_OPTIONS}" ] && [ -f tmpfs/options ] && LB_KANOTIX_TMPFS_OPTIONS="$(<tmpfs/options)"
+[ -z "${LB_KANOTIX_TMPFS_OPTIONS}" ] && LB_KANOTIX_TMPFS_OPTIONS="defaults"
cat >config/kanotix << EOF
# config/kanotix - additional options for Kanotix
-# \$LH_KANOTIX_FLAVOURS: select Kanotix-packageslists
+# \$LB_KANOTIX_FLAVOURS: select Kanotix-packageslists
# (Default: kanotix-master)
-LH_KANOTIX_FLAVOURS="${LH_KANOTIX_FLAVOURS}"
+LB_KANOTIX_FLAVOURS="${LB_KANOTIX_FLAVOURS}"
-# \$LH_KANOTIX_NVIDIA: include NVidia-Drivers into chroot
-# (Default: ${LH_KANOTIX_NVIDIA})
-LH_KANOTIX_NVIDIA="${LH_KANOTIX_NVIDIA}"
+# \$LB_KANOTIX_NVIDIA: include NVidia-Drivers into chroot
+# (Default: ${LB_KANOTIX_NVIDIA})
+LB_KANOTIX_NVIDIA="${LB_KANOTIX_NVIDIA}"
-# \$LH_KANOTIX_TMPFS: use tmpfs to build
-# (Default: ${LH_KANOTIX_TMPFS})
-LH_KANOTIX_TMPFS="${LH_KANOTIX_TMPFS}"
+# \$LB_KANOTIX_TMPFS: use tmpfs to build
+# (Default: ${LB_KANOTIX_TMPFS})
+LB_KANOTIX_TMPFS="${LB_KANOTIX_TMPFS}"
-# \$LH_KANOTIX_TMPFS_OPTIONS: options for tmpfs
-# (Default: ${LH_KANOTIX_TMPFS_OPTIONS})
-LH_KANOTIX_TMPFS_OPTIONS="${LH_KANOTIX_TMPFS_OPTIONS}"
+# \$LB_KANOTIX_TMPFS_OPTIONS: options for tmpfs
+# (Default: ${LB_KANOTIX_TMPFS_OPTIONS})
+LB_KANOTIX_TMPFS_OPTIONS="${LB_KANOTIX_TMPFS_OPTIONS}"
EOF
grep -q ". config/kanotix" config/all 2>/dev/null || echo ". config/kanotix" >> config/all
@@ -52,28 +52,28 @@ while [ "$1" ]
do
case "$1" in
--kanotix-flavour*)
- LH_KANOTIX_FLAVOURS="$2"
+ LB_KANOTIX_FLAVOURS="$2"
shift
while [ "$2" -a "${2:0:1}" != "-" ]
do
- LH_KANOTIX_FLAVOURS="$LH_KANOTIX_FLAVOURS $2"
+ LB_KANOTIX_FLAVOURS="$LB_KANOTIX_FLAVOURS $2"
shift
done
;;
--include-nvidia)
- LH_KANOTIX_NVIDIA="$2"
+ LB_KANOTIX_NVIDIA="$2"
shift
;;
--tmpfs)
- LH_KANOTIX_TMPFS="$2"
+ LB_KANOTIX_TMPFS="$2"
shift
;;
--tmpfs-options)
- LH_KANOTIX_TMPFS_OPTIONS="$2"
+ LB_KANOTIX_TMPFS_OPTIONS="$2"
shift
;;
--help|-h)
- lh config noauto --help
+ lb config noauto --help
usage
exit 1
;;