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 F09C215800F for ; Wed, 18 Jan 2023 00:46:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25739E082B; Wed, 18 Jan 2023 00:46:18 +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 81E82E082B for ; Wed, 18 Jan 2023 00:46:17 +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 7D6E633EDD8 for ; Wed, 18 Jan 2023 00:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 168BF7DE for ; Wed, 18 Jan 2023 00:46:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1674002761.0ff398c8011c20cc94fc5a5cd2dcb0be859de9fa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bpftool/bpftool-5.19.12.ebuild dev-util/bpftool/bpftool-6.0.12.ebuild X-VCS-Directories: dev-util/bpftool/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0ff398c8011c20cc94fc5a5cd2dcb0be859de9fa X-VCS-Branch: master Date: Wed, 18 Jan 2023 00:46:14 +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: 292bcd1e-058c-424a-b8b8-31c59650d0cb X-Archives-Hash: 34d719f44b2a05b4e98ecb2e982193ac commit: 0ff398c8011c20cc94fc5a5cd2dcb0be859de9fa Author: YiFei Zhu google com> AuthorDate: Tue Jan 17 23:21:34 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 18 00:46:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff398c8 dev-util/bpftool: Fix install in prefix Without this patch install would cause: * QA Notice: the following files are outside of the prefix: * /usr * /usr/share * /usr/share/bash-completion * /usr/share/bash-completion/completions * /usr/share/bash-completion/completions/bpftool * ERROR: dev-util/bpftool-6.0.12::gentoo failed: * Aborting due to QA concerns: there are files installed outside the prefix The Makefile defines bash_compdir ?= /usr/share/bash-completion/completions and the install command is $(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir) We can just do a simple override with $(get_bashcompdir) from bash-completion-r1.eclass. Signed-off-by: YiFei Zhu google.com> Closes: https://github.com/gentoo/gentoo/pull/29151 Signed-off-by: Sam James gentoo.org> dev-util/bpftool/bpftool-5.19.12.ebuild | 3 ++- dev-util/bpftool/bpftool-6.0.12.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild b/dev-util/bpftool/bpftool-5.19.12.ebuild index 71df5aaddcfa..fa8315db60c6 100644 --- a/dev-util/bpftool/bpftool-5.19.12.ebuild +++ b/dev-util/bpftool/bpftool-5.19.12.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -107,6 +107,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" } diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild b/dev-util/bpftool/bpftool-6.0.12.ebuild index 15e5be3ce116..4f68a43259e9 100644 --- a/dev-util/bpftool/bpftool-6.0.12.ebuild +++ b/dev-util/bpftool/bpftool-6.0.12.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -103,6 +103,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" }