changeset 14:1da81fbd78a8

Instead of symlinking build.sh with a brittle relative path, just call common/builder.sh when an image has no build.sh.
author Rob Landley <rob@landley.net>
date Sun, 30 Oct 2011 13:31:10 -0500
parents 95b1518a8975
children 8c1a9d4cb1d2
files build.sh images/gentoo-bootstrap/build.sh images/lfs-bootstrap/build.sh
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/build.sh	Sat Oct 29 12:45:32 2011 -0500
+++ b/build.sh	Sun Oct 30 13:31:10 2011 -0500
@@ -12,9 +12,11 @@
   (
     IMAGENAME="$1"
     MYDIR=$(readlink -f images/"$1")
+    BUILDER="$MYDIR"/build.sh
+    [ -e "$BUILDER" ] || BUILDER=common/builder.sh
 
     source common/include.sh &&
-    source images/"$1"/build.sh &&
+    source $BUILDER &&
     squash_image
   )
 }
--- a/images/gentoo-bootstrap/build.sh	Sat Oct 29 12:45:32 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../common/builder.sh
\ No newline at end of file
--- a/images/lfs-bootstrap/build.sh	Sat Oct 29 12:45:32 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../common/builder.sh
\ No newline at end of file