[Balloon-svn] r1157 - balloon/branches/menuconfig/rootfs/emd…

Author: nick
Date: 2010-06-13 19:23:01 +0100 (Sun, 13 Jun 2010)
New Revision: 1157

Modified:
balloon/branches/menuconfig/rootfs/emdebian/Makefile
Log:
implement emdebian rootfs merging with kernel

Modified: balloon/branches/menuconfig/rootfs/emdebian/Makefile
===================================================================
--- balloon/branches/menuconfig/rootfs/emdebian/Makefile    2010-06-13 18:21:51 UTC (rev 1156)
+++ balloon/branches/menuconfig/rootfs/emdebian/Makefile    2010-06-13 18:23:01 UTC (rev 1157)
@@ -10,17 +10,42 @@
 ROOTFS=emdebian-grip-rootfs
 INSTALLDISK=/dev/sdb1
 INSTALLDISKMOUNT=/mnt/usbdrive
+TEMP=$(RES)/tmp

all: rootfs

rootfs: $(RES)/emdebianrootstrap.tgz

-rootfs-modules: rootfs $(BUILDDIR)/kernel/modules.tgz
+rootfs-modules-x: rootfs $(BUILDDIR)/kernel/modules.tgz
     ($(FAKEROOT) cd $(BUILD)/$(ROOTFS) && $(FAKEROOT) rm -rf lib/modules/ ) && \
     $(FAKEROOT) tar -C $(BUILD)/$(ROOTFS) --owner=root --group=root -xf $(BUILDDIR)/kernel/modules.tgz  && \
     $(FAKEROOT) tar -C $(BUILD)/$(ROOTFS) -czf $(RES)/emdebianrootstrap.tgz . && \
     ($(FAKEROOT) cd $(BUILD)/$(ROOTFS) && $(FAKEROOT) rm -rf lib/modules/ )

+rootfs-modules-x: rootfs $(BUILDDIR)/kernel/modules.tgz
+    mkdir -p $(TEMP)
+    rm -rf $(TEMP)/*
+    rm -f $(BUILD)/fakerootstate
+    $(FAKEROOT) tar -C $(TEMP) -xzf $(RES)/emdebianrootstrap.tgz
+    $(FAKEROOT) rm -rf $(TEMP)/lib/modules/
+    $(FAKEROOT) tar -C $(TEMP) --owner=root --group=root -xf $(BUILDDIR)/kernel/modules.tgz && \
+    $(FAKEROOT) tar -C $(TEMP) -czf $(RES)/emdebianrootstrap.modules.tgz .)
+#    rm -rf $(TEMP)
+
+rootfs-modules: rootfs $(BUILDDIR)/kernel/modules.tgz
+    mkdir -p $(TEMP)
+    rm -rf $(TEMP)/*
+    rm -f fakeme
+    ( cd $(RES); \
+    echo "cd $(TEMP); tar -xzf $(RES)/emdebianrootstrap.tgz; \
+    rm -rf lib/modules/; \
+    tar --owner=root --group=root -xzf $(BUILDDIR)/kernel/modules.tgz; \
+    chown -R 0:0 .; \
+    tar -czf $(RES)/emdebianrootstrap.modules.tgz ." > fakeme; \
+    chmod a+x fakeme;)
+#    $(FAKEROOT) $(RES)/fakeme
+    fakeroot $(RES)/fakeme
+
 $(BUILDDIR)/kernel/modules.tgz:
     $(MAKE) $(BUILDDIR)/kernel/modules.tgz -C ../kernel