[Balloon-svn] r1009 - in balloon/trunk: . rootfs/emdebian

Author: wookey
Date: 2010-03-05 16:26:23 +0000 (Fri, 05 Mar 2010)
New Revision: 1009

Modified:
balloon/trunk/Makefile.inc
balloon/trunk/rootfs/emdebian/Makefile
Log:
Parameterize fakeroot use so that fakeroot within fakeroot doesn;t
kill the rootfs build

Modified: balloon/trunk/Makefile.inc
===================================================================
--- balloon/trunk/Makefile.inc    2010-03-05 13:24:51 UTC (rev 1008)
+++ balloon/trunk/Makefile.inc    2010-03-05 16:26:23 UTC (rev 1009)
@@ -48,6 +48,8 @@

#--------- Generic build settings----------

+FAKEROOT=`if [ -z $FAKEROOTKEY ]; then echo "fakeroot"; fi`
+
#Number of jobs for Make to issue, to speed up build on multiprocessor machines
#MAKEOPTS=-j 4

@@ -63,6 +65,7 @@
SUITE:=lenny
ARCHNAME:=armel

+
#---------Makefile.local overrides for above defaults------------

#put local overrides for the above variables in Makefile.local in this dir

Modified: balloon/trunk/rootfs/emdebian/Makefile
===================================================================
--- balloon/trunk/rootfs/emdebian/Makefile    2010-03-05 13:24:51 UTC (rev 1008)
+++ balloon/trunk/rootfs/emdebian/Makefile    2010-03-05 16:26:23 UTC (rev 1009)
@@ -27,7 +27,7 @@
         MULTISTRAP_BALLOON=multistrap-balloon.conf; \
     fi; \
     echo "Config file used for multistrap: $$MULTISTRAP_BALLOON"; \
-    fakeroot /usr/sbin/em_multistrap -a $(ARCHNAME) -d $(BUILD)/$(ROOTFS) -f "$$MULTISTRAP_BALLOON" --tidy-up --source-dir $(BUILDDIR)/rootfs/emdebian/sources/packages
+    $(FAKEROOT) /usr/sbin/em_multistrap -a $(ARCHNAME) -d $(BUILD)/$(ROOTFS) -f "$$MULTISTRAP_BALLOON" --tidy-up --source-dir $(BUILDDIR)/rootfs/emdebian/sources/packages
     # the real sources are in /etc/apt/sources.list.d/
     $(RM) $(BUILD)/$(ROOTFS)/etc/apt/sources.list
     touch multistrap-stamp
@@ -45,10 +45,10 @@
     fi; \
     echo "ROOTFS_CONFIG='$$ROOTFS_CONFIG'"; \
     echo "FILES='$$FILES'"; \
-    fakeroot ./"$$ROOTFS_CONFIG" $(BUILD)/$(ROOTFS) "$$FILES"
+    $(FAKEROOT) ./"$$ROOTFS_CONFIG" $(BUILD)/$(ROOTFS) "$$FILES"
     #unpack modules into rootfs
     (cd $(BUILD)/$(ROOTFS) && rm -rf lib/modules/ && fakeroot tar -xf ../$(BUILDDIR)/kernel/modules.tgz )
-    fakeroot tar -C $(BUILD)/$(ROOTFS) -czf $(RES)/emdebianrootstrap.tgz . 
+    $(FAKEROOT) tar -C $(BUILD)/$(ROOTFS) -czf $(RES)/emdebianrootstrap.tgz . 

 $(BUILDDIR)/kernel/modules.tgz:
     $(MAKE) $(BUILDDIR)/kernel/modules.tgz -C ../kernel