summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/acpi_call/PKGBUILD90
-rw-r--r--libre/acpi_call/dkms.conf9
-rw-r--r--libre/acpi_call/kmod.install14
-rw-r--r--libre/bbswitch/PKGBUILD29
-rw-r--r--libre/bbswitch/kmod.install14
-rw-r--r--libre/tp_smapi/PKGBUILD10
-rw-r--r--libre/tp_smapi/kmod.install14
-rw-r--r--libre/vhba-module/PKGBUILD9
-rw-r--r--libre/vhba-module/kmod.install15
9 files changed, 81 insertions, 123 deletions
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index b464d7f76..2a0c570fd 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -9,8 +9,8 @@
_kernelname=
if [[ ${_kernelname} == "" ]]; then
- _basekernel=4.13
- _archrel=75
+ _basekernel=4.14
+ _archrel=90
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.9
@@ -18,36 +18,31 @@ elif [[ ${_kernelname} == -lts ]]; then
_parabolarel=1
fi
-_pkgname=acpi_call
-pkgname=${_pkgname}${_kernelname}
+pkgbase=acpi_call
pkgver=1.1.0
pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
_extramodules=extramodules-${_basekernel}${_kernelname}
pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)"
arch=('i686' 'x86_64' 'armv7h')
-url="http://github.com/mkottman/${_pkgname}"
+url="http://github.com/mkottman/${pkgbase}"
license=('GPL')
# Generic (you shouldn't have to modify any of these variables)
_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
+makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
makedepends+=('libelf')
-replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-[[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola")
-conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-[[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
if [[ ${_kernelname} != "" ]]; then
- provides=("${_pkgname}")
+ provides=("${pkgbase}")
fi
-install='kmod.install'
-source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0')
+source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+ 'dkms.conf')
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
+ '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
if [[ ${_basekernel} > 3.16 ]]; then
# Fix build with Linux-libre 3.17-gnu
@@ -61,29 +56,56 @@ prepare() {
}
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
-
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- make KVERSION="${_kernver}"
+ cd "${pkgbase}-${pkgver}"
+ make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)"
}
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+_package() {
+ depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
+ replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+ [[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola")
+ conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
+ [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
- # Set the correct extramodules directory for install
- cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
- true && install=${install}.pkg
- sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
+ cd $pkgbase-$pkgver
# Actually install
- install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
- install -m 644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}
- gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko
- echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf
+ install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko
+ find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+
+ echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call${_kernelname}.conf"
- install -dm 755 "${pkgdir}"/usr/share/${_pkgname}${_kernelname}
- cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname}${_kernelname}/
+ mkdir -p "$pkgdir/usr/share/acpi_call${_kernelname}"
+ cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
}
-# vim: ts=2 sw=2 et:
+if [[ ${_kernelname} == "" ]]; then
+ _package-dkms() {
+ depends=(dkms)
+ provides=("acpi_call=$pkgver-$pkgrel")
+ conflicts=(acpi_call)
+
+ cd $pkgbase-$pkgver
+
+ # Actually install
+ install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf
+
+ echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
+
+ mkdir -p "$pkgdir/usr/share/acpi_call"
+ cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
+ }
+
+ pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
+else
+ pkgname=("${pkgbase}${_kernelname}")
+fi
+
+for _p in ${pkgname[@]}; do
+ eval "package_${_p}() {
+ $(declare -f "_package${_p#${pkgbase}${_kernelname}}")
+ _package${_p#${pkgbase}${_kernelname}}
+ }"
+done
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/acpi_call/dkms.conf b/libre/acpi_call/dkms.conf
new file mode 100644
index 000000000..edc5c2482
--- /dev/null
+++ b/libre/acpi_call/dkms.conf
@@ -0,0 +1,9 @@
+PACKAGE_NAME="acpi_call"
+PACKAGE_VERSION="#MODULE_VERSION#"
+AUTOINSTALL="yes"
+
+MAKE[0]="make KVERSION=$kernelver"
+CLEAN="make clean"
+
+BUILT_MODULE_NAME[0]="acpi_call"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
diff --git a/libre/acpi_call/kmod.install b/libre/acpi_call/kmod.install
deleted file mode 100644
index 40caa464f..000000000
--- a/libre/acpi_call/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-_EXTRAMODULES=
-
-post_install() {
- echo ">>> Updating module dependencies. Please wait ..."
- depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 1555321f6..809d97224 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -9,8 +9,8 @@
_kernelname=
if [[ ${_kernelname} == "" ]]; then
- _basekernel=4.13
- _archrel=81
+ _basekernel=4.14
+ _archrel=96
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.9
@@ -40,10 +40,8 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswi
sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477')
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
+ cd "${pkgbase}-${pkgver}"
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
make KDIR=/lib/modules/${_kernver}/build
}
@@ -51,18 +49,10 @@ _package() {
depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
- install='kmod.install'
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- # Set the correct extramodules directory for install
- cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
- true && install=${install}.pkg
- sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
-
- # Actually install
- install -Dm644 ${pkgbase}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgbase}.ko
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${pkgbase}.ko"
+ cd "${pkgbase}-${pkgver}"
+ install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 bbswitch.ko
+ find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
}
if [[ ${_kernelname} == "" ]]; then
@@ -71,11 +61,8 @@ if [[ ${_kernelname} == "" ]]; then
conflicts=('bbswitch')
provides=('bbswitch')
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- install -dm755 "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
-
- install -Dm644 Makefile bbswitch.c dkms/dkms.conf "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+ cd "${pkgbase}-${pkgver}"
+ install -Dt "${pkgdir}/usr/src/${pkgbase}-${pkgver}" -m644 Makefile bbswitch.c dkms/dkms.conf
}
pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
diff --git a/libre/bbswitch/kmod.install b/libre/bbswitch/kmod.install
deleted file mode 100644
index 40caa464f..000000000
--- a/libre/bbswitch/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-_EXTRAMODULES=
-
-post_install() {
- echo ">>> Updating module dependencies. Please wait ..."
- depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 16c0eb8b2..53c16eb28 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -14,8 +14,8 @@
_kernelname=
if [[ ${_kernelname} == "" ]]; then
- _basekernel=4.13
- _archrel=31
+ _basekernel=4.14
+ _archrel=45
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.9
@@ -46,7 +46,6 @@ if [[ ${_kernelname} != "" ]]; then
provides=("${_pkgname}")
fi
-install='kmod.install'
source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${_pkgname}/archive/${__pkgname}/${pkgver}.tar.gz")
sha256sums=('cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381')
@@ -71,9 +70,4 @@ package() {
# load module on startup
install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf"
-
- # Set the correct extramodules directory for install
- cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
- true && install=${install}.pkg
- sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
}
diff --git a/libre/tp_smapi/kmod.install b/libre/tp_smapi/kmod.install
deleted file mode 100644
index 40caa464f..000000000
--- a/libre/tp_smapi/kmod.install
+++ /dev/null
@@ -1,14 +0,0 @@
-_EXTRAMODULES=
-
-post_install() {
- echo ">>> Updating module dependencies. Please wait ..."
- depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index 82c8038d6..4efe21005 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -9,8 +9,8 @@
_kernelname=
if [[ ${_kernelname} == "" ]]; then
- _basekernel=4.13
- _archrel=16
+ _basekernel=4.14
+ _archrel=31
_parabolarel=1
elif [[ ${_kernelname} == -lts ]]; then
_basekernel=4.9
@@ -52,13 +52,15 @@ _package() {
depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
- install='kmod.install'
cd "${pkgbase}-${pkgver}"
# Actually install
install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 vhba.ko
install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
+ echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
+
+ find "$pkgdir" -name '*.ko' -exec gzip -n {} +
}
if [[ ${_kernelname} == "" ]]; then
@@ -70,6 +72,7 @@ if [[ ${_kernelname} == "" ]]; then
cd $pkgbase-$pkgver
install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile vhba.c ../dkms.conf
install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
+ echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
}
pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
diff --git a/libre/vhba-module/kmod.install b/libre/vhba-module/kmod.install
deleted file mode 100644
index 2c7652580..000000000
--- a/libre/vhba-module/kmod.install
+++ /dev/null
@@ -1,15 +0,0 @@
-
-post_install() {
- post_upgrade $1 0
- getent group cdemu &>/dev/null || groupadd -r cdemu
-}
-
-post_upgrade() {
- _EXTRAMODULES=extramodules-4.11
- depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_remove() {
- post_upgrade $1 0
- groupdel cdemu
-}
generated by cgit v1.2.2 (git 2.25.0) at 2024-05-13 03:05:16 +0000