From 994b85b4af3cbd1e504246ab3895f16a6ddcba54 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 16 Jan 2006 16:05:16 +0000
Subject: [PATCH] make all paths absolute...still needed: a builder

svn path=/nixu/trunk/; revision=4563
---
 kernelscripts/make-kernel.sh    | 49 ---------------------------------
 kernelscripts/make-kernel.sh.in | 36 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 49 deletions(-)
 delete mode 100755 kernelscripts/make-kernel.sh
 create mode 100755 kernelscripts/make-kernel.sh.in

diff --git a/kernelscripts/make-kernel.sh b/kernelscripts/make-kernel.sh
deleted file mode 100755
index 14f006a0553..00000000000
--- a/kernelscripts/make-kernel.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-
-archivesDir=$(mktemp -d)
-manifest=${archivesDir}/MANIFEST
-nixpkgs=/nixpkgs/trunk/pkgs
-fill_disk=$archivesDir/scripts/fill-disk.sh
-ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
-storePaths=$archivesDir/mystorepaths
-validatePaths=$archivesDir/validatepaths
-bootiso=/tmp/nixos.iso
-initrd=/tmp/initram.img
-initdir=${archivesDir}/initdir
-initscript=$archivesDir/scripts/init.sh
-
-NIX_CMD_PATH=$(dirname $(which nix-store))
-cpwd=`pwd`
-
-storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
-
-kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
-
-ov511=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).ov511' | $NIX_CMD_PATH/nix-instantiate -))
-
-echo $kernel
-echo $ov511
-
-echo making kernel stuff
-
-kernelVersion=$(cd $kernel/lib/modules/; ls -d *)
-mkdir -p $archivesDir/lib/modules/$kernelVersion
-
-echo $kernelVersion
-
-cd $kernel
-
-# make directories
-
-find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
-
-# link all files
-find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $kernel/% $archivesDir/%
-
-# make directories
-
-cd $ov511
-find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
-
-# link all files
-find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $ov511/% $archivesDir/%
diff --git a/kernelscripts/make-kernel.sh.in b/kernelscripts/make-kernel.sh.in
new file mode 100755
index 00000000000..681587f62dd
--- /dev/null
+++ b/kernelscripts/make-kernel.sh.in
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+#archivesDir=$(@mktemp@/bin/mktemp -d)
+archivesDir=/
+
+cpwd=@coreutils@/bin/pwd
+
+storeExpr=$(@nix@/bin/nix-store -qR $(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).everything' | @nix@/bin/nix-instantiate -)))
+
+kernel=$(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).kernel' | @nix@/bin/nix-instantiate -))
+
+ov511=$(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).ov511' | @nix@/bin/nix-instantiate -))
+
+#echo making kernel stuff
+
+kernelVersion=$(cd $kernel/lib/modules/; @coreutils@/bin/ls -d *)
+@coreutils@/bin/mkdir -p $archivesDir/lib/modules/$kernelVersion
+
+#echo $kernelVersion
+
+cd $kernel
+
+# make directories
+
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
+
+# link all files
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $kernel/% $archivesDir/%
+
+# make directories
+
+cd $ov511
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
+
+# link all files
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $archivesDir/%