[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-14-g2c0a42c

[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  2c0a42c3934233bde33d45f5f4503e17a901c78f (commit)
       via  6af30da700b3bc1f0d16a8d7b3b683f6219cf108 (commit)
      from  501f40600280c1f2e8f9be83b04a3b3b0422a26d (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 2c0a42c3934233bde33d45f5f4503e17a901c78f
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Sep 18 13:40:35 2015 +0200

    [BUILD] Download buildroot archive only if needed

commit 6af30da700b3bc1f0d16a8d7b3b683f6219cf108
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Sep 18 13:39:39 2015 +0200

    [BUILDROOT] busybox: fixes build of rfkill applet on old kernels

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

Summary of changes:
 Makefile                                           |    4 +-
 ...-busybox-fixes-rfkil-build-on-old-kernels.patch |   57 ++++++++++++++++++++
 patches/buildroot/2015.02/cleanup_buildroot.sh     |    1 +
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 patches/buildroot/2015.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch

diff --git a/Makefile b/Makefile
index be02da9..227dc3d 100644
--- a/Makefile
+++ b/Makefile
@@ -104,8 +104,8 @@ help:
 
 $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE):
 	mkdir -p $(BUILDROOT_FILE_PATH)
-	$(WGET) -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE) \
-		|| $(WGET) -P $(BUILDROOT_FILE_PATH) $(ARMADEUS_FTP_SITE)/$(BUILDROOT_SOURCE)
+	$(WGET) -N -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE) \
+		|| $(WGET) -N -P $(BUILDROOT_FILE_PATH) $(ARMADEUS_FTP_SITE)/$(BUILDROOT_SOURCE)
 
 buildroot-sources: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE)
 
diff --git a/patches/buildroot/2015.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch b/patches/buildroot/2015.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch
new file mode 100644
index 0000000..34067ba
--- /dev/null
+++ b/patches/buildroot/2015.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch
@@ -0,0 +1,57 @@
+rfkill is not avalaible on "old" APF27 & APF9328 kernels.
+
+Index: buildroot/package/busybox/0006-rfkill-build.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/busybox/0006-rfkill-build.patch
+@@ -0,0 +1,50 @@
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-2.6.29.6/Documentation/dontdiff busybox-1.23.1/miscutils/rfkill.c busybox-1.23.1.mod/miscutils/rfkill.c
++--- busybox-1.23.1/miscutils/rfkill.c	2015-01-27 09:48:58.000000000 +0100
+++++ busybox-1.23.1.mod/miscutils/rfkill.c	2015-09-18 12:52:10.789275241 +0200
++@@ -37,7 +37,11 @@
++ //usage:     "\n		wimax, wwan, gps, fm"
++ 
++ #include "libbb.h"
+++#include <linux/version.h>
+++
+++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
++ #include <linux/rfkill.h>
+++#endif
++ 
++ enum {
++ 	OPT_b = (1 << 0), /* must be = 1 */
++@@ -48,6 +52,7 @@
++ int rfkill_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
++ int rfkill_main(int argc UNUSED_PARAM, char **argv)
++ {
+++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
++ 	struct rfkill_event event;
++ 	const char *rf_name;
++ 	int rf_fd;
++@@ -55,12 +60,14 @@
++ 	int rf_type;
++ 	int rf_idx;
++ 	unsigned rf_opt = 0;
+++#endif
++ 
++ 	argv++;
++ 	/* Must have one or two params */
++ 	if (!argv[0] || (argv[1] && argv[2]))
++ 		bb_show_usage();
++ 
+++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
++ 	mode = O_RDWR | O_NONBLOCK;
++ 	rf_name = argv[1];
++ 	if (strcmp(argv[0], "list") == 0) {
++@@ -145,6 +152,8 @@
++ 
++ 		xwrite(rf_fd, &event, sizeof(event));
++ 	}
++-
+++#else
+++	printf("Kernel too old, sorry...\n");
+++#endif
++ 	return EXIT_SUCCESS;
++ }
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index 6f3ad5f..adaf421 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -41,6 +41,7 @@ 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/rfcomm.conf
+rm -rf buildroot/package/busybox/0006-rfkill-build.patch
 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


hooks/post-receive
-- 
armadeus