From d2eb199ebdb0817bb67ba0950c515504a62436c0 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 18 Aug 2018 18:51:38 -0300 Subject: [PATCH] ports-wide: remove all occurrences of triggers="dkms" There is no need for triggers="dkms" since having dkms_modules="" set also adds the dkms trigger automatically. This occoured problably since one template did it and everyone else just copied it (understandable since dkms_modules is not documented) [ci skip] --- srcpkgs/acpi_call-dkms/template | 1 - srcpkgs/batman-adv/template | 1 - srcpkgs/batman-adv14/template | 1 - srcpkgs/bbswitch/template | 1 - srcpkgs/broadcom-wl-dkms/template | 1 - srcpkgs/catalyst/template | 1 - srcpkgs/exfat-dkms/template | 1 - srcpkgs/lttng-modules-dkms/template | 1 - srcpkgs/nvidia/template | 1 - srcpkgs/nvidia304/template | 11 +++++------ srcpkgs/nvidia340/template | 17 ++++++----------- srcpkgs/openrazer-meta/template | 1 - srcpkgs/rtl8812au-dkms/template | 1 - srcpkgs/spl/template | 1 - srcpkgs/sysdig/template | 1 - srcpkgs/tp_smapi-dkms/template | 1 - srcpkgs/vhba-module-dkms/template | 1 - srcpkgs/wireguard/template | 1 - srcpkgs/zfs/template | 1 - 19 files changed, 11 insertions(+), 34 deletions(-) diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template index aac8498db2d..77dcb7e8306 100644 --- a/srcpkgs/acpi_call-dkms/template +++ b/srcpkgs/acpi_call-dkms/template @@ -11,7 +11,6 @@ homepage="https://github.com/damadmai/acpi_call" distfiles="$homepage/archive/v$version.tar.gz" checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b -triggers="dkms" dkms_modules="acpi_call ${version}" depends="dkms" diff --git a/srcpkgs/batman-adv/template b/srcpkgs/batman-adv/template index 06e24bc80bc..db11a8f391d 100644 --- a/srcpkgs/batman-adv/template +++ b/srcpkgs/batman-adv/template @@ -9,7 +9,6 @@ homepage="http://www.open-mesh.org/" distfiles="http://downloads.open-mesh.org/batman/releases/batman-adv-${version}/batman-adv-${version}.tar.gz" checksum=ec1848023308c41710eeefb544580f5853d68b88a627a3f2dabaa3472b988c15 -triggers="dkms" dkms_modules="batman-adv ${version}" depends="dkms" diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template index 523b448897a..d58ae54cdbb 100644 --- a/srcpkgs/batman-adv14/template +++ b/srcpkgs/batman-adv14/template @@ -12,7 +12,6 @@ conflicts="batman-adv>=0" wrksrc="batman-adv-$version" provides="batman-adv-${version}_${revision}" -triggers="dkms" dkms_modules="batman-adv14 ${version}" depends="dkms" diff --git a/srcpkgs/bbswitch/template b/srcpkgs/bbswitch/template index b603e1ec605..92457f9b747 100644 --- a/srcpkgs/bbswitch/template +++ b/srcpkgs/bbswitch/template @@ -6,7 +6,6 @@ hostmakedepends="git" makedepends="dkms" depends="dkms" dkms_modules="${pkgname} ${version}" -triggers="dkms" short_desc="kernel module allowing to switch dedicated graphics card on Optimus laptops" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index d787c2cb714..7511ac4fb2a 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -12,7 +12,6 @@ repository="nonfree" create_wrksrc=yes short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" -triggers="dkms" dkms_modules="wl ${version}" depends="dkms" diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 8ccaba6a66a..c8220cc9a43 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -122,7 +122,6 @@ do_install() { catalyst-dkms_package() { short_desc="${_desc} - DKMS kernel module" - triggers="dkms" depends="dkms" dkms_modules="fglrx ${version}_${revision}" pkg_install() { diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template index 733d0d28c1a..4f64c677944 100644 --- a/srcpkgs/exfat-dkms/template +++ b/srcpkgs/exfat-dkms/template @@ -11,7 +11,6 @@ homepage="https://github.com/dorimanx/exfat-nofuse" distfiles="https://github.com/dorimanx/exfat-nofuse/archive/${_commit}.tar.gz" checksum=b88a98f0a7e1b987465f5ccfcafb384b293506c7fec9d3b91b803e0fe5b16e0a -triggers="dkms" dkms_modules="exfat ${version}" depends="dkms" diff --git a/srcpkgs/lttng-modules-dkms/template b/srcpkgs/lttng-modules-dkms/template index e4ec0acca31..e8756df7c91 100644 --- a/srcpkgs/lttng-modules-dkms/template +++ b/srcpkgs/lttng-modules-dkms/template @@ -10,7 +10,6 @@ homepage="https://lttng.org" distfiles="${homepage}/files/lttng-modules/lttng-modules-${version}.tar.bz2" checksum=f049428d3d131e103a7a7038d184731bf7bcdce00503fc19a2c9b5693ecbb3b5 -triggers="dkms" dkms_modules="lttng-modules ${version}" depends="dkms" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index c5400a717d2..9ef3876cf84 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -274,7 +274,6 @@ nvidia-libs_package() { } nvidia-dkms_package() { short_desc="${_desc} - DKMS kernel module" - triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" pkg_install() { diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index 2500f590108..0e952ba62cb 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -9,7 +9,7 @@ license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" nopie=yes -repository="nonfree" +repository=nonfree create_wrksrc=yes only_for_archs="i686 x86_64" short_desc="${_desc} - Libraries and Utilities" @@ -81,7 +81,7 @@ do_install() { # CUDA vbin nvidia-cuda-proxy-control vbin nvidia-cuda-proxy-server - vinstall nvidia-cuda-proxy-control.1.gz 644 usr/share/man/man1 + vman nvidia-cuda-proxy-control.1.gz vinstall libcuda.so.${version} 755 usr/lib ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so @@ -93,11 +93,11 @@ do_install() { # nvidia-xconfig vbin nvidia-xconfig - vinstall nvidia-xconfig.1.gz 644 usr/share/man/man1 + vman nvidia-xconfig.1.gz # nvidia-settings vbin nvidia-settings - vinstall nvidia-settings.1.gz 644 usr/share/man/man1 + vman nvidia-settings.1.gz vinstall nvidia-settings.desktop 644 usr/share/applications vinstall nvidia-settings.png 644 usr/share/pixmaps sed -e 's:__UTILS_PATH__:/usr/bin:' \ @@ -110,7 +110,7 @@ do_install() { # nvidia-smi vbin nvidia-smi - vinstall nvidia-smi.1.gz 644 usr/share/man/man1 + vman nvidia-smi.1.gz # License and documentation. vlicense LICENSE @@ -155,7 +155,6 @@ do_install() { nvidia304-dkms_package() { short_desc="${_desc} - DKMS kernel module" depends="dkms" - triggers="dkms" dkms_modules="nvidia ${version}" provides="nvidia-dkms-${version}_${revision}" replaces="nvidia-dkms>=0" diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index 1456ed4f38d..36407215494 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -1,4 +1,4 @@ -# Template file for 'nvidia' +# Template file for 'nvidia340' _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" @@ -11,7 +11,7 @@ homepage="http://www.nvidia.com" only_for_archs="i686 x86_64" nopie=yes -repository="nonfree" +repository=nonfree create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" depends="${pkgname}-dkms-${version}_${revision} pkg-config" @@ -95,8 +95,7 @@ do_install() { # CUDA vbin nvidia-cuda-mps-control vbin nvidia-cuda-mps-server - gzip -d nvidia-cuda-mps-control.1.gz - vman nvidia-cuda-mps-control.1 + vman nvidia-cuda-mps-control.1.gz vinstall libcuda.so.${version} 755 usr/lib ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so @@ -108,13 +107,11 @@ do_install() { # nvidia-xconfig vbin nvidia-xconfig - gzip -d nvidia-xconfig.1.gz - vman nvidia-xconfig.1 + vman nvidia-xconfig.1.gz # nvidia-settings vbin nvidia-settings - gzip -d nvidia-settings.1.gz - vman nvidia-settings.1 + vman nvidia-settings.1.gz vinstall nvidia-settings.desktop 644 usr/share/applications vinstall nvidia-settings.png 644 usr/share/pixmaps sed -e 's:__UTILS_PATH__:/usr/bin:' \ @@ -127,8 +124,7 @@ do_install() { # nvidia-smi vbin nvidia-smi - gzip -d nvidia-smi.1.gz - vman nvidia-smi.1 + vman nvidia-smi.1.gz # License and documentation. vlicense LICENSE @@ -179,7 +175,6 @@ do_install() { nvidia340-dkms_package() { short_desc="${_desc} - DKMS kernel module" - triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" provides="nvidia-dkms-${version}_${revision}" diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template index 0edbd7ddf0b..14f2cb1a4c1 100644 --- a/srcpkgs/openrazer-meta/template +++ b/srcpkgs/openrazer-meta/template @@ -34,7 +34,6 @@ openrazer-daemon_package() { openrazer-driver-dkms_package() { short_desc="Kernel driver for Razer devices (DKMS-variant)" depends="dkms" - triggers="dkms" dkms_modules="openrazer-driver 1.0.0" system_groups="plugdev" pkg_install() { diff --git a/srcpkgs/rtl8812au-dkms/template b/srcpkgs/rtl8812au-dkms/template index 722301075a7..e6dd8ba1919 100644 --- a/srcpkgs/rtl8812au-dkms/template +++ b/srcpkgs/rtl8812au-dkms/template @@ -8,7 +8,6 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.dlink.com" -triggers="dkms" dkms_modules="rtl8812au 4.3.14" hostmakedepends="git" depends="dkms" diff --git a/srcpkgs/spl/template b/srcpkgs/spl/template index 444be7b22cb..4599500ad86 100644 --- a/srcpkgs/spl/template +++ b/srcpkgs/spl/template @@ -13,7 +13,6 @@ homepage="http://zfsonlinux.org/" distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz" checksum=432b2ef0ca1f5cf7c1a64dec643ab5d92681a5097bf95b336aabaa252bad96e1 -triggers="dkms" dkms_modules="spl ${version/r/-}" depends="dkms>=2.2.0.3_9 ${pkgname}-devel>=${version}_${revision}" diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index fce0c238c74..98c229a9a32 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -9,7 +9,6 @@ hostmakedepends="wget" makedepends="jsoncpp-devel libcurl-devel libressl-devel LuaJIT-devel ncurses-devel zlib-devel elfutils-devel" depends="dkms" -triggers="dkms" dkms_modules="sysdig ${version}" short_desc="Open source system-level exploration and troubleshooting tool" maintainer="Leah Neukirchen " diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template index b357b923b46..48e589e370f 100644 --- a/srcpkgs/tp_smapi-dkms/template +++ b/srcpkgs/tp_smapi-dkms/template @@ -11,7 +11,6 @@ homepage="http://www.thinkwiki.org/wiki/Tp_smapi" distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz" checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110 -triggers="dkms" dkms_modules="tp_smapi ${version}" depends="dkms" diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template index 718e160025a..5837725294f 100644 --- a/srcpkgs/vhba-module-dkms/template +++ b/srcpkgs/vhba-module-dkms/template @@ -11,7 +11,6 @@ homepage="http://cdemu.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.bz2" checksum=7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec -triggers="dkms" dkms_modules="vhba-module ${version}" depends="dkms" diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index ffeee0478bf..feee9ad7b19 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -15,7 +15,6 @@ homepage="https://www.wireguard.com/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" checksum=3e351c42d22de427713f1da06d21189c5896a694a66cf19233a7c33295676f19 -triggers="dkms" dkms_modules="wireguard ${version}" post_extract() { diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 0d29ebfe074..f2289d8afef 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -18,7 +18,6 @@ homepage="http://zfsonlinux.org/" distfiles="https://github.com/zfsonlinux/zfs/archive/zfs-${version/r/-}.tar.gz" checksum=d17c57a5a06f476cd9658e8775a11ee8e1fc7d08cc99d74a5ef1509657c29a97 -triggers="dkms" dkms_modules="zfs ${version/r/-}" depends="dkms>=2.2.0.3_9 spl>=${version} perl"