From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D72DF158528 for ; Sat, 20 Jan 2024 20:04:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 260B4E29B1; Sat, 20 Jan 2024 20:04:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02CC7E29B1 for ; Sat, 20 Jan 2024 20:04:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA54E3431F3 for ; Sat, 20 Jan 2024 20:03:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B26A979 for ; Sat, 20 Jan 2024 20:03:57 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1705781022.6894b856ddbda3edd86e3477432ef3048152a7b7.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/linux-firmware-20240115-r1.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 6894b856ddbda3edd86e3477432ef3048152a7b7 X-VCS-Branch: master Date: Sat, 20 Jan 2024 20:03:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7bf37a8-25e1-4eb5-95b2-a8b3afa6ad26 X-Archives-Hash: 358172505bdd4088ccc213ca3700b3c5 commit: 6894b856ddbda3edd86e3477432ef3048152a7b7 Author: Mike Pagano gentoo org> AuthorDate: Sat Jan 20 20:03:42 2024 +0000 Commit: Mike Pagano gentoo org> CommitDate: Sat Jan 20 20:03:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6894b856 sys-kernel/linux-firmware: Fix tabs Signed-off-by: Mike Pagano gentoo.org> .../linux-firmware/linux-firmware-20240115-r1.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-20240115-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240115-r1.ebuild index 25d02e4a4f38..21e07a6bd6ee 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20240115-r1.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20240115-r1.ebuild @@ -285,14 +285,14 @@ src_install() { if use savedconfig; then if [[ -s "${S}/${PN}.conf" ]]; then - files_to_keep="${T}/files_to_keep.lst" - grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die - [[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?" - LINUX_FIRMWARE_SAVED_CONFIG_FILES=$(<${files_to_keep}) - LINUX_FIRMWARE_SAVED_CONFIG_FILES="${LINUX_FIRMWARE_SAVED_CONFIG_FILES//$'\n'/ }" - FW_OPTIONS+=( "--firmware-list" "${LINUX_FIRMWARE_SAVED_CONFIG_FILES[@]}" ) - fi - fi + files_to_keep="${T}/files_to_keep.lst" + grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die + [[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?" + LINUX_FIRMWARE_SAVED_CONFIG_FILES=$(<${files_to_keep}) + LINUX_FIRMWARE_SAVED_CONFIG_FILES="${LINUX_FIRMWARE_SAVED_CONFIG_FILES//$'\n'/ }" + FW_OPTIONS+=( "--firmware-list" "${LINUX_FIRMWARE_SAVED_CONFIG_FILES[@]}" ) + fi + fi ! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" ) FW_OPTIONS+=( "${ED}/lib/firmware" )