[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-653-gb0b743b

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  b0b743b4a83d9c1df96f1cfb103fd327ebf2eae5 (commit)
       via  a877b410870f7865aa983c25f419e79204d7bead (commit)
       via  6afe9576a7215ba8760de9c27a827aeca53d43e3 (commit)
       via  38d364c15c09264627f308e7dd48d7b35b488fd9 (commit)
      from  a3dfdea183e4b6b11eb36b9f091deee30857fc29 (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 b0b743b4a83d9c1df96f1cfb103fd327ebf2eae5
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Fri Mar 13 11:20:44 2015 +0100

    [SCRIPTS] quiltify.sh: add LC_ALL=C to sort command

commit a877b410870f7865aa983c25f419e79204d7bead
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Fri Mar 13 11:19:09 2015 +0100

    [BUILDROOT] 2015.02: APF28: strace 4.9: fixes build with old kernels

commit 6afe9576a7215ba8760de9c27a827aeca53d43e3
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Fri Mar 13 11:15:11 2015 +0100

    [BUILDROOT] 2015.02: remove linux patches hook, use a BR patch instead
    
    This fixes APF28 linux 2.6.35.3 build.

commit 38d364c15c09264627f308e7dd48d7b35b488fd9
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Thu Mar 12 10:48:35 2015 +0100

    [BUILDROOT] cleanup buildroot/target/device/armadeus/Makefile.in

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

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |   49 --------------
 ...eus-fixes-strace-4.9-build-on-old-kernels.patch |   68 +++++++++++++++++++-
 ...222-armadeus-apply-armadeus-linux-patches.patch |   13 ++++
 patches/buildroot/2015.02/cleanup_buildroot.sh     |   31 +++++----
 scripts/quiltify.sh                                |    2 +-
 5 files changed, 97 insertions(+), 66 deletions(-)
 create mode 100644 patches/buildroot/2015.02/222-armadeus-apply-armadeus-linux-patches.patch

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 57aaf1f..559bc4e 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -53,16 +53,6 @@ endef
 UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
 endif # BR2_BOARD_NAME != apf6
 
-define LINUX_POST_PATCH_ACTION
-	for p in $(LINUX_PATCHES) ; do \
-		if test -d $$p ; then \
-			support/scripts/apply-patches.sh $(@D) $$p \*.patch ; \
-		fi \
-	done
-endef
-
-LINUX_POST_PATCH_HOOKS += LINUX_POST_PATCH_ACTION
-
 define LINUX_PRE_CONFIGURE_ACTION
 	ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules $(@D)/drivers/armadeus
 	$(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(@D)/Makefile
@@ -71,43 +61,4 @@ endef
 
 LINUX_PRE_CONFIGURE_HOOKS += LINUX_PRE_CONFIGURE_ACTION
 
-
-# --- To be removed (now done in recent BR in post_image_creation.sh)
-ifeq ($(BR2_VERSION),2013.05)
-define LINUX_POST_INSTALL_IMAGES_ACTION
-	@if [ -e "$(BINARIES_DIR)/$(LINUX_IMAGE_NAME)" ]; then \
-	mv $(BINARIES_DIR)/$(LINUX_IMAGE_NAME) \
-		$(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME) ; \
-	fi
-	@if [ -f "$(BINARIES_DIR)/$(KERNEL_DTBS)" ]; then \
-	mv $(BINARIES_DIR)/$(KERNEL_DTBS) \
-		$(BINARIES_DIR)/$(ARMADEUS_DTB_IMAGE_NAME) ; \
-	fi
-endef
-
-LINUX_POST_INSTALL_IMAGES_HOOKS += LINUX_POST_INSTALL_IMAGES_ACTION
-
-define LINUX_POST_INSTALL_TARGET_ACTION
-	@if [ -e "$(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)" ]; then \
-	mv $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) \
-		$(TARGET_DIR)/boot/$(ARMADEUS_LINUX_IMAGE_NAME) ; \
-	fi
-	@if [ -f "$(TARGET_DIR)/boot/$(KERNEL_DTBS)" ]; then \
-	mv $(TARGET_DIR)/boot/$(KERNEL_DTBS) \
-		$(TARGET_DIR)/boot/$(ARMADEUS_DTB_IMAGE_NAME) ; \
-	fi
-endef
-
-LINUX_POST_INSTALL_TARGET_HOOKS += LINUX_POST_INSTALL_TARGET_ACTION
-
-$(BINARIES_DIR)/$(BOARD_NAME)-rootfs.%: $(BINARIES_DIR)/rootfs.%
-	mv -f $< $@
-
-ROOTFS_JFFS2_POST_TARGETS += $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.jffs2
-ROOTFS_UBI_POST_TARGETS += $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.ubi
-ROOTFS_TAR_POST_TARGETS += $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.tar
-endif # BR 2013.05
-# --- end of to be removed
-
-
 endif
diff --git a/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch b/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
index 1e9dc87..7b9d912 100644
--- a/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
+++ b/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
@@ -4,8 +4,72 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch	2015-03-09 16:39:45.716159156 +0100
+--- /dev/null
++++ buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
+@@ -0,0 +1,59 @@
++From 79b5dc0c64d88cda3da23b2e22a5cec0964372ac Mon Sep 17 00:00:00 2001
++From: Eric Paris <ep...@re...>
++Date: Fri, 15 Oct 2010 14:34:14 -0700
++Subject: types.h: define __aligned_u64 and expose to userspace
++
++We currently have a kernel internal type called aligned_u64 which aligns
++__u64's on 8 bytes boundaries even on systems which would normally align
++them on 4 byte boundaries.  This patch creates a new type __aligned_u64
++which does the same thing but which is exposed to userspace rather than
++being kernel internal.
++
++[akpm: merge early as both the net and audit trees want this]
++
++[ak...@li...: enhance the comment describing the reasons for using aligned_u64.  Via Andreas and Andi.]
++Based-on-patch-by: Andreas Gruenbacher <ag...@su...>
++Signed-off-by: Eric Paris <ep...@re...>
++Cc: Jan Engelhardt <je...@me...>
++Cc: David Miller <da...@da...>
++Cc: Andi Kleen <an...@fi...>
++Cc: Arnd Bergmann <ar...@ar...>
++Signed-off-by: Andrew Morton <ak...@li...>
++Signed-off-by: Linus Torvalds <tor...@li...>
++
++diff --git a/include/linux/types.h b/include/linux/types.h
++index 01a082f..357dbc1 100644
++--- a/include/linux/types.h
+++++ b/include/linux/types.h
++@@ -121,7 +121,15 @@ typedef		__u64		u_int64_t;
++ typedef		__s64		int64_t;
++ #endif
++
++-/* this is a special 64bit data type that is 8-byte aligned */
+++/*
+++ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
+++ * common 32/64-bit compat problems.
+++ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
+++ * architectures) and to 8-byte boundaries on 64-bit architetures.  The new
+++ * aligned_64 type enforces 8-byte alignment so that structs containing
+++ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
+++ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
+++ */
++ #define aligned_u64 __u64 __attribute__((aligned(8)))
++ #define aligned_be64 __be64 __attribute__((aligned(8)))
++ #define aligned_le64 __le64 __attribute__((aligned(8)))
++@@ -178,6 +186,11 @@ typedef __u64 __bitwise __be64;
++ typedef __u16 __bitwise __sum16;
++ typedef __u32 __bitwise __wsum;
++
+++/* this is a special 64bit data type that is 8-byte aligned */
+++#define __aligned_u64 __u64 __attribute__((aligned(8)))
+++#define __aligned_be64 __be64 __attribute__((aligned(8)))
+++#define __aligned_le64 __le64 __attribute__((aligned(8)))
+++
++ #ifdef __KERNEL__
++ typedef unsigned __bitwise__ gfp_t;
++ typedef unsigned __bitwise__ fmode_t;
++--
++cgit v0.10.2
++
+Index: buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
 @@ -0,0 +1,59 @@
 +From 79b5dc0c64d88cda3da23b2e22a5cec0964372ac Mon Sep 17 00:00:00 2001
 +From: Eric Paris <ep...@re...>
diff --git a/patches/buildroot/2015.02/222-armadeus-apply-armadeus-linux-patches.patch b/patches/buildroot/2015.02/222-armadeus-apply-armadeus-linux-patches.patch
new file mode 100644
index 0000000..58de3da
--- /dev/null
+++ b/patches/buildroot/2015.02/222-armadeus-apply-armadeus-linux-patches.patch
@@ -0,0 +1,13 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -160,7 +160,7 @@ define LINUX_APPLY_PATCHES
+		if echo $$p | grep -q -E "^ftp://|^http://|^https://" ; then \
+			$(APPLY_PATCHES) $(@D) $(DL_DIR) `basename $$p` ; \
+		elif test -d $$p ; then \
+-			$(APPLY_PATCHES) $(@D) $$p linux-\*.patch ; \
++			$(APPLY_PATCHES) $(@D) $$p \*.patch ; \
+		else \
+			$(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` ; \
+		fi \
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index 8a389f8..387163f 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -9,33 +9,34 @@
 #                                                  #
 ####################################################
 
+rm -rf buildroot/Makefile
 rm -rf buildroot/arch/Config.in.arm
 rm -rf buildroot/boot/uboot/Config.in
 rm -rf buildroot/boot/uboot/uboot.mk
 rm -rf buildroot/linux/Config.ext.in
 rm -rf buildroot/linux/linux-ext-xenomai.mk
-rm -rf buildroot/Makefile
-rm -rf buildroot/package/agg/agg.mk
+rm -rf buildroot/linux/linux.mk
+rm -rf buildroot/package/Config.in
+rm -rf buildroot/package/Config.in.host
 rm -rf buildroot/package/agg/Config.in
+rm -rf buildroot/package/agg/agg.mk
 rm -rf buildroot/package/alsa-utils/alsa-utils.mk
-rm -rf buildroot/package/beremiz/beremiz.mk
 rm -rf buildroot/package/beremiz/Config.in
+rm -rf buildroot/package/beremiz/beremiz.mk
 rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
+rm -rf buildroot/package/bluez3-libs/Config.in
+rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
+rm -rf buildroot/package/bluez3-utils/Config.in
+rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
 rm -rf buildroot/package/bluez3/bluetooth.default
 rm -rf buildroot/package/bluez3/bluez-pand-devup.sh
 rm -rf buildroot/package/bluez3/bluez-utils-bluepin.sh
 rm -rf buildroot/package/bluez3/hcid.conf
-rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
-rm -rf buildroot/package/bluez3-libs/Config.in
-rm -rf buildroot/package/bluez3/rfcomm.conf
 rm -rf buildroot/package/bluez3/rfcomm-getty
-rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
-rm -rf buildroot/package/bluez3-utils/Config.in
+rm -rf buildroot/package/bluez3/rfcomm.conf
 rm -rf buildroot/package/busybox/busybox-0007-stty_add_rs485_config.patch
 rm -rf buildroot/package/busybox/busybox.mk
 rm -rf buildroot/package/can-utils/can-utils.mk
-rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/Config.in.host
 rm -rf buildroot/package/cunit/Config.in
 rm -rf buildroot/package/cunit/cunit.mk
 rm -rf buildroot/package/dbus/dbus.mk
@@ -52,8 +53,8 @@ rm -rf buildroot/package/gnash/gnash.mk
 rm -rf buildroot/package/gnokii/Config.in
 rm -rf buildroot/package/gnokii/gnokii.mk
 rm -rf buildroot/package/gpsd/Config.in
-rm -rf buildroot/package/gpsd/gpsd.mk
 rm -rf buildroot/package/gpsd/S50gpsd
+rm -rf buildroot/package/gpsd/gpsd.mk
 rm -rf buildroot/package/gsmmux/Config.in
 rm -rf buildroot/package/gsmmux/gsmmux.mk
 rm -rf buildroot/package/imx-test/Config.in
@@ -66,6 +67,7 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
 rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
 rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
 rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
+rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
 rm -rf buildroot/package/marble/Config.in
 rm -rf buildroot/package/marble/marble.mk
 rm -rf buildroot/package/matiec/Config.in
@@ -91,10 +93,11 @@ rm -rf buildroot/package/python-flask-login/python-flask-login.mk
 rm -rf buildroot/package/python-lxml/Config.in
 rm -rf buildroot/package/python-lxml/python-lxml.mk
 rm -rf buildroot/package/python-pygame/Config.in
-rm -rf buildroot/package/python/python.mk
 rm -rf buildroot/package/python-wx/Config.in
 rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
 rm -rf buildroot/package/python-wx/python-wx.mk
+rm -rf buildroot/package/python/Config.in
+rm -rf buildroot/package/python/python.mk
 rm -rf buildroot/package/pywebradio/Config.in
 rm -rf buildroot/package/pywebradio/pywebradio.mk
 rm -rf buildroot/package/qtcreator/Config.in.host
@@ -112,11 +115,11 @@ rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
 rm -rf buildroot/package/rxtx/rxtx.mk
 rm -rf buildroot/package/sam7-pgm-ng/Config.in
 rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
+rm -rf buildroot/package/sdl_water/Config.in
+rm -rf buildroot/package/sdl_water/sdl_water.mk
 rm -rf buildroot/package/sdlquake/Config.in
 rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
 rm -rf buildroot/package/sdlquake/sdlquake.mk
-rm -rf buildroot/package/sdl_water/Config.in
-rm -rf buildroot/package/sdl_water/sdl_water.mk
 rm -rf buildroot/package/shiboken/Config.in
 rm -rf buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
 rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 28ebccf..00b26c4 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -124,7 +124,7 @@ if [ "$1" == "export" ]; then
 		EOF
 
 		cd $ARMADEUS_BUILDROOT_DIR
-		quilt files -a | sort | uniq | sed 's/^/rm -rf buildroot\//' >> $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+		quilt files -a | LC_ALL=C sort | uniq | sed 's/^/rm -rf buildroot\//' >> $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
 
 		echo -e "\n--- $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh has been updated. Please check if it is correct before committing:\n"
 		git diff --exit-code $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh


hooks/post-receive
-- 
armadeus


