From 362dc71f442c53a0b294e4a47cd15db00dd5c0a2 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 15 Jan 2018 04:51:31 -0500 Subject: rebuild module packages against linux-libre-lts-4.9.75_gnu-1 --- libre/acpi_call-lts/PKGBUILD | 112 ++++++++++++--------------------------- libre/acpi_call-lts/dkms.conf | 9 ---- libre/acpi_call-lts/kmod.install | 14 +++++ 3 files changed, 49 insertions(+), 86 deletions(-) delete mode 100644 libre/acpi_call-lts/dkms.conf create mode 100644 libre/acpi_call-lts/kmod.install (limited to 'libre/acpi_call-lts') diff --git a/libre/acpi_call-lts/PKGBUILD b/libre/acpi_call-lts/PKGBUILD index 41656d495..eee7e7562 100644 --- a/libre/acpi_call-lts/PKGBUILD +++ b/libre/acpi_call-lts/PKGBUILD @@ -6,106 +6,64 @@ # Maintainer: Omar Vega Ramos # Contributor: Luke Shumaker -_kernelname=-lts +_basekernel=4.9 +_archrel=53 +_parabolarel=2 -if [[ ${_kernelname} == "" ]]; then - _basekernel=4.14 - _archrel=90 - _parabolarel=1 -elif [[ ${_kernelname} == -lts ]]; then - _basekernel=4.9 - _archrel=53 - _parabolarel=1 -fi - -pkgbase=acpi_call +pkgname=acpi_call-lts 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)" +_extramodules=extramodules-${_basekernel}-lts +pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'armv7h') -url="http://github.com/mkottman/${pkgbase}" +url="http://github.com/mkottman/acpi_call" license=('GPL') # Generic (you shouldn't have to modify any of these variables) _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") +depends=("linux-libre-lts>=${_basekernel}" "linux-libre-lts<${_toohigh}") +makedepends=("linux-libre-lts-headers>=${_basekernel}" "linux-libre-lts-headers<${_toohigh}" "linux-libre-lts>=${_basekernel}" "linux-libre-lts<${_toohigh}") makedepends+=('libelf') -if [[ ${_kernelname} != "" ]]; then - provides=("${pkgbase}") -fi +replaces=("${pkgname%-*}-libre-lts" "${pkgname%-*}-parabola-lts" "${pkgname}-parabola") +conflicts=("${pkgname%-*}-libre-lts" "${pkgname%-*}-parabola-lts" "${pkgname}-parabola") +provides=("acpi_call") -source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" - 'dkms.conf') -sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0' - '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a') +install='kmod.install' +source=("${pkgname%-*}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") +sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') prepare() { - cd "${pkgbase}-${pkgver}" - - if [[ ${_basekernel} > 3.16 ]]; then - # Fix build with Linux-libre 3.17-gnu - sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c - fi + cd "${pkgname%-*}-${pkgver}" - if [[ ${_basekernel} > 4.11 ]]; then - # Fix build with Linux-libre 4.12-gnu - sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c - fi + # Fix build with Linux-libre >= 3.17-gnu + sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c } build() { - cd "${pkgbase}-${pkgver}" - make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)" -} - -_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") - - cd $pkgbase-$pkgver + cd "${pkgname%-*}-${pkgver}" - # Actually install - install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko - find "$pkgdir" -name '*.ko' -exec gzip -n {} + + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call${_kernelname}.conf" - - mkdir -p "$pkgdir/usr/share/acpi_call${_kernelname}" - cp -t "$pkgdir/usr/share/acpi_call${_kernelname}" -dr --no-preserve=ownership examples support + make KVERSION="${_kernver}" } -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 +package() { + cd "${pkgname%-*}-$pkgver" - echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.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}" - mkdir -p "$pkgdir/usr/share/acpi_call" - cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support - } + # 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}.conf - pkgname=("${pkgbase}" "${pkgbase}-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 + install -dm 755 "${pkgdir}"/usr/share/${pkgname} + cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/ +} # vim:set ts=2 sw=2 et: diff --git a/libre/acpi_call-lts/dkms.conf b/libre/acpi_call-lts/dkms.conf deleted file mode 100644 index edc5c2482..000000000 --- a/libre/acpi_call-lts/dkms.conf +++ /dev/null @@ -1,9 +0,0 @@ -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-lts/kmod.install b/libre/acpi_call-lts/kmod.install new file mode 100644 index 000000000..40caa464f --- /dev/null +++ b/libre/acpi_call-lts/kmod.install @@ -0,0 +1,14 @@ +_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 +} -- cgit v1.2.3