Subject: + fix-build-with-make-380.patch added to -mm tree
To: JBeulich@xxxxxxxx,jbeulich@xxxxxxxx,ppandit@xxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 16 Dec 2013 14:52:24 -0800
The patch titled
Subject: fix build with make 3.80
has been added to the -mm tree. Its filename is
fix-build-with-make-380.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fix-build-with-make-380.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fix-build-with-make-380.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: "Jan Beulich" <JBeulich@xxxxxxxx>
Subject: fix build with make 3.80
According to Documentation/Changes, make 3.80 is still being supported for
building the kernel, hence make files must not make (unconditional) use of
features introduced only in newer versions. Commit 1bf49dd4 ("./Makefile:
export initial ramdisk compression config option") however introduced
"else ifeq" constructs which make 3.80 doesn't understand. Replace the
logic there with more conventional (in the kernel build infrastructure)
list constructs (except that the list here is intentionally limited to
exactly one element).
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Cc: P J P <ppandit@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Makefile | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff -puN Makefile~fix-build-with-make-380 Makefile
--- a/Makefile~fix-build-with-make-380
+++ a/Makefile
@@ -732,19 +732,13 @@ export mod_strip_cmd
# Select initial ramdisk compression format, default is gzip(1).
# This shall be used by the dracut(8) tool while creating an initramfs image.
#
-INITRD_COMPRESS=gzip
-ifeq ($(CONFIG_RD_BZIP2), y)
- INITRD_COMPRESS=bzip2
-else ifeq ($(CONFIG_RD_LZMA), y)
- INITRD_COMPRESS=lzma
-else ifeq ($(CONFIG_RD_XZ), y)
- INITRD_COMPRESS=xz
-else ifeq ($(CONFIG_RD_LZO), y)
- INITRD_COMPRESS=lzo
-else ifeq ($(CONFIG_RD_LZ4), y)
- INITRD_COMPRESS=lz4
-endif
-export INITRD_COMPRESS
+INITRD_COMPRESS-y := gzip
+INITRD_COMPRESS-$(CONFIG_RD_BZIP2) := bzip2
+INITRD_COMPRESS-$(CONFIG_RD_LZMA) := lzma
+INITRD_COMPRESS-$(CONFIG_RD_XZ) := xz
+INITRD_COMPRESS-$(CONFIG_RD_LZO) := lzo
+INITRD_COMPRESS-$(CONFIG_RD_LZ4) := lz4
+export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
ifdef CONFIG_MODULE_SIG_ALL
MODSECKEY = ./signing_key.priv
_
Patches currently in -mm which might be from JBeulich@xxxxxxxx are
fix-build-with-make-380.patch
lib-decompress_unlz4c-always-set-an-error-return-code-on-failures.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
