From subversion@balloonboard.org Thu Mar 11 18:57:16 2010
Received: from wookey by stoneboat.aleph1.co.uk with local (Exim 4.69)
	(envelope-from <subversion@balloonboard.org>) id 1NpnZM-0007zm-CN
	for balloon-svn@balloonboard.org; Thu, 11 Mar 2010 18:57:16 +0000
Date: Thu, 11 Mar 2010 18:57:16 +0000
To: balloon-svn@balloonboard.org
From: subversion@balloonboard.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1NpnZM-0007zm-CN@stoneboat.aleph1.co.uk>
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: subversion@balloonboard.org
X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk);
	SAEximRunCond expanded to false
Subject: [Balloon-svn] r1023 - balloon/trunk/rootfs/debian
X-BeenThere: balloon-svn@balloonboard.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: <balloon-svn.balloonboard.org>
List-Unsubscribe: <http://balloonboard.org/cgi-bin/mailman/options/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=unsubscribe>
List-Archive: <http://balloonboard.org/lurker/list/balloon-svn.html>
List-Post: <mailto:balloon-svn@balloonboard.org>
List-Help: <mailto:balloon-svn-request@balloonboard.org?subject=help>
List-Subscribe: <http://balloonboard.org/cgi-bin/mailman/listinfo/balloon-svn>, 
	<mailto:balloon-svn-request@balloonboard.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Mar 2010 18:57:16 -0000

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/*)