[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-64-g7d6cc50
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2012-11-25 18:35:21
|
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 7d6cc50a5a76d33a5ee622d8d1a970d34d879849 (commit)
via e9c7ff7396113c3f093aca9cbd26f36be87132e3 (commit)
from 502ac7dc2b57fdfcb5afaa39a9025a22e518ff1d (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 7d6cc50a5a76d33a5ee622d8d1a970d34d879849
Author: Julien Boibessot <jul...@ar...>
Date: Sun Nov 25 19:32:58 2012 +0100
[BUILD] Fixes make linux-clean target
commit e9c7ff7396113c3f093aca9cbd26f36be87132e3
Author: Julien Boibessot <jul...@ar...>
Date: Sun Nov 25 18:55:44 2012 +0100
[BUILDROOT] 2012.02: Improves 199-compat-wireless-add_package.patch
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../2012.02/199-compat-wireless-add_package.patch | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 7260a81..cd9e87f 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,7 @@ linux26 linux: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
- @$(MAKE) -C $(BUILDROOT_DIR) linux26clean
+ @$(MAKE) -C $(BUILDROOT_DIR) linux-clean
%_defconfig: $(BUILDROOT_DIR)/.patched
@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
diff --git a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
index a64b60b..0aa72e2 100644
--- a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -6,7 +6,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/compat-wireless/compat-wireless.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless.mk 2012-11-20 11:46:18.000000000 +0100
++++ buildroot/package/compat-wireless/compat-wireless.mk 2012-11-25 17:21:58.000000000 +0100
@@ -0,0 +1,42 @@
+#############################################################
+#
@@ -29,7 +29,7 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
+ KLIB_BUILD="$(BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)" \
+ KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
+ ARCH=$(BR2_ARCH) \
-+ -C $(@D) $(COMPAT_WIRELESS_MAKE_OPT)
++ -C $(@D) modules
+endef
+
+define COMPAT_WIRELESS_CLEAN_CMDS
@@ -44,8 +44,8 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
+define COMPAT_WIRELESS_INSTALL_TARGET_CMDS
+ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" COPTS="$(TARGET_CFLAGS)" \
+ KLIB_BUILD="$(BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)" \
-+ KLIB="$(TARGET_DIR)/lib/modules/$(BR2_LINUX_KERNEL_VERSION)" \
-+ DEPMOD=echo DESTDIR=$(TARGET_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) \
++ KLIB="$(TARGET_DIR)" \
++ DEPMOD=$(HOST_DIR)/usr/sbin/depmod DESTDIR=$(TARGET_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) \
+ LDFLAGS="" -C $(@D) install-modules
+endef
+
@@ -53,7 +53,7 @@ Index: buildroot/package/compat-wireless/compat-wireless.mk
Index: buildroot/package/compat-wireless/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/Config.in 2012-11-20 11:22:54.000000000 +0100
++++ buildroot/package/compat-wireless/Config.in 2012-11-25 17:12:17.000000000 +0100
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_COMPAT_WIRELESS
+ bool "compat-wireless"
@@ -79,8 +79,8 @@ Index: buildroot/package/compat-wireless/Config.in
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-11-20 11:14:46.000000000 +0100
-+++ buildroot/package/Config.in 2012-11-20 11:15:20.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-11-25 17:12:17.000000000 +0100
++++ buildroot/package/Config.in 2012-11-25 17:12:17.000000000 +0100
@@ -180,6 +180,7 @@
menu "Hardware handling"
source "package/acpid/Config.in"
@@ -89,10 +89,10 @@ Index: buildroot/package/Config.in
source "package/cramfs/Config.in"
source "package/cwiid/Config.in"
source "package/dbus/Config.in"
-Index: buildroot/package/compat-wireless/compat-wireless-hacks.patch
+Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless-hacks.patch 2012-11-20 11:39:37.000000000 +0100
++++ buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch 2012-11-25 17:12:17.000000000 +0100
@@ -0,0 +1,24 @@
+Remove x86 specific stuff.
+Better way has to be found IMHO before sending to BR mainline.
hooks/post-receive
--
armadeus
|