From patchwork Tue Jul 31 23:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nl6720 via arch-releng X-Patchwork-Id: 712 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 7104F5DB9C34 for ; Tue, 31 Jul 2018 23:27:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,T_DKIMWL_WL_HIGH=-0.01 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 31 Jul 2018 23:27:53 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 48844C7EAD8BF; Tue, 31 Jul 2018 23:27:42 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Tue, 31 Jul 2018 23:27:42 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2EC332A64F; Tue, 31 Jul 2018 23:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1533079662; bh=yqxbzZfW6uYOEAR3Ca/SCTq0ylWXZHG2WJOFhFOWv7A=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=PrkyQX1/A8uZ7eG4qtCgXwHkPU5/bBCHpl1wJylGOwqyoXdefZlrJ3kQvWMzl14T6 4nhR7UcfzUmKxYLhsvTWGL3f+QPwWigFPO8Ia8df9mMvZZoxn9VqfMHDSyoGPmimUF tpKkzIei0BYBoBYzTN4yH3Nz72NJBvW92iulq+5SihvMCwA8qbzPEui8b1XDXI9EnX KtFqXAPz+fsnY4Q1Ss1Uclx3oU84B0YhQXqw1NvNyKXbDB9AtfJRXM78pI+HxLDnBs P6mzKHvAbmUaIl66z6MksH/08YSB6z3F2kT22e57/AyMOx0ORnAjGO1AkYGJMQHQUf B/DLghgKJRC6LZRGwHnlj2VFbgqZSd3rl6zLg43NH0h/ncof7NfTswfDDFztkIqTuN FsvJI1DElhPBot0B+FX6XA6AYD2X+Kx4e9aIusHQq/5qlHNP9bNEStTQQE+yoy4kL9 pKdaM3FWiv5ZTbl53Xcq0w1mgTb3J49Ry6LqhaSfMqT2JEeEYaH4K7/gd1bUARmLwi 5zkhpxocd79zik0JC1wDbGDLEx7t/OOB4gWZFqLmfhgm9ZUiB4X5/oiuLbYitDmuDU Ftpz4iv0lDGZu7fCqi089fwy+E+SIwPAIOx9LDLMAgymGym/haKLbUiwTVio7kbScV 5Em3aU27MDRpbpR0nfo8jWQM= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 97DFA289CE for ; Tue, 31 Jul 2018 23:27:39 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 31 Jul 2018 23:27:39 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 3A517C7EAD8BC; Tue, 31 Jul 2018 23:27:26 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id AB980C7EAD8BB; Tue, 31 Jul 2018 23:27:25 +0000 (UTC) To: arch-releng@archlinux.org Date: Tue, 31 Jul 2018 19:27:11 -0400 Message-Id: <20180731232711.7402-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.18.0 Subject: [arch-releng] [archiso] [PATCH] [releng] make detection of kernel modules dir more robust X-BeenThere: arch-releng@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Arch Linux Release Engineering List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Schwartz via arch-releng Reply-To: Arch Linux Release Engineering Cc: Eli Schwartz Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" extract `uname -r` from the contents of vmlinuz-linux rather than make assumptions about the kernel EXTRAVERSION. This is trivially customizable by changing the chosen kernel image. Fixes FS#59496 Signed-off-by: Eli Schwartz --- configs/releng/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 180fa94..f5524e8 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -124,6 +124,7 @@ make_boot_extra() { # Prepare /${install_dir}/boot/syslinux make_syslinux() { + _uname_r=$(file -b ${work_dir}/x86_64/airootfs/boot/vmlinuz-linux| awk 'f{print;f=0} /version/{f=1}' RS=' ') mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux for _cfg in ${script_path}/syslinux/*.cfg; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; @@ -135,7 +136,7 @@ make_syslinux() { cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt gzip -c -9 ${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz - gzip -c -9 ${work_dir}/x86_64/airootfs/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz + gzip -c -9 ${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz } # Prepare /isolinux