diff options
-rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/fixes-for-using-make-3.82.patch | 51 | ||||
-rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/fixes-for-using-make-3.82.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/fixes-for-using-make-3.82.patch new file mode 100644 index 00000000..aa81fb25 --- /dev/null +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/fixes-for-using-make-3.82.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From: Jan Beulich <JBeulich@novell.com> | ||
2 | Date: Mon, 16 Aug 2010 11:58:58 +0100 | ||
3 | Subject: fixes for using make 3.82 | ||
4 | |||
5 | It doesn't like pattern and explicit rules to be on the same line, | ||
6 | and it seems to be more picky when matching file (or really directory) | ||
7 | names with different numbers of trailing slashes. | ||
8 | |||
9 | Upstream-Status: Backport [2.6.36] | ||
10 | |||
11 | Signed-off-by: Jan Beulich <jbeulich@novell.com> | ||
12 | Acked-by: Sam Ravnborg <sam@ravnborg.org> | ||
13 | Andrew Benton <b3nton@gmail.com> | ||
14 | Cc: <stable@kernel.org> | ||
15 | Signed-off-by: Michal Marek <mmarek@suse.cz> | ||
16 | --- | ||
17 | firmware/Makefile | 2 +- | ||
18 | scripts/mkmakefile | 4 +++- | ||
19 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/firmware/Makefile b/firmware/Makefile | ||
22 | index 2f1c370..bed7d05 100644 | ||
23 | --- a/firmware/Makefile | ||
24 | +++ b/firmware/Makefile | ||
25 | @@ -145,7 +145,7 @@ fw-shipped-$(CONFIG_FB_MXC_EINK_PANEL) += imx/epdc_E60_V110.fw \ | ||
26 | fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) | ||
27 | |||
28 | # Directories which we _might_ need to create, so we have a rule for them. | ||
29 | -firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all)))) | ||
30 | +firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all)))) | ||
31 | |||
32 | quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@) | ||
33 | cmd_mkdir = mkdir -p $@ | ||
34 | diff --git a/scripts/mkmakefile b/scripts/mkmakefile | ||
35 | index 67d59c7..5325423 100644 | ||
36 | --- a/scripts/mkmakefile | ||
37 | +++ b/scripts/mkmakefile | ||
38 | @@ -44,7 +44,9 @@ all: | ||
39 | |||
40 | Makefile:; | ||
41 | |||
42 | -\$(all) %/: all | ||
43 | +\$(all): all | ||
44 | @: | ||
45 | |||
46 | +%/: all | ||
47 | + @: | ||
48 | EOF | ||
49 | -- | ||
50 | 2.1.4 | ||
51 | |||
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb index df14c1c5..1585e3b9 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb | |||
@@ -19,6 +19,7 @@ SRCBRANCH = "imx_2.6.35_maintain" | |||
19 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ | 19 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ |
20 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ | 20 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ |
21 | file://perf-avoid-use-sysroot-headers.patch \ | 21 | file://perf-avoid-use-sysroot-headers.patch \ |
22 | file://fixes-for-using-make-3.82.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI_append_mx28 = " \ | 25 | SRC_URI_append_mx28 = " \ |