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 F049D1382C5 for ; Thu, 25 Jun 2020 11:18:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13815E088C; Thu, 25 Jun 2020 11:18:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 01AEBE088A for ; Thu, 25 Jun 2020 11:18:35 +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 AC9FA34F176 for ; Thu, 25 Jun 2020 11:18:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C0852B3 for ; Thu, 25 Jun 2020 11:18:33 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1593083903.e218181a346d02f68e92267d94f299319104d3b6.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dahdi/dahdi-3.1.0-r1.ebuild X-VCS-Directories: net-misc/dahdi/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: e218181a346d02f68e92267d94f299319104d3b6 X-VCS-Branch: master Date: Thu, 25 Jun 2020 11:18:33 +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: 7a7a3345-2561-4dff-8eb6-1619260a6b3b X-Archives-Hash: 860b1af3fd0e2b9ba6d003714a9efe52 commit: e218181a346d02f68e92267d94f299319104d3b6 Author: Jaco Kroon uls co za> AuthorDate: Thu Jun 11 19:59:13 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 25 11:18:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e218181a net-misc/dahdi: fix install issue w.r.t. depmod. If the kernel sources are not yet compiled, then there is no System.map, and as a result the kernel build system won't run depmod, resulting in the modules.* files normally generated by this to not exist. This causes the rm in the ebuild to fail. Substitute with a find mechanism that only deletes if it exists. At the same time clean up some empty files on the image that carries firmware version information which we don't care about. Closes: https://bugs.gentoo.org/725022 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/16196 Signed-off-by: Joonas Niilola gentoo.org> net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild index bd1d6c11293..f69efcbe418 100644 --- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild +++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild @@ -97,5 +97,11 @@ src_install() { DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ LDFLAGS="$(raw-ldflags)" install - rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules" + # Remove the blank "version" files (these files are all empty, and root owned). + find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" + + # If the kernel sources have a System.map, and there a suitable depmod + # available (seemingly when we're not cross-compiling), then the kernel + # sources depmod kicks in. Remove the files caused by that. + find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" }