[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-296-ga3f16b7

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a3f16b73b73a1b10b1e3d506a119ed0d590c81e5 (commit)
       via  5b45fff2f7dad2132c073b9b531f8eed4c1998c5 (commit)
       via  a6ec92e579bcda51b675edb3e8404dc0b6e52813 (commit)
      from  1c39d3aadfc01811a23d135e691ba9e7a62b62a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a3f16b73b73a1b10b1e3d506a119ed0d590c81e5
Merge: 5b45fff2f7dad2132c073b9b531f8eed4c1998c5 1c39d3aadfc01811a23d135e691ba9e7a62b62a6
Author: jorasse <jo...@ar...>
Date:   Wed Apr 14 01:22:16 2010 +0200

    Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 5b45fff2f7dad2132c073b9b531f8eed4c1998c5
Author: jorasse <jo...@ar...>
Date:   Wed Apr 14 01:20:43 2010 +0200

    [BIULDROOT] support ubifs with buildroot 2010.02

commit a6ec92e579bcda51b675edb3e8404dc0b6e52813
Author: jorasse <jo...@ar...>
Date:   Wed Apr 14 01:15:56 2010 +0200

    [BUILDROOT] Fixed buildroot 2010.02 compilation failure on Ubuntu

-----------------------------------------------------------------------

Summary of changes:
 .../mtd-utils-all-targets.patch                    |    0
 buildroot/target/device/armadeus/u-boot/u-boot.mk  |    3 +-
 .../2010.02/{076-ubifs.to_fix => 076-ubifs.patch}  |   25 +++---
 .../2010.02/082-mtd-utils_with_ubi-utils.patch     |   65 ++++++++++++++
 .../2010.02/082-mtd-utils_with_ubi-utils.to_fix    |   92 --------------------
 5 files changed, 80 insertions(+), 105 deletions(-)
 copy buildroot/package/mtd/{mtd-utils20090824.git => }/mtd-utils-all-targets.patch (100%)
 rename patches/buildroot/2010.02/{076-ubifs.to_fix => 076-ubifs.patch} (72%)
 create mode 100644 patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.patch
 delete mode 100644 patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.to_fix

diff --git a/buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch b/buildroot/package/mtd/mtd-utils-all-targets.patch
similarity index 100%
copy from buildroot/package/mtd/mtd-utils20090824.git/mtd-utils-all-targets.patch
copy to buildroot/package/mtd/mtd-utils-all-targets.patch
diff --git a/buildroot/target/device/armadeus/u-boot/u-boot.mk b/buildroot/target/device/armadeus/u-boot/u-boot.mk
index 858c8b9..24f2022 100644
--- a/buildroot/target/device/armadeus/u-boot/u-boot.mk
+++ b/buildroot/target/device/armadeus/u-boot/u-boot.mk
@@ -30,9 +30,10 @@ u-boot-distclean: u-boot-clean
 		 -C $(U_BOOT_DIR) distclean
 	rm -f $(U_BOOT_DIR)/.configured
 
+ifeq ($(BR2_VERSION),"0.10.0-svn")
 $(MKIMAGE): $(BINARIES_DIR)/$(U_BOOT_BIN)
 	ln -fs $(MKIMAGE_BINLOC) $(MKIMAGE)
-
+endif
 u-boot-patch: u-boot-distclean
 	-mkdir -p $(PROJECT_BUILD_DIR)/ref
 	rm -rf $(PROJECT_BUILD_DIR)/ref/u-boot-$(U_BOOT_VERSION)
diff --git a/patches/buildroot/2010.02/076-ubifs.to_fix b/patches/buildroot/2010.02/076-ubifs.patch
similarity index 72%
rename from patches/buildroot/2010.02/076-ubifs.to_fix
rename to patches/buildroot/2010.02/076-ubifs.patch
index e5171ca..ed840e2 100644
--- a/patches/buildroot/2010.02/076-ubifs.to_fix
+++ b/patches/buildroot/2010.02/076-ubifs.patch
@@ -1,8 +1,9 @@
 --- buildrootref/target/ubifs/Config.in	2008-11-03 09:15:09.000000000 +0100
 +++ buildroot/target/ubifs/Config.in	2009-10-03 17:07:32.000000000 +0200
-@@ -1,9 +1,15 @@
+@@ -1,10 +1,15 @@
  config BR2_TARGET_ROOTFS_UBIFS
  	bool "ubifs root filesystem"
+-	depends on BROKEN # upstream git gone, should use mtd-utils
  	select BR2_HOST_FAKEROOT
 +	select BR2_PACKAGE_MTD
  	help
@@ -16,7 +17,7 @@
  config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
  	hex "UBI logical erase block size"
  	depends on BR2_TARGET_ROOTFS_UBIFS
-@@ -16,6 +22,13 @@ config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
+@@ -17,6 +23,13 @@ config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
  	help
  	  Some comment required here
  
@@ -32,7 +33,7 @@
  	depends on BR2_TARGET_ROOTFS_UBIFS
 --- buildrootref/target/ubifs/ubifsroot.mk	2009-10-03 17:55:26.000000000 +0200
 +++ buildroot/target/ubifs/ubifsroot.mk	2009-10-03 17:18:09.000000000 +0200
-@@ -76,7 +76,14 @@ else
+@@ -75,7 +75,14 @@ else
  UBIFS_TARGET := $(UBIFS_BASE)
  endif
  
@@ -45,19 +46,19 @@
 +
 +
 +$(UBIFS_BASE): host-fakeroot makedevs
- 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
- ifneq ($(BR2_HAVE_MANPAGES),y)
- 	@rm -rf $(TARGET_DIR)/usr/man
-@@ -102,11 +109,18 @@ ifneq ($(TARGET_DEVICE_TABLE),)
- 		>> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ 	# Use fakeroot to pretend all target binaries are owned by root
+ 	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ 	touch $(BUILD_DIR)/.fakeroot.00000
+@@ -80,11 +87,18 @@ ifneq ($(TARGET_DEVICE_TABLE),)
+ 		>> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
  endif
  	# Use fakeroot so mkfs.ubifs believes the previous fakery
 -	echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -d $(TARGET_DIR) " \
 +	echo "$(MKFS_UBIFS) -d $(TARGET_DIR) " \
- 		"$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- 	chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- 	$(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- 	-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ 		"$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ 	chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ 	$(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
+ 	-@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
 +	cp target/ubifs/ubinize.cfg .
 +	echo "image=$(UBIFS_BASE)" \
 +		>> ./ubinize.cfg
diff --git a/patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.patch b/patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.patch
new file mode 100644
index 0000000..6354e07
--- /dev/null
+++ b/patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.patch
@@ -0,0 +1,65 @@
+
+This patch update mtd-utils to build sme host UBI tools:
+* adds mkfs.ubifs tool
+* adds ubi-utils ubinize tool
+
+enable to build an UBI rootfs from scratch.
+
+Signed-off-by: jorasse <jo...@ar...>
+
+--- buildroot/package/mtd/mtd.mk.ori	2010-04-13 00:48:51.000000000 +0200
++++ buildroot/package/mtd/mtd.mk	2010-04-14 01:04:12.000000000 +0200
+@@ -18,6 +18,9 @@ MTD_CAT:=$(BZCAT)
+ #############################################################
+ MKFS_JFFS2 := $(HOST_DIR)/usr/sbin/mkfs.jffs2
+ SUMTOOL := $(HOST_DIR)/usr/sbin/sumtool
++MKFS_UBIFS:= $(HOST_DIR)/usr/sbin/mkfs.ubifs
++UBINIZE:= $(HOST_DIR)/usr/sbin/ubinize
++MTD_HOST_TARGETS:= $(MKFS_JFFS2) $(SUMTOOL) $(MKFS_UBIFS) $(UBINIZE)
+ 
+ $(DL_DIR)/$(MTD_SOURCE):
+ 	$(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE))
+@@ -29,29 +32,35 @@ $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(M
+ 		package/mtd/ mtd-utils-\*.patch
+ 	touch $@
+ 
+-$(MTD_HOST_DIR)/mkfs.jffs2: $(MTD_HOST_DIR)/.unpacked
++$(MTD_HOST_DIR)/mkfs.jffs2 $(MTD_HOST_DIR)/sumtool $(MTD_HOST_DIR)/ubi-utils/ubinize : $(MTD_HOST_DIR)/.unpacked
+ 	CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
+ 		CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR) \
+-		WITHOUT_XATTR=1 -C $(MTD_HOST_DIR) $@
++		WITHOUT_XATTR=1 -C $(MTD_HOST_DIR)
+ 
+ $(MKFS_JFFS2): $(MTD_HOST_DIR)/mkfs.jffs2
+ 	install -m 0755 -D $^ $@
+ 
+-$(MTD_HOST_DIR)/sumtool: $(MTD_HOST_DIR)/.unpacked
++$(SUMTOOL): $(MTD_HOST_DIR)/sumtool
++	install -m 0755 $^ $@
++
++$(UBINIZE): $(MTD_HOST_DIR)/ubi-utils/ubinize
++	install -m 0755 $^ $@
++
++$(MTD_HOST_DIR)/mkfs.ubifs/mkfs.ubifs: $(MTD_HOST_DIR)/mkfs.jffs2
+ 	CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
+-		CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR) \
+-		WITHOUT_XATTR=1 -C $(MTD_HOST_DIR) $@
++		CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR)/mkfs.ubifs \
++		WITHOUT_XATTR=1 -C $(MTD_HOST_DIR)/mkfs.ubifs
+ 
+-$(SUMTOOL): $(MTD_HOST_DIR)/sumtool
++$(MKFS_UBIFS): $(MTD_HOST_DIR)/mkfs.ubifs/mkfs.ubifs
+ 	install -m 0755 $^ $@
+ 
+-mtd-host: host-lzo $(MKFS_JFFS2) $(SUMTOOL)
++mtd-host: host-lzo $(MTD_HOST_TARGETS)
+ 
+ mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
+ 
+ mtd-host-clean:
+ 	-$(MAKE) -C $(MTD_HOST_DIR) clean
+-	rm -f $(MKFS_JFFS2) $(SUMTOOL)
++	rm -f MTD_HOST_TARGETS
+ 
+ mtd-host-dirclean:
+ 	rm -rf $(MTD_HOST_DIR)
diff --git a/patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.to_fix b/patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.to_fix
deleted file mode 100644
index 31c060d..0000000
--- a/patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.to_fix
+++ /dev/null
@@ -1,92 +0,0 @@
-
-This patch update mtd-utils to the august 24, 2009 GIT revision:
-* adds mkfs.ubifs tool
-* adds ubi-utils tools
-
-enable to build an UBI rootfs from scratch.
-
-Signed-off-by: jorasse <jo...@ar...>
-
---- buildroot/package/mtd_ori/Config.in	2008-11-03 09:15:23.000000000 +0100
-+++ buildroot/package/mtd/Config.in	2009-09-13 23:18:56.000000000 +0200
-@@ -28,6 +28,11 @@ config BR2_PACKAGE_MTD_20050122
- 	help
- 	  Use the stable release.
- 
-+config BR2_PACKAGE_MTD_UTILS_20090824GIT
-+	bool "Use MTD-utils from GIT aug 24, 2009"
-+	help
-+	  Use the 24 aug 2009 GIT revision.
-+
- config BR2_PACKAGE_MTD_UTILS_GIT
- 	bool "Use MTD-utils from GIT"
- 	help
-@@ -127,7 +132,7 @@ config BR2_PACKAGE_MTD_NANDDUMP
- config BR2_PACKAGE_MTD_NANDTEST
- 	bool "nandtest"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_NANDWRITE
- 	bool "nandwrite"
-@@ -152,17 +157,17 @@ config BR2_PACKAGE_MTD_SUMTOOL
- config BR2_PACKAGE_MTD_UBIATTACH
- 	bool "ubiattach"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_UBICRC32
- 	bool "ubicrc32"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_UBIDETACH
- 	bool "ubidetach"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_UBIMIRROR
- 	bool "ubimirror"
-@@ -172,22 +177,22 @@ config BR2_PACKAGE_MTD_UBIMIRROR
- config BR2_PACKAGE_MTD_UBIMKVOL
- 	bool "ubimkvol"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_UBINFO
- 	bool "ubinfo"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_UBIRMVOL
- 	bool "ubirmvol"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- config BR2_PACKAGE_MTD_UBIUPDATEVOL
- 	bool "ubiupdatevol"
- 	default y
--	depends on BR2_PACKAGE_MTD_UTILS_GIT
-+	depends on BR2_PACKAGE_MTD_UTILS_GIT || BR2_PACKAGE_MTD_UTILS_20090824GIT
- 
- endif
- 
---- buildroot/package/mtd_ori/mtd.mk	2008-11-03 09:15:23.000000000 +0100
-+++ buildroot/package/mtd/mtd.mk	2009-09-13 12:10:23.000000000 +0200
-@@ -7,6 +7,9 @@ endif
- ifeq ($(strip $(BR2_PACKAGE_MTD_20050122)),y)
- include package/mtd/20050122/mtd.mk
- endif
-+ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_20090824GIT)),y)
-+include package/mtd/mtd-utils20090824.git/mtd.mk
-+endif
- ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_GIT)),y)
- include package/mtd/mtd-utils.git/mtd.mk
- endif


hooks/post-receive
-- 
armadeus


