Updates naming logic to support both dev + open (#220)

Previous logic would only allow one of the two in the name
pull/226/head
George Gibbs 3 months ago committed by GitHub
parent 6f327cde70
commit 3ccad7fed5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -266,7 +266,7 @@ fi
# packages # packages
if [ "$_open_source_modules" = "true" ]; then if [ "$_open_source_modules" = "true" ]; then
__branchname="nvidia$_series-open" __branchname="$_branchname-open"
else else
__branchname="$_branchname" __branchname="$_branchname"
fi fi
@ -1860,7 +1860,7 @@ if [ "$_dkms" = "false" ] || [ "$_dkms" = "full" ]; then
done done
if [ "$_blacklist_nouveau" = false ]; then if [ "$_blacklist_nouveau" = false ]; then
echo "skip blacklist nouveau\n" echo "skip blacklist nouveau\n"
else else
echo -e "blacklist nouveau\nblacklist lbm-nouveau" | echo -e "blacklist nouveau\nblacklist lbm-nouveau" |
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
@ -2007,7 +2007,7 @@ if [ "$_dkms" = "true" ] || [ "$_dkms" = "full" ]; then
cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
if [ "$_blacklist_nouveau" = false ]; then if [ "$_blacklist_nouveau" = false ]; then
echo "skip blacklist nouveau\n" echo "skip blacklist nouveau\n"
else else
echo -e "blacklist nouveau\nblacklist lbm-nouveau" | echo -e "blacklist nouveau\nblacklist lbm-nouveau" |
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"

Loading…
Cancel
Save