linux-kernel - [PATCH] Makefile: fix order of INITRD

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 20 Dec 2013 12:02:07 -0500
From:	Jeff Layton <jlayton@...hat.com>
To:	linux-kernel@...r.kernel.org, linux-kbuild@...r.kernel.org
Cc:	Jan Beulich <jbeulich@...e.com>, P J P <ppandit@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH] Makefile: fix order of INITRD_COMPRESS-y assignments

Commit 7ac181568342ec (fix build with make 3.80) changed how the
Makefile handles the INITRD_COMPRESS-y assignment in order to make it
work properly with older versions of make. Unfortunately, it also
changes the behavior of how that assignment works when multiple
CONFIG_RD_* options are set, such that they are now preferred in the
reverse order of the way they were before.

Reverse the order of assignments to try and preserve the earlier
precedence in this situation.

Cc: Jan Beulich <jbeulich@...e.com>
Cc: P J P <ppandit@...hat.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Jeff Layton <jlayton@...hat.com>
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 89cee86..fb76899 100644
--- a/Makefile
+++ b/Makefile
@@ -733,11 +733,11 @@ export mod_strip_cmd
 # This shall be used by the dracut(8) tool while creating an initramfs image.
 #
 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
+INITRD_COMPRESS-$(CONFIG_RD_LZO)   := lzo
+INITRD_COMPRESS-$(CONFIG_RD_XZ)    := xz
+INITRD_COMPRESS-$(CONFIG_RD_LZMA)  := lzma
+INITRD_COMPRESS-$(CONFIG_RD_BZIP2) := bzip2
 export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
 
 ifdef CONFIG_MODULE_SIG_ALL
-- 
1.8.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/