summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2010-09-06 02:26:29 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2010-09-06 02:26:29 +0200
commit0e9c680b1c39584c902b488b461d7a45aaa8a946 (patch)
tree3dd756e6cfe2ff16ff0b349b87fe6fd2893a05c2 /auto
parente4c21b3c01ba37cec58076d17ba123b83dd52ccd (diff)
downloadkanotix-0e9c680b1c39584c902b488b461d7a45aaa8a946.zip
kanotix-0e9c680b1c39584c902b488b461d7a45aaa8a946.tar.gz
moved downloading of nvidia-drivers from config to build
Diffstat (limited to 'auto')
-rwxr-xr-xauto/build18
-rwxr-xr-xauto/config12
2 files changed, 18 insertions, 12 deletions
diff --git a/auto/build b/auto/build
index 306af81..93e2523 100755
--- a/auto/build
+++ b/auto/build
@@ -7,6 +7,22 @@ bit=32
# Update kanotix-version (32/64-bit and timestamp)
perl -pi -e "s%(Kanotix|Excalibur|Hellfire)(32|64)%\${1}$bit%i; s%(32|64)(bit)%$bit\${2}%i; s|[0-9]+-[0-9]+:[0-9]+|$(date +%Y%m%d-%H:%M)|" config/chroot_local-includes/etc/kanotix-version
+prebuild()
+{
+ # Include nvidia-driver into chroot
+ if [ -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"
+ URL="http://download.nvidia.com/XFree86/Linux-x86$ARCH/$VER/NVIDIA-Linux-x86$ARCH-$VER.run"
+ CACHEURL="cache/$(basename "$URL")"
+ [ "$LH_CACHE" = "false" ] && CACHEURL="config/chroot_local-includes/usr/src/$(basename "$URL")"
+ mkdir -p "$(dirname "$CACHEURL")"
+ [ ! -e "$CACHEURL" ] && wget -O"$CACHEURL" "$URL"
+ cp "$CACHEURL" "config/chroot_local-includes/usr/src/$(basename "$URL")" 2>/dev/null
+ fi
+}
+
if [ -d tmpfs ]; then
# build using tmpfs
if [ -z "$(stat --printf "%d\n" . tmpfs | uniq -u)" ]; then
@@ -21,10 +37,12 @@ if [ -d tmpfs ]; then
# copy everything to tmpfs
rsync -a .. . --exclude=tmpfs
# build
+ prebuild
lh build noauto ${@} 2>&1 | tee binary.log
cd ..
# prevent parent lh build (the "auto" one) from building again
exit 1
else
+ prebuild
lh build noauto ${@} 2>&1 | tee binary.log
fi
diff --git a/auto/config b/auto/config
index d3e8652..5441557 100755
--- a/auto/config
+++ b/auto/config
@@ -57,15 +57,3 @@ mkdir -p config/chroot_local-includes/usr/local/bin
grep -oe '^[^ #]*' scripts.urls | wget -i- -c -N -q -P config/chroot_local-includes/usr/local/bin
chmod 755 config/chroot_local-includes/usr/local/bin/*.sh
-# Include nvidia-driver into chroot
-if [ -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"
- URL="http://download.nvidia.com/XFree86/Linux-x86$ARCH/$VER/NVIDIA-Linux-x86$ARCH-$VER.run"
- CACHEURL="cache/$(basename "$URL")"
- [ "$LH_CACHE" = "false" ] && CACHEURL="config/chroot_local-includes/usr/src/$(basename "$URL")"
- [ ! -e "$CACHEURL" ] && wget -O"$CACHEURL" "$URL"
- cp "$CACHEURL" "config/chroot_local-includes/usr/src/$(basename "$URL")" 2>/dev/null
-fi
-