From patchwork Fri Aug 24 07:29:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hesse X-Patchwork-Id: 743 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 230076763C1B for ; Fri, 24 Aug 2018 07:30:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=DKIM_SIGNED=0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,T_DKIM_INVALID=1 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 [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Fri, 24 Aug 2018 07:30:41 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 0924ECE9184AF; Fri, 24 Aug 2018 07:30:34 +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; Fri, 24 Aug 2018 07:30:34 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D984C282FA; Fri, 24 Aug 2018 07:30:33 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=eworm.de header.i=@eworm.de header.b=AK2Suimj Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 44D2D282EC for ; Fri, 24 Aug 2018 07:30:32 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 24 Aug 2018 07:30:32 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 87ECCCE9184AB for ; Fri, 24 Aug 2018 07:30:28 +0000 (UTC) Received: from mx.mylinuxtime.de (mx.mylinuxtime.de [195.201.174.144]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Fri, 24 Aug 2018 07:30:28 +0000 (UTC) Received: from leda.eworm.de (unknown [87.190.244.126]) (using TLSv1.2 with cipher DHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx.mylinuxtime.de (Postfix) with ESMTPSA id 40730F5D57; Fri, 24 Aug 2018 09:30:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mx.mylinuxtime.de 40730F5D57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eworm.de; s=mail; t=1535095828; bh=YkDqiwQdUNMEXYzJlsHTAD1jebrEvhw985N49rrW95M=; h=From:To:Cc:Subject:Date; b=AK2SuimjgYnC1ByiJGkeKAY15VN470WMbntPsbJmFcizFi8CtJgI4nfflkLH62FUv 91VjecM6zEMXcTJqMNxyXMguf14xuoxwu2pkLCg8ER4+cpp8oc3uso74N1+nAx8sn8 r931EqkHfeKJfdbojfpZ5Sj4CKpHxtLqJ3KBnEFY= Received: by leda.eworm.de (Postfix, from userid 1000) id D490A102AD0; Fri, 24 Aug 2018 09:29:57 +0200 (CEST) From: Christian Hesse To: arch-releng@archlinux.org Date: Fri, 24 Aug 2018 09:29:47 +0200 Message-Id: <20180824072947.10655-1-list@eworm.de> X-Mailer: git-send-email 2.18.0 Subject: [arch-releng] [PATCH 1/1] [configs/releng] use package amd-ucode for amd microcode 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: , Reply-To: Arch Linux Release Engineering Cc: Christian Hesse Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" From: Christian Hesse The package linux-firmware has a new split package amd-ucode. Do not build the image manually but use the package. Signed-off-by: Christian Hesse --- configs/releng/build.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 3272cd8..d405ece 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -61,7 +61,7 @@ make_pacman_conf() { # Base installation, plus needed packages (airootfs) make_basefs() { mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init - mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install + mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install } # Additional packages (airootfs) @@ -107,16 +107,6 @@ make_customize_airootfs() { rm ${work_dir}/x86_64/airootfs/root/customize_airootfs.sh } -# Prepare amd_ucode -make_amd_ucode_img() { - mkdir -p ${work_dir}/amd-ucode/kernel/x86/microcode - cat ${work_dir}/x86_64/airootfs/lib/firmware/amd-ucode/microcode_amd*.bin > ${work_dir}/amd-ucode/kernel/x86/microcode/AuthenticAMD.bin - pushd ${work_dir}/amd-ucode > /dev/null - echo kernel/x86/microcode/AuthenticAMD.bin | bsdcpio -o -H newc -R 0:0 > amd-ucode.img - popd > /dev/null - cp ${work_dir}/amd-ucode/amd-ucode.img ${work_dir}/x86_64/airootfs/boot/amd-ucode.img -} - # Prepare kernel/initramfs ${install_dir}/boot/ make_boot() { mkdir -p ${work_dir}/iso/${install_dir}/boot/x86_64 @@ -266,7 +256,6 @@ run_once make_basefs run_once make_packages run_once make_setup_mkinitcpio run_once make_customize_airootfs -run_once make_amd_ucode_img run_once make_boot run_once make_boot_extra run_once make_syslinux