diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2011-08-23 21:28:55 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2011-08-23 21:28:55 -0500 |
| commit | 5fc0ab544b4414600362475471410c9dd9bcdb15 (patch) | |
| tree | 7091ecd32310d7c94b1b5fddef0c430377390992 | |
| parent | 3463257fca08681093c3ae1d865237cd5a1845d9 (diff) | |
linux-2.6.35: fix build using make 3.82
| -rw-r--r-- | multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch | 44 | ||||
| -rw-r--r-- | multitech/recipes/linux/linux_2.6.35.bbappend | 7 |
2 files changed, 50 insertions, 1 deletions
diff --git a/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch b/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch new file mode 100644 index 0000000..f941220 --- /dev/null +++ b/multitech/recipes/linux/linux-2.6.35/linux-2.6.35-make-3.82.patch @@ -0,0 +1,44 @@ +commit 3c955b407a084810f57260d61548cc92c14bc627 +Author: Jan Beulich <JBeulich@novell.com> +Date: Mon Aug 16 11:58:58 2010 +0100 + + fixes for using make 3.82 + + It doesn't like pattern and explicit rules to be on the same line, + and it seems to be more picky when matching file (or really directory) + names with different numbers of trailing slashes. + + Signed-off-by: Jan Beulich <jbeulich@novell.com> + Acked-by: Sam Ravnborg <sam@ravnborg.org> + Andrew Benton <b3nton@gmail.com> + Cc: <stable@kernel.org> + Signed-off-by: Michal Marek <mmarek@suse.cz> + +diff --git a/firmware/Makefile b/firmware/Makefile +index 020e629..99955ed 100644 +--- a/firmware/Makefile ++++ b/firmware/Makefile +@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin + fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) + + # Directories which we _might_ need to create, so we have a rule for them. +-firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all)))) ++firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all)))) + + quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@) + cmd_mkdir = mkdir -p $@ +diff --git a/scripts/mkmakefile b/scripts/mkmakefile +index 67d59c7..5325423 100644 +--- a/scripts/mkmakefile ++++ b/scripts/mkmakefile +@@ -44,7 +44,9 @@ all: + + Makefile:; + +-\$(all) %/: all ++\$(all): all + @: + ++%/: all ++ @: + EOF diff --git a/multitech/recipes/linux/linux_2.6.35.bbappend b/multitech/recipes/linux/linux_2.6.35.bbappend index c52cc86..26275e8 100644 --- a/multitech/recipes/linux/linux_2.6.35.bbappend +++ b/multitech/recipes/linux/linux_2.6.35.bbappend @@ -1,7 +1,7 @@ FILESEXTRA := "${THISDIR}" FILESPATHBASE =. "${FILESEXTRA}:" -PR .= ".corecdp2" +PR .= ".corecdp3" STABLEV = "14" SRC_URI_mtcdp = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ @@ -26,5 +26,10 @@ SRC_URI_mt100ecdp = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.b file://linux-2.6.35.14-option-zte.patch \ " +# work around firmware/Makefile issue with make 3.82 +do_install_prepend () { + mkdir -p ${D}/lib/firmware +} + SRC_URI[stablepatch.md5sum] = "1f540c6bb638e1fff9de25648d063e4c" SRC_URI[stablepatch.sha256sum] = "57c820dfb7a587c01a90d6317c9d7e2ae1471b923970ad305c384dbb1d67b182" |