commit: 3b0251c97c29f779556cd29b49b6ec6af56304fe Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Feb 22 01:29:52 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Feb 22 02:34:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0251c9
x11-drivers/nvidia-drivers: migrate /opt/bin to /usr/bin Was meant to separate prebuilt and source-built binaries, but tend to only cause confusion and hasn't meant much when prebuilt libraries are in /usr/lib anyway. May possibly affect some users that were using /opt/bin rather than PATH after being like that for so long, but believe there is likely too few to be worth a warning. Not worth a revbump, will take effect next rebuild which happen every kernel upgrades. wrt QA_PREBUILT, ideally would construct it from the .manifest inside src_install, but last time I tried portage didn't like it if it's set so late. And then, do not think want to check what every branches install and maintain lists.. so, not ideal, but giving /usr/bin the same treatment that /usr/lib had with a wildcard for now. Closes: https://bugs.gentoo.org/950053 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild | 5 +++-- x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild | 5 +++-- x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild | 7 ++++--- x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild | 7 ++++--- x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild | 7 ++++--- x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild | 7 ++++--- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild index 018c9b4d0b96..36a93259d68a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild @@ -76,7 +76,8 @@ BDEPEND=" virtual/pkgconfig " -QA_PREBUILT="opt/bin/* usr/lib*" +# there is some non-prebuilt exceptions but rather not maintain a list +QA_PREBUILT="usr/bin/* usr/lib*" PATCHES=( # note: no plans to add patches for newer kernels here, when the last @@ -359,7 +360,7 @@ documentation that is installed alongside this README." if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} elif [[ ${m[2]} == *_BINARY ]]; then - into=/opt/bin + into=/usr/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild index 7051b73f87eb..d6e3eee2be08 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild @@ -75,7 +75,8 @@ BDEPEND=" virtual/pkgconfig " -QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" +# there is some non-prebuilt exceptions but rather not maintain a list +QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch @@ -321,7 +322,7 @@ documentation that is installed alongside this README." if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} elif [[ ${m[2]} == *_BINARY ]]; then - into=/opt/bin + into=/usr/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild index 4eb0119b3834..b955ada894cb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild @@ -86,7 +86,8 @@ BDEPEND=" virtual/pkgconfig " -QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" +# there is some non-prebuilt exceptions but rather not maintain a list +QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch @@ -155,7 +156,7 @@ src_prepare() { nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \ > "${T}"/nvidia-persistenced.service || die use !powerd || # file is missing on arm64 (masked) - sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die + sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || die # use alternative vulkan icd option if USE=-X (bug #909181) use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die @@ -392,7 +393,7 @@ documentation that is installed alongside this README." elif [[ ${m[2]} == EXPLICIT_PATH ]]; then into=${m[3]} elif [[ ${m[2]} == *_BINARY ]]; then - into=/opt/bin + into=/usr/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild index 58149501a27f..3e18a21fd803 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild @@ -85,7 +85,8 @@ BDEPEND=" virtual/pkgconfig " -QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" +# there is some non-prebuilt exceptions but rather not maintain a list +QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch @@ -156,7 +157,7 @@ src_prepare() { sed 's/__USER__/nvpd/' \ nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \ > "${T}"/nvidia-persistenced.service || die - sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die + sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || die # use alternative vulkan icd option if USE=-X (bug #909181) use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die @@ -384,7 +385,7 @@ documentation that is installed alongside this README." elif [[ ${m[2]} == EXPLICIT_PATH ]]; then into=${m[3]} elif [[ ${m[2]} == *_BINARY ]]; then - into=/opt/bin + into=/usr/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild index 95f15a1ddcbf..77678a8ce1bf 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild @@ -86,7 +86,8 @@ BDEPEND=" virtual/pkgconfig " -QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" +# there is some non-prebuilt exceptions but rather not maintain a list +QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch @@ -158,7 +159,7 @@ src_prepare() { sed 's/__USER__/nvpd/' \ nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \ > "${T}"/nvidia-persistenced.service || die - sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die + sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || die # use alternative vulkan icd option if USE=-X (bug #909181) use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die @@ -382,7 +383,7 @@ documentation that is installed alongside this README." elif [[ ${m[2]} == EXPLICIT_PATH ]]; then into=${m[3]} elif [[ ${m[2]} == *_BINARY ]]; then - into=/opt/bin + into=/usr/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild index 8ab5188a52b0..36dd03de468d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild @@ -89,7 +89,8 @@ BDEPEND=" virtual/pkgconfig " -QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*" +# there is some non-prebuilt exceptions but rather not maintain a list +QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch @@ -164,7 +165,7 @@ src_prepare() { sed 's/__USER__/nvpd/' \ nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \ > "${T}"/nvidia-persistenced.service || die - sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die + sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || die # use alternative vulkan icd option if USE=-X (bug #909181) use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die @@ -403,7 +404,7 @@ documentation that is installed alongside this README." elif [[ ${m[2]} == EXPLICIT_PATH ]]; then into=${m[3]} elif [[ ${m[2]} == *_BINARY ]]; then - into=/opt/bin + into=/usr/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32}
