[arch-commits] Commit in tp_smapi-lts/repos (8 files)

Andreas Radke andyrtr at archlinux.org
Mon Sep 4 10:37:29 UTC 2017


    Date: Monday, September 4, 2017 @ 10:37:28
  Author: andyrtr
Revision: 255641

archrelease: copy trunk to community-i686, community-x86_64

Added:
  tp_smapi-lts/repos/community-i686/PKGBUILD
    (from rev 255640, tp_smapi-lts/trunk/PKGBUILD)
  tp_smapi-lts/repos/community-i686/tp_smapi-lts.install
    (from rev 255640, tp_smapi-lts/trunk/tp_smapi-lts.install)
  tp_smapi-lts/repos/community-x86_64/PKGBUILD
    (from rev 255640, tp_smapi-lts/trunk/PKGBUILD)
  tp_smapi-lts/repos/community-x86_64/tp_smapi-lts.install
    (from rev 255640, tp_smapi-lts/trunk/tp_smapi-lts.install)
Deleted:
  tp_smapi-lts/repos/community-i686/PKGBUILD
  tp_smapi-lts/repos/community-i686/tp_smapi-lts.install
  tp_smapi-lts/repos/community-x86_64/PKGBUILD
  tp_smapi-lts/repos/community-x86_64/tp_smapi-lts.install

---------------------------------------+
 /PKGBUILD                             |   96 ++++++++++++++++++++++++++++++++
 /tp_smapi-lts.install                 |   26 ++++++++
 community-i686/PKGBUILD               |   50 ----------------
 community-i686/tp_smapi-lts.install   |   13 ----
 community-x86_64/PKGBUILD             |   50 ----------------
 community-x86_64/tp_smapi-lts.install |   13 ----
 6 files changed, 122 insertions(+), 126 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-09-04 10:37:05 UTC (rev 255640)
+++ community-i686/PKGBUILD	2017-09-04 10:37:28 UTC (rev 255641)
@@ -1,50 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-
-pkgname=tp_smapi-lts
-_pkgname=tp_smapi
-__pkgname=tp-smapi
-pkgver=0.42
-_extramodules=/usr/lib/modules/extramodules-4.9-lts
-pkgrel=17
-pkgdesc="Modules for ThinkPad's SMAPI functionality"
-arch=('i686' 'x86_64')
-url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-depends=('linux-lts>=4.9.45' 'linux-lts<4.10')
-makedepends=('linux-lts-headers>=4.9.45' 'linux-lts-headers<4.10')
-install="${pkgname}.install"
-source=("https://github.com/evgeni/$_pkgname/archive/$__pkgname/$pkgver.tar.gz")
-md5sums=('6a51d3aa459ad7a6ebfbb8c29527b3ee')
-
-build() {
-  cd "$srcdir/$_pkgname-$__pkgname-$pkgver"
-
-  _kernver=$(< "${_extramodules}/version")
-  make HDAPS=1 KVER="$_kernver" KBASE="/usr/lib/modules/$_kernver"
-}
-
-package() {
-  _kernver=$(< "${_extramodules}/version")
-
-  make -C "${_extramodules%/*}/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
-    M="$srcdir/$_pkgname-$__pkgname-$pkgver" modules_install
-
-  cd "${pkgdir}/${_extramodules%/*}"
-  mv "${_kernver}/extra" "${_extramodules##*/}"
-  rmdir "${_kernver}"
-
-  # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
-
-  # load module on startup
-  echo tp_smapi > "${srcdir}/${pkgname}.conf"
-  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
-}

Copied: tp_smapi-lts/repos/community-i686/PKGBUILD (from rev 255640, tp_smapi-lts/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-09-04 10:37:28 UTC (rev 255641)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: xduugu
+# Contributor: nh2
+# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor: Nick B <Shirakawasuna ð gmail đ com>
+# Contributor: Christof Musik <christof ð senfdax đ de>
+# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
+
+pkgname=tp_smapi-lts
+_pkgname=tp-smapi
+pkgver=0.42
+_extradir=/usr/lib/modules/extramodules-4.9-lts
+pkgrel=18
+pkgdesc="Modules for ThinkPad's SMAPI functionality"
+arch=('i686' 'x86_64')
+url='https://github.com/evgeni/tp_smapi'
+license=('GPL')
+depends=('linux-lts>=4.9.45' 'linux-lts<4.10')
+makedepends=('linux-lts-headers>=4.9.45' 'linux-lts-headers<4.10')
+install="$pkgname.install"
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/evgeni/${pkgname/-lts/}/archive/$_pkgname/$pkgver.tar.gz")
+md5sums=('6a51d3aa459ad7a6ebfbb8c29527b3ee')
+
+build() {
+  cd ${pkgname/-lts/}-$_pkgname-$pkgver
+
+  # https://bugs.archlinux.org/task/54975 (kernel has no _GLOBAL_OFFSET_TABLE_):
+  # Clear EXTRA_CFLAGS since it defaults to injecting CFLAGS and -fno-plt breaks the modules
+
+  make HDAPS=1 KVER="$(<$_extradir/version)" EXTRA_CFLAGS=
+}
+
+package() {
+  cd ${pkgname/-lts/}-$_pkgname-$pkgver
+
+  # install kernel modules
+  find . -name "*.ko" -exec install -Dt "$pkgdir$_extradir" {} +
+
+  # compress kernel modules
+  find "$pkgdir" -name "*.ko" -exec gzip -n -9 {} +
+
+  # load module on startup
+  echo tp_smapi | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+
+  # update kernel version in install file
+  sed -ri "s|^(extramodules=).*\$|\1$_extradir|" "$startdir/$pkgname.install"
+}

Deleted: community-i686/tp_smapi-lts.install
===================================================================
--- community-i686/tp_smapi-lts.install	2017-09-04 10:37:05 UTC (rev 255640)
+++ community-i686/tp_smapi-lts.install	2017-09-04 10:37:28 UTC (rev 255641)
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-4.9-lts
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: tp_smapi-lts/repos/community-i686/tp_smapi-lts.install (from rev 255640, tp_smapi-lts/trunk/tp_smapi-lts.install)
===================================================================
--- community-i686/tp_smapi-lts.install	                        (rev 0)
+++ community-i686/tp_smapi-lts.install	2017-09-04 10:37:28 UTC (rev 255641)
@@ -0,0 +1,13 @@
+extramodules=/usr/lib/modules/extramodules-4.9-lts
+
+post_install() {
+  depmod -v $(< "$extramodules/version") &>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-09-04 10:37:05 UTC (rev 255640)
+++ community-x86_64/PKGBUILD	2017-09-04 10:37:28 UTC (rev 255641)
@@ -1,50 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-
-pkgname=tp_smapi-lts
-_pkgname=tp_smapi
-__pkgname=tp-smapi
-pkgver=0.42
-_extramodules=/usr/lib/modules/extramodules-4.9-lts
-pkgrel=17
-pkgdesc="Modules for ThinkPad's SMAPI functionality"
-arch=('i686' 'x86_64')
-url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-depends=('linux-lts>=4.9.45' 'linux-lts<4.10')
-makedepends=('linux-lts-headers>=4.9.45' 'linux-lts-headers<4.10')
-install="${pkgname}.install"
-source=("https://github.com/evgeni/$_pkgname/archive/$__pkgname/$pkgver.tar.gz")
-md5sums=('6a51d3aa459ad7a6ebfbb8c29527b3ee')
-
-build() {
-  cd "$srcdir/$_pkgname-$__pkgname-$pkgver"
-
-  _kernver=$(< "${_extramodules}/version")
-  make HDAPS=1 KVER="$_kernver" KBASE="/usr/lib/modules/$_kernver"
-}
-
-package() {
-  _kernver=$(< "${_extramodules}/version")
-
-  make -C "${_extramodules%/*}/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
-    M="$srcdir/$_pkgname-$__pkgname-$pkgver" modules_install
-
-  cd "${pkgdir}/${_extramodules%/*}"
-  mv "${_kernver}/extra" "${_extramodules##*/}"
-  rmdir "${_kernver}"
-
-  # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
-
-  # load module on startup
-  echo tp_smapi > "${srcdir}/${pkgname}.conf"
-  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
-}

Copied: tp_smapi-lts/repos/community-x86_64/PKGBUILD (from rev 255640, tp_smapi-lts/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-09-04 10:37:28 UTC (rev 255641)
@@ -0,0 +1,48 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: xduugu
+# Contributor: nh2
+# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor: Nick B <Shirakawasuna ð gmail đ com>
+# Contributor: Christof Musik <christof ð senfdax đ de>
+# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
+
+pkgname=tp_smapi-lts
+_pkgname=tp-smapi
+pkgver=0.42
+_extradir=/usr/lib/modules/extramodules-4.9-lts
+pkgrel=18
+pkgdesc="Modules for ThinkPad's SMAPI functionality"
+arch=('i686' 'x86_64')
+url='https://github.com/evgeni/tp_smapi'
+license=('GPL')
+depends=('linux-lts>=4.9.45' 'linux-lts<4.10')
+makedepends=('linux-lts-headers>=4.9.45' 'linux-lts-headers<4.10')
+install="$pkgname.install"
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/evgeni/${pkgname/-lts/}/archive/$_pkgname/$pkgver.tar.gz")
+md5sums=('6a51d3aa459ad7a6ebfbb8c29527b3ee')
+
+build() {
+  cd ${pkgname/-lts/}-$_pkgname-$pkgver
+
+  # https://bugs.archlinux.org/task/54975 (kernel has no _GLOBAL_OFFSET_TABLE_):
+  # Clear EXTRA_CFLAGS since it defaults to injecting CFLAGS and -fno-plt breaks the modules
+
+  make HDAPS=1 KVER="$(<$_extradir/version)" EXTRA_CFLAGS=
+}
+
+package() {
+  cd ${pkgname/-lts/}-$_pkgname-$pkgver
+
+  # install kernel modules
+  find . -name "*.ko" -exec install -Dt "$pkgdir$_extradir" {} +
+
+  # compress kernel modules
+  find "$pkgdir" -name "*.ko" -exec gzip -n -9 {} +
+
+  # load module on startup
+  echo tp_smapi | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+
+  # update kernel version in install file
+  sed -ri "s|^(extramodules=).*\$|\1$_extradir|" "$startdir/$pkgname.install"
+}

Deleted: community-x86_64/tp_smapi-lts.install
===================================================================
--- community-x86_64/tp_smapi-lts.install	2017-09-04 10:37:05 UTC (rev 255640)
+++ community-x86_64/tp_smapi-lts.install	2017-09-04 10:37:28 UTC (rev 255641)
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-4.9-lts
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: tp_smapi-lts/repos/community-x86_64/tp_smapi-lts.install (from rev 255640, tp_smapi-lts/trunk/tp_smapi-lts.install)
===================================================================
--- community-x86_64/tp_smapi-lts.install	                        (rev 0)
+++ community-x86_64/tp_smapi-lts.install	2017-09-04 10:37:28 UTC (rev 255641)
@@ -0,0 +1,13 @@
+extramodules=/usr/lib/modules/extramodules-4.9-lts
+
+post_install() {
+  depmod -v $(< "$extramodules/version") &>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}



More information about the arch-commits mailing list