[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-65-g1a6eb08

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  1a6eb085183ea4cf25806c34fdde0be34cd55b3e (commit)
       via  f9b1f2719d2ca47d6be58f157778052c6eb11e84 (commit)
       via  54873480b5fcbdba775cd4adec4b89da39295aff (commit)
      from  bab28cfc6cb5a3bec027525590a39abe1d88fcfa (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 1a6eb085183ea4cf25806c34fdde0be34cd55b3e
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 18:31:34 2010 +0200

    [BUILDROOT] [2010.11] Makes ch70241ctrl compile OK

commit f9b1f2719d2ca47d6be58f157778052c6eb11e84
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 18:30:57 2010 +0200

    [BUILDROOT] [2010.11] Makes U-Boot & Linux version detected correctly in ARMADEUS_xx envt variables

commit 54873480b5fcbdba775cd4adec4b89da39295aff
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 18:29:57 2010 +0200

    [BUILDROOT] [2010.11] Removes unneeded patches 049 & 050

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

Summary of changes:
 Makefile.in                                        |    4 +-
 .../package/armadeus/ch7024ctrl/ch70241ctrl.mk     |    2 +-
 ...nor_patches_from_kernel_org_too.tofix_or_remove |   34 ----------------
 ...0-linux-remove_unsupported_kernel_version.tofix |   41 --------------------
 4 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove
 delete mode 100644 patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix

diff --git a/Makefile.in b/Makefile.in
index f674b4b..db0d67c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,8 +20,8 @@ ARMADEUS_UCLIBC_VERSION:=0.9.29
 ARMADEUS_QT_MAKEFILE:=package/qtopia4/qtopia4.mk
 else
 # New buildroot:
-ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_DEFAULT_KERNEL_VERSION))
-ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_UBOOT_VERSION))
+ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
+ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
 ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
 ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
 endif
diff --git a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
index ccd7376..b102663 100644
--- a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
+++ b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
@@ -19,7 +19,7 @@ $(CH7024CTRL_DIR)/ch7024.c:
 	cp $(CH7024CTRL_SOURCE)/* $(CH7024CTRL_DIR)/
 
 $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY): $(CH7024CTRL_DIR)/ch7024.c $(CH7024CTRL_DIR)/ch7024.h
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(CH7024CTRL_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(CH7024CTRL_DIR)
 
 $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY): $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY)
 	install -D $< $@
diff --git a/patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove b/patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove
deleted file mode 100644
index 71aad5d..0000000
--- a/patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove
+++ /dev/null
@@ -1,34 +0,0 @@
-"linux26-source" target only downloads bare kernel sources.
-This patch makes the (eventually needed) kernel.org minor patches are
-also downloaded.
-
-Sent to Buildroot guys. Integrated, then removed. Not clean ?
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/target/linux/Makefile.in.advanced
-===================================================================
---- buildroot.orig/target/linux/Makefile.in.advanced	2010-06-17 16:46:27.000000000 +0200
-+++ buildroot/target/linux/Makefile.in.advanced	2010-06-17 16:46:34.000000000 +0200
-@@ -201,9 +201,11 @@
- ifneq ($(strip $(LINUX26_PATCH_SOURCE)),)
- $(DL_DIR)/$(LINUX26_PATCH_SOURCE):
- 	 $(call DOWNLOAD,$(LINUX26_PATCH_SITE),$(LINUX26_PATCH_SOURCE))
-+
-+LINUX26_PATCH_SOURCE_FILE:=$(DL_DIR)/$(LINUX26_PATCH_SOURCE)
- endif
- 
--$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE)
-+$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) $(LINUX26_PATCH_SOURCE_FILE)
- 	rm -rf $(LINUX26_DIR)
- 	@echo "*** Unpacking kernel source"
- 	$(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-@@ -464,7 +466,7 @@
- 
- linux26-modules: cross-depmod26 $(STAMP_DIR)/linux_modules_target_installed
- 
--linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
-+linux26-source: $(DL_DIR)/$(LINUX26_SOURCE) $(LINUX26_PATCH_SOURCE_FILE)
- 
- linux26-unpacked: $(LINUX26_DIR)/.patched
- 
diff --git a/patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix b/patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix
deleted file mode 100644
index 72211f0..0000000
--- a/patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove kernel versions not supported by Armadeus boards from user choice.
-
-Index: buildroot/target/linux/Config.in.advanced
-===================================================================
---- buildroot.orig/target/linux/Config.in.advanced	2010-06-17 16:45:13.000000000 +0200
-+++ buildroot/target/linux/Config.in.advanced	2010-06-17 16:46:36.000000000 +0200
-@@ -98,21 +98,26 @@
- 
- config BR2_LINUX_2_6_STABLE
- 	bool "The latest stable Linux kernel (2.6.33.4)"
-+	depends on !BR2_TARGET_ARMADEUS
- 
- config BR2_LINUX_2_6_33
- 	bool "Linux 2.6.33"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_32
- 	bool "Linux 2.6.32"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_31
- 	bool "Linux 2.6.31"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_30
- 	bool "Linux 2.6.30"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_29
-@@ -121,6 +126,7 @@
- 
- config BR2_LINUX_2_6_28
- 	bool "Linux 2.6.28"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_27


hooks/post-receive
-- 
armadeus


