[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-104-gf62c9cc

[Julien B a. A. <ar...@us...>]

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  f62c9cc7716ada745a25cfe5e7d5ebade2763601 (commit)
       via  1c259bd05f141abc791dc49bf83eeb3d2ab4a89c (commit)
       via  6a6de72fcf27e9fbb102881283c034e4ae07453c (commit)
      from  7b9dcc33d990f5d45342178a37923c96a5bd2da1 (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 f62c9cc7716ada745a25cfe5e7d5ebade2763601
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 18:32:54 2010 +0100

    [LINUX] Updates APF27 default config

commit 1c259bd05f141abc791dc49bf83eeb3d2ab4a89c
Merge: 6a6de72fcf27e9fbb102881283c034e4ae07453c 7b9dcc33d990f5d45342178a37923c96a5bd2da1
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 18:31:02 2010 +0100

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

commit 6a6de72fcf27e9fbb102881283c034e4ae07453c
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 18:30:43 2010 +0100

    [BUILDROOT] Generates both UBI and UBIFS images

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

Summary of changes:
 .../armadeus/apf27/apf27-linux-2.6.29.config       |    3 ++-
 patches/buildroot/076-ubifs.patch                  |   20 ++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 13f114c..a1c2db2 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.6
-# Thu Sep  9 16:05:02 2010
+# Tue Nov  9 17:21:05 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -191,6 +191,7 @@ CONFIG_MACH_APF27_FPGA=y
 # CONFIG_MACH_PCM038 is not set
 # CONFIG_MACH_PCM970_BASEBOARD is not set
 CONFIG_MACH_APF27_DEV=y
+# CONFIG_MACH_PPS is not set
 CONFIG_MACH_APF27_DEV_EXT_NONE=y
 # CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
 # CONFIG_MXC_IRQ_PRIOR is not set
diff --git a/patches/buildroot/076-ubifs.patch b/patches/buildroot/076-ubifs.patch
index 6b53383..0c7bec9 100644
--- a/patches/buildroot/076-ubifs.patch
+++ b/patches/buildroot/076-ubifs.patch
@@ -1,5 +1,7 @@
---- 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
+Index: buildroot/target/ubifs/Config.in
+===================================================================
+--- buildroot.orig/target/ubifs/Config.in	2008-11-03 09:15:09.000000000 +0100
++++ buildroot/target/ubifs/Config.in	2010-11-09 16:42:27.000000000 +0100
 @@ -1,9 +1,15 @@
  config BR2_TARGET_ROOTFS_UBIFS
  	bool "ubifs root filesystem"
@@ -16,7 +18,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
+@@ -16,6 +22,13 @@
  	help
  	  Some comment required here
  
@@ -30,9 +32,11 @@
  config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
  	int "Maximum LEB count"
  	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
+Index: buildroot/target/ubifs/ubifsroot.mk
+===================================================================
+--- buildroot.orig/target/ubifs/ubifsroot.mk	2008-11-03 09:15:09.000000000 +0100
++++ buildroot/target/ubifs/ubifsroot.mk	2010-11-09 16:53:33.000000000 +0100
+@@ -76,7 +76,14 @@
  UBIFS_TARGET := $(UBIFS_BASE)
  endif
  
@@ -48,7 +52,7 @@
  	-@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),)
+@@ -102,11 +109,18 @@
  		>> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
  endif
  	# Use fakeroot so mkfs.ubifs believes the previous fakery
@@ -62,7 +66,7 @@
 +	echo "image=$(UBIFS_BASE)" \
 +		>> ./ubinize.cfg
 +	$(UBINIZE) -o system_ubi.img $(UBIFS_UBINIZE_OPTS) ubinize.cfg
-+	cp -f system_ubi.img $(UBIFS_BASE)
++	cp -f system_ubi.img $(subst ubifs,ubi,$(UBIFS_BASE))
 +	rm system_ubi.img
 +	rm ubinize.cfg
  


hooks/post-receive
-- 
armadeus