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 BD87D138350 for ; Fri, 17 Apr 2020 18:43:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEAB4E086A; Fri, 17 Apr 2020 18:43:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A2EBDE086A for ; Fri, 17 Apr 2020 18:43:34 +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 AFEEA34F189 for ; Fri, 17 Apr 2020 18:43:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2882F18F for ; Fri, 17 Apr 2020 18:43:31 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1587149009.2497e491a50e04a66aaad39cc483fb33b7a40af0.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/linux-misc-apps/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/linux-misc-apps/linux-misc-apps-5.6.ebuild X-VCS-Directories: sys-apps/linux-misc-apps/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 2497e491a50e04a66aaad39cc483fb33b7a40af0 X-VCS-Branch: master Date: Fri, 17 Apr 2020 18:43:31 +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: 4d08aaba-65e5-4e5a-9de4-c7285d733b63 X-Archives-Hash: 86be0e3059a5c44e5af42d5ddce22615 commit: 2497e491a50e04a66aaad39cc483fb33b7a40af0 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Apr 17 18:43:13 2020 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Apr 17 18:43:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2497e491 sys-apps/linux-misc-apps: QA cleanups Signed-off-by: Robin H. Johnson gentoo.org> sys-apps/linux-misc-apps/linux-misc-apps-5.6.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.6.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.6.ebuild index 45c7b3fd3bb..86827070d51 100644 --- a/sys-apps/linux-misc-apps/linux-misc-apps-5.6.ebuild +++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.6.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic +inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic DESCRIPTION="Misc tools bundled with kernel sources" HOMEPAGE="https://kernel.org/" @@ -191,14 +191,19 @@ src_install() { newdoc README README.usbip newdoc AUTHORS AUTHORS.usbip popd >/dev/null - dodoc Documentation/usb/usbip_protocol.txt + dodoc Documentation/usb/usbip_protocol.rst + find "${D}" -name 'libusbip*.la' -delete || die fi - mv -f "${D}"/usr/sbin/{,iio_}generic_buffer + # At one point upstream it was moved, but be generic to detect if it's + # happened already + if [[ -f "${D}"/usr/sbin/generic_buffer ]] && \ + [[ ! -f "${D}"/usr/sbin/iio_generic_buffer ]]; then + mv -f "${D}"/usr/sbin/{,iio_}generic_buffer || die + fi newconfd "${FILESDIR}"/freefall.confd freefall newinitd "${FILESDIR}"/freefall.initd freefall - prune_libtool_files } pkg_postinst() { @@ -206,7 +211,7 @@ pkg_postinst() { elog "The cpupower utility is maintained separately at sys-power/cpupower" elog "The lguest utility no longer builds, and has been dropped." elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed" - if find /etc/runlevels/ -name hpfall ; then + if find "${ROOT}"/etc/runlevels/ -name hpfall ; then ewarn "You must change hpfall to freefall in your runlevels!" fi if use usbip; then