[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-645-g5e40107
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2015-03-09 16:38:03
|
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 5e40107346b9f1247bd5b80919d797d787fe5045 (commit)
via 39f2444e5fe99377a6479afe52193e203aaa1862 (commit)
via 3060fd6c9af2274b17af73f6ffb88b9e6c683384 (commit)
from 2a5824887a771bcccec6ae4c8d3e257960477308 (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 5e40107346b9f1247bd5b80919d797d787fe5045
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 17:37:10 2015 +0100
[BUILDROOT] 2015.02: updates cleanup_buildroot.sh
commit 39f2444e5fe99377a6479afe52193e203aaa1862
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 17:35:50 2015 +0100
[BUILDROOT] 2015.02: APF27: strace 4.9: fixes build with old kernels
commit 3060fd6c9af2274b17af73f6ffb88b9e6c683384
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 17:30:28 2015 +0100
[BUILDROOT] 2015.02: fixes can-utils build
-----------------------------------------------------------------------
Summary of changes:
.../022-mainline-bump-can-utils-version.patch | 20 ++++++
...eus-fixes-strace-4.9-build-on-old-kernels.patch | 68 ++++++++++++++++++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 38 +++++++----
3 files changed, 111 insertions(+), 15 deletions(-)
create mode 100644 patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch
create mode 100644 patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
diff --git a/patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch b/patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch
new file mode 100644
index 0000000..55b8fa3
--- /dev/null
+++ b/patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch
@@ -0,0 +1,20 @@
+Backport from BR mainline for SITE. (Can be removed when switching to BR 2015.05.)
+VERSION is taken frome BR 2013.11 as newer can-utils fails to build on old kernels. TO FIX !
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/can-utils/can-utils.mk
+===================================================================
+--- buildroot.orig/package/can-utils/can-utils.mk 2015-03-01 22:26:12.000000000 +0100
++++ buildroot/package/can-utils/can-utils.mk 2015-03-09 15:28:02.176007201 +0100
+@@ -4,8 +4,8 @@
+ #
+ ################################################################################
+
+-CAN_UTILS_VERSION = 111f8d3acf6f6b30bf208fd9c98399c5fb9d29de
+-CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
++CAN_UTILS_VERSION = 16c970d40e6c19dde705bad4751bab1a3a4f3a0d
++CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION))
+ CAN_UTILS_AUTORECONF = YES
+
+ $(eval $(autotools-package))
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
new file mode 100644
index 0000000..1e9dc87
--- /dev/null
+++ b/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
@@ -0,0 +1,68 @@
+Backport from recent Linux kernels. (See also patches/linux/2.6.29/368-xxx
+
+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
+@@ -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
++
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index cab2e20..8685fbc 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -9,44 +9,51 @@
# #
####################################################
-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/package/Config.in
-rm -rf buildroot/package/Config.in.host
-rm -rf buildroot/package/agg/Config.in
+rm -rf buildroot/Makefile
rm -rf buildroot/package/agg/agg.mk
+rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
-rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
+rm -rf buildroot/package/beremiz/Config.in
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/rfcomm-getty
+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/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
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/freescale-imx/Config.in
+rm -rf buildroot/package/freescale-imx/freescale-imx.mk
+rm -rf buildroot/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu/3.10.17-1.0.0/0001-vpu-io-fix-IOSystemInit-failure.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu/3.10.17-1.0.0/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
rm -rf buildroot/package/gnash/Config.in
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/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
+rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
rm -rf buildroot/package/imx-test/Config.in
@@ -58,6 +65,7 @@ rm -rf buildroot/package/imx-usb-loader/Config.in.host
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/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
@@ -70,12 +78,12 @@ rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.mk
+rm -rf buildroot/package/python/Config.in
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
@@ -93,11 +101,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
hooks/post-receive
--
armadeus
|