[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-95-g0825e81

[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  0825e81ca6044de8780e497e71922ad5d4067659 (commit)
       via  cc5dfce0e594b460ea104874ec21f201f7047710 (commit)
       via  7cb3dbebf24b34792ec2836a398393df701ff989 (commit)
       via  4c95d574e63dc564d17c715516be4064ea96fe41 (commit)
      from  88631f3c1ea7f4c9c34a2ae37b7a2f6f6034e2c2 (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 0825e81ca6044de8780e497e71922ad5d4067659
Merge: cc5dfce0e594b460ea104874ec21f201f7047710 88631f3c1ea7f4c9c34a2ae37b7a2f6f6034e2c2
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 15:00:43 2010 +0100

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

commit cc5dfce0e594b460ea104874ec21f201f7047710
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 15:00:19 2010 +0100

    [BUILDROOT] 2010.11: cleanup 076-ubi-add_ubi_image_support.patch

commit 7cb3dbebf24b34792ec2836a398393df701ff989
Merge: 4c95d574e63dc564d17c715516be4064ea96fe41 54df84e69338318a33141c3402943d16f932abb3
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 13:45:54 2010 +0100

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

commit 4c95d574e63dc564d17c715516be4064ea96fe41
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 9 13:43:02 2010 +0100

    [BUILDROOT] securetty: be compatible with both ways of naming serial port on i.MX platforms: /dev/ttymxc & /dev/ttySMX

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

Summary of changes:
 .../armadeus/rootfs/target_skeleton/etc/securetty  |    2 ++
 .../2010.11/076-ubi-add_ubi_image_support.patch    |   20 ++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
index 623807c..37b30fc 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
@@ -12,4 +12,6 @@ ttyS2
 ttyS3
 ttySMX0
 ttySMX1
+ttymxc0
+ttymxc1
 ttyGS0
diff --git a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
index 4a6b020..b96ea72 100644
--- a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
+++ b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
@@ -6,7 +6,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 Index: buildroot/fs/ubi/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/Config.in	2010-10-31 21:32:10.000000000 +0100
++++ buildroot/fs/ubi/Config.in	2010-11-01 19:43:55.000000000 +0100
 @@ -0,0 +1,22 @@
 +config BR2_TARGET_ROOTFS_UBI
 +	depends on BR2_TARGET_ROOTFS_UBIFS
@@ -33,8 +33,8 @@ Index: buildroot/fs/ubi/Config.in
 Index: buildroot/fs/ubi/ubi.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/ubi.mk	2010-10-31 21:56:04.000000000 +0100
-@@ -0,0 +1,26 @@
++++ buildroot/fs/ubi/ubi.mk	2010-11-09 14:56:46.000000000 +0100
+@@ -0,0 +1,24 @@
 +#############################################################
 +#
 +# Build the UBI root filesystem image
@@ -50,8 +50,6 @@ Index: buildroot/fs/ubi/ubi.mk
 +
 +ROOTFS_UBI_DEPENDENCIES = ubifs-root
 +
-+#	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
-+
 +define ROOTFS_UBI_CMD
 +	cp fs/ubi/ubinize.cfg . ;\
 +	echo "image=$$@fs" \
@@ -64,7 +62,7 @@ Index: buildroot/fs/ubi/ubi.mk
 Index: buildroot/fs/ubi/ubinize.cfg
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/fs/ubi/ubinize.cfg	2010-10-31 21:13:58.000000000 +0100
++++ buildroot/fs/ubi/ubinize.cfg	2010-11-01 19:43:55.000000000 +0100
 @@ -0,0 +1,7 @@
 +[ubifs]
 +mode=ubi
@@ -73,3 +71,13 @@ Index: buildroot/fs/ubi/ubinize.cfg
 +vol_name=rootfs
 +vol_alignment=1
 +vol_flags=autoresize
+Index: buildroot/fs/ubifs/Config.in
+===================================================================
+--- buildroot.orig/fs/ubifs/Config.in	2010-11-01 19:39:39.000000000 +0100
++++ buildroot/fs/ubifs/Config.in	2010-11-01 19:43:55.000000000 +0100
+@@ -77,3 +77,5 @@
+ 
+ endchoice
+ 
++source "fs/ubi/Config.in"
++


hooks/post-receive
-- 
armadeus