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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 823AC138334 for ; Sat, 3 Aug 2019 13:26:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A31DE08C4; Sat, 3 Aug 2019 13:26:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70D9FE08C4 for ; Sat, 3 Aug 2019 13:26:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 156E834938F for ; Sat, 3 Aug 2019 13:26:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F851738 for ; Sat, 3 Aug 2019 13:26:51 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1564838805.7a8f2ec34bc4c2600bd7802d816c60b41a557582.whissi@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-20190726-r1.ebuild sys-kernel/linux-firmware/linux-firmware-20190726.ebuild sys-kernel/linux-firmware/linux-firmware-99999999.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 7a8f2ec34bc4c2600bd7802d816c60b41a557582 X-VCS-Branch: master Date: Sat, 3 Aug 2019 13:26:51 +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: b75dac3e-7d5c-438c-8a61-33c92b620bdf X-Archives-Hash: 5e2a67a8fff4ab2212dadf7f1aca4309 commit: 7a8f2ec34bc4c2600bd7802d816c60b41a557582 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Aug 3 13:24:16 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 3 13:26:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8f2ec3 sys-kernel/linux-firmware: Fix exclusion of amd-uc.img from savedconfig file Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Thomas Deutschmann gentoo.org> ...nux-firmware-20190726.ebuild => linux-firmware-20190726-r1.ebuild} | 4 ++-- sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-20190726.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190726-r1.ebuild similarity index 98% rename from sys-kernel/linux-firmware/linux-firmware-20190726.ebuild rename to sys-kernel/linux-firmware/linux-firmware-20190726-r1.ebuild index 9baa48016e3..528214a68b0 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20190726.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20190726-r1.ebuild @@ -274,13 +274,13 @@ src_prepare() { fi echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d \( ! -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf + find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf if use savedconfig; then restore_config ${PN}.conf ebegin "Removing all files not listed in config" - find ! -type d ! -name ${PN}.conf -printf "%P\n" \ + find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ || die "grep failed, empty config file?") \ | xargs -d '\n' --no-run-if-empty rm diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index c2afff9ee0c..bc18789f40b 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -274,13 +274,13 @@ src_prepare() { fi echo "# Remove files that shall not be installed from this list." > ${PN}.conf - find * ! -type d \( ! -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf + find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf if use savedconfig; then restore_config ${PN}.conf ebegin "Removing all files not listed in config" - find ! -type d ! -name ${PN}.conf -printf "%P\n" \ + find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \ | grep -Fvx -f <(grep -v '^#' ${PN}.conf \ || die "grep failed, empty config file?") \ | xargs -d '\n' --no-run-if-empty rm