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 13BDF138334 for ; Sun, 19 May 2019 06:37:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D886FE0B92; Sun, 19 May 2019 06:37:30 +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 C0EB4E0B92 for ; Sun, 19 May 2019 06:37:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F28993449D7 for ; Sun, 19 May 2019 06:37:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C21257F for ; Sun, 19 May 2019 06:37:26 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1558247677.c75d623018a94633efb092e4cd3e2cc78e83a1f2.ulm@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-20190514.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c75d623018a94633efb092e4cd3e2cc78e83a1f2 X-VCS-Branch: master Date: Sun, 19 May 2019 06:37:26 +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: 2ebe1ef3-a124-4bc1-9b70-dd55e9266c19 X-Archives-Hash: 75f7fe9459fecdd7905bf2a9211559c2 commit: c75d623018a94633efb092e4cd3e2cc78e83a1f2 Author: Ulrich Müller gentoo org> AuthorDate: Sun May 19 06:34:37 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun May 19 06:34:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75d6230 sys-kernel/linux-firmware: Flip order of if blocks in src_prepare. Otherwise, the second rm will fail because of previously removed files. Remove the ewarn message which isn't useful after separation of flags. Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Ulrich Müller gentoo.org> sys-kernel/linux-firmware/linux-firmware-20190514.ebuild | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild index 45c50b3372d..d89f8c43e2e 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild @@ -228,6 +228,11 @@ src_prepare() { # remove sources and documentation (wildcards are expanded) rm -r ${source_files[@]} || die + if use !unknown-license; then + # remove files in the unknown_license blacklist + rm "${unknown_license[@]}" || die + fi + if use !redistributable; then # remove files _not_ in the free_software whitelist local file remove=() @@ -235,15 +240,6 @@ src_prepare() { has "${file#./}" "${free_software[@]}" || remove+=("${file}") done < <(find * ! -type d -print0 || die) printf "%s\0" "${remove[@]}" | xargs -0 rm || die - - if use unknown-license; then - ewarn 'The "unknown-license" flag is set, while "-redistributable"' - ewarn 'asks for free software only. Ignoring "unknown-license".' - fi - fi - if use !unknown-license; then - # remove files in the unknown_license blacklist - rm "${unknown_license[@]}" || die fi echo "# Remove files that shall not be installed from this list." > ${PN}.conf