[Balloon-svn] r1023 - balloon/trunk/rootfs/debian

Author: wookey
Date: 2010-03-11 18:57:16 +0000 (Thu, 11 Mar 2010)
New Revision: 1023

Modified:
balloon/trunk/rootfs/debian/Makefile
Log:
parameterise fakeroot to avoid fakeroot-inside-fakeroot errors


Modified: balloon/trunk/rootfs/debian/Makefile
===================================================================
--- balloon/trunk/rootfs/debian/Makefile    2010-03-11 18:44:41 UTC (rev 1022)
+++ balloon/trunk/rootfs/debian/Makefile    2010-03-11 18:57:16 UTC (rev 1023)
@@ -19,10 +19,10 @@
    mkdir -p $(BUILD)
    #make arm/armel rootfs with debootstrap
    #note - there should be a way of putting in debs needed by balloon3-config automatically...(dash,lrzsz,)
-    #    fakeroot /usr/sbin/debootstrap --verbose --arch $(ARCHNAME) --include=udev,pcmciautils,ntpdate,dash,avahi-daemon,libdaemon0,libavahi-common3,libavahi-core4,avahi-autoipd,libnss-mdns,libdbus-1-3,dbus,lrzsz \
+    #    $(FAKEROOT) /usr/sbin/debootstrap --verbose --arch $(ARCHNAME) --include=udev,pcmciautils,ntpdate,dash,avahi-daemon,libdaemon0,libavahi-common3,libavahi-core4,avahi-autoipd,libnss-mdns,libdbus-1-3,dbus,lrzsz \
    #in order to use fakeroot we have to clean out rootfs first
    (cd $(BUILD) && rm -rf $(ROOTFS))
-    fakeroot /usr/sbin/debootstrap --verbose --arch $(ARCHNAME) --include=udev,pcmciautils,ntpdate,dash,lrzsz,wireless-tools \
+    $(FAKEROOT) /usr/sbin/debootstrap --verbose --arch $(ARCHNAME) --include=udev,pcmciautils,ntpdate,dash,lrzsz,wireless-tools \
        --foreign $(SUITE) $(BUILD)/$(ROOTFS) $(REPOSITORY)
    #copy balloon-config package into apt cache, ready for 2nd stage
    #hack debootstrap file so that balloon3-config gets configured
@@ -30,10 +30,10 @@
    #sed -i -e 's/$$/ balloon3-config/' $(BUILD)/$(ROOTFS)/debootstrap/required
    #fix up rootfs enough to boot it and do 2nd-stage config
    chmod +x rootfs-config
-    fakeroot ./rootfs-config $(BUILD)/$(ROOTFS) balloon3-config$(VARIANT)/files
+    $(FAKEROOT) ./rootfs-config $(BUILD)/$(ROOTFS) balloon3-config$(VARIANT)/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)/debianstage1root.tgz .
+    (cd $(BUILD)/$(ROOTFS) && rm -rf lib/modules/ && $(FAKEROOT) tar -xf ../$(BUILDDIR)/kernel/modules.tgz )
+    $(FAKEROOT) tar -C $(BUILD)/$(ROOTFS) -czf $(RES)/debianstage1root.tgz .


balloon3-config.stamp: $(wildcard balloon3-config$(VARIANT)/debian/*) $(wildcard balloon3-config$(VARIANT)/files/*)