summaryrefslogtreecommitdiff
path: root/cleopatre/buildroot
diff options
context:
space:
mode:
authorlefranc2009-12-08 16:12:46 +0000
committerlefranc2009-12-08 16:12:46 +0000
commit85ac38f7c0af77a627c6b4e283ebdea659b9a5f0 (patch)
tree156c40300f94c2e2aad8d9ec06670e8dfc01d6fb /cleopatre/buildroot
parentf47bf72c3894323e3c19fa8fbc4ed6bc24b5c68d (diff)
cleo/{linux-2.6.10.25-spc300,buildroot}: closes #861
- replace getline by parseline into unifdef.c to prevent name confict with libc - add a patch file for original toolchain linux kernel - fix a bug in patch-kernel.sh call preventing the patch to apply git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6535 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/buildroot')
-rw-r--r--cleopatre/buildroot/toolchain/kernel-headers/kernel-headers-new.makefile4
-rw-r--r--cleopatre/buildroot/toolchain/kernel-headers/linux-2.6.25.10-scripts.patch29
2 files changed, 31 insertions, 2 deletions
diff --git a/cleopatre/buildroot/toolchain/kernel-headers/kernel-headers-new.makefile b/cleopatre/buildroot/toolchain/kernel-headers/kernel-headers-new.makefile
index 7852c04bcc..acca8a44d8 100644
--- a/cleopatre/buildroot/toolchain/kernel-headers/kernel-headers-new.makefile
+++ b/cleopatre/buildroot/toolchain/kernel-headers/kernel-headers-new.makefile
@@ -48,7 +48,7 @@ $(DL_DIR)/$(LINUX_RT_SOURCE):
$(WGET) -P $(DL_DIR) $(LINUX_RT_SITE)/$(LINUX_RT_SOURCE)
endif
-$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
+$(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
@echo "*** Using kernel-headers generated from kernel source"
rm -rf $(LINUX_HEADERS_DIR)
[ -d $(TOOL_BUILD_DIR) ] || $(INSTALL) -d $(TOOL_BUILD_DIR)
@@ -57,7 +57,7 @@ $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
$(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
- linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
+ linux-$(LINUX_HEADERS_VERSION)-\*.patch #{,.gz,.bz2}
ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/ipmi \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
diff --git a/cleopatre/buildroot/toolchain/kernel-headers/linux-2.6.25.10-scripts.patch b/cleopatre/buildroot/toolchain/kernel-headers/linux-2.6.25.10-scripts.patch
new file mode 100644
index 0000000000..b3b95de26e
--- /dev/null
+++ b/cleopatre/buildroot/toolchain/kernel-headers/linux-2.6.25.10-scripts.patch
@@ -0,0 +1,29 @@
+--- linux-2.6.25.10/scripts/unifdef.c 2008-07-03 05:46:47.000000000 +0200
++++ linux-2.6.25.10-spc300/scripts/unifdef.c 2009-12-08 16:10:20.000000000 +0100
+@@ -206,7 +206,7 @@
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype parseline(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = parseline();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++parseline(void)
+ {
+ const char *cp;
+ int cursym;