[Astlinux-commits] SF.net SVN: astlinux: [580] trunk

[<kr...@us...>]

Revision: 580
          http://svn.sourceforge.net/astlinux/?rev=580&view=rev
Author:   krisk84
Date:     2007-02-13 08:28:08 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
update default config for rootfs changes

Modified Paths:
--------------
    trunk/astlinux.config
    trunk/package/unionfs/unionfs.mk

Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config	2007-02-12 22:06:10 UTC (rev 579)
+++ trunk/astlinux.config	2007-02-13 16:28:08 UTC (rev 580)
@@ -354,24 +354,31 @@
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
 # BR2_TARGET_ROOTFS_JFFS2 is not set
-# BR2_TARGET_ROOTFS_SQUASHFS is not set
+BR2_TARGET_ROOTFS_SQUASHFS=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
 #
 # bootloader for target device
 #
-BR2_TARGET_GRUB=y
-# BR2_TARGET_SYSLINUX is not set
+# BR2_TARGET_GRUB is not set
+BR2_TARGET_SYSLINUX=y
 
 #
 # make initrd
 #
-# BR2_INITRD_ROOTFS_EXT2 is not set
+BR2_INITRD_ROOTFS_EXT2=y
+BR2_INITRD_ROOTFS_EXT2_BLOCKS=0
+BR2_INITRD_ROOTFS_EXT2_INODES=0
+BR2_INITRD_ROOTFS_EXT2_RESBLKS=0
+BR2_INITRD_ROOTFS_EXT2_SQUASH=y
+BR2_INITRD_ROOTFS_EXT2_OUTPUT="initrd.img"
+BR2_INITRD_ROOTFS_EXT2_GZ=y
+BR2_INITRD_ROOTFS_EXT2_COPYTO=""
 
 #
 # make bootable iso
 #
-# BR2_TARGET_ISO is not set
+BR2_TARGET_ISO=y
 
 #
 # AstLinux Target Device

Modified: trunk/package/unionfs/unionfs.mk
===================================================================
--- trunk/package/unionfs/unionfs.mk	2007-02-12 22:06:10 UTC (rev 579)
+++ trunk/package/unionfs/unionfs.mk	2007-02-13 16:28:08 UTC (rev 580)
@@ -31,8 +31,11 @@
 	$(INSTALL) -D -m 0755 $(UNIONFS_DIR)/utils/unionctl $(TARGET_DIR)/sbin/unionctl
 	$(INSTALL) -D -m 0644 $(UNIONFS_DIR)/$(UNIONFS_BINARY) \
 	$(TARGET_DIR)/lib/modules/$(LINUX_VER)/kernel/fs/unionfs/$(UNIONFS_BINARY)
+	# $(INSTALL) -D -m 0644 $(UNIONFS_DIR)/$(UNIONFS_BINARY) \
+	# $(INITRD_DIR)/lib/modules/$(LINUX_VER)/kernel/fs/unionfs/$(UNIONFS_BINARY)
 	$(STRIP) -g $(TARGET_DIR)/sbin/unionctl
 	$(STRIP) -g $(TARGET_DIR)/lib/modules/$(LINUX_VER)/kernel/fs/unionfs/$(UNIONFS_BINARY)
+	# $(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(INITRD_DIR) -r $(LINUX_VER)
 	$(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
 	touch -c $(TARGET_DIR)/lib/modules/$(LINUX_VER)/kernel/fs/unionfs/$(UNIONFS_BINARY)
 
@@ -46,6 +49,8 @@
 	-$(MAKE) -C $(UNIONFS_DIR) PWD=$(UNIONFS_DIR) clean
 	-rm -Rf $(TARGET_DIR)/sbin/unionctl
 	-rm -Rf $(TARGET_DIR)/lib/modules/$(LINUX_VER)/kernel/fs/unionfs
+	# -rm -Rf $(INITRD_DIR)/lib/modules/$(LINUX_VER)/kernel/fs/unionfs
+	-$(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(INITRD_DIR) -r $(LINUX_VER)
 	$(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
 
 unionfs-dirclean:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.