libre/linux-libre-tools: updated to 4.16_gnu

1 files changed, 31 insertions, 27 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index be6ab7214..785db92ec 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -24,10 +24,11 @@ case "$CARCH" in
   armv7h)      pkgname+=('gpio-utils' 'iio-utils') ;;
 esac
 
-pkgver=4.15_gnu
+pkgver=4.16_gnu
 pkgrel=1
 license=('GPL2')
-arch=('x86_64' 'i686' 'armv7h')
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 url='https://linux-libre.fsfla.org/'
 options=('!strip')
 makedepends=('git')
@@ -51,7 +52,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/l
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service')
-sha256sums=('e6556514286f9cd6b46f5d5769b2cc3c61ac7d6fa9c9c400e3c2fb5949490186'
+sha256sums=('5bd4ee95a0a9d7d2f962504f4b684b441b07f5a136e8bb8ad959f2d29ab9b913'
             'SKIP'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc'
@@ -105,12 +106,12 @@ build() {
   make VERSION=$pkgver-$pkgrel
   popd
 
-  if [[ "$CARCH" == x86_64 ]] || [[ "$CARCH" == i686 ]]; then
-    msg2 'x86_energy_perf_policy'
-    pushd linux-${pkgver%_*}/tools/power/x86/x86_energy_perf_policy
-    make
-    popd
-  fi
+if [[ "$CARCH" == x86_64 ]] || [[ "$CARCH" == i686 ]]; then
+  msg2 'x86_energy_perf_policy'
+  pushd linux-${pkgver%_*}/tools/power/x86/x86_energy_perf_policy
+  make
+  popd
+fi
 
   msg2 'usbip'
   pushd linux-${pkgver%_*}/tools/usb/usbip
@@ -129,23 +130,23 @@ build() {
   make
   popd
 
-  if [[ "$CARCH" == x86_64 ]] || [[ "$CARCH" == i686 ]]; then
-    msg2 'turbostat'
-    pushd linux-${pkgver%_*}/tools/power/x86/turbostat
-    make
-  fi
-
-  if [[ "$CARCH" == armv7h ]]; then
-    msg2 'gpio'
-    pushd linux-${pkgver%_*}/tools/gpio
-    make -j1
-    popd
-
-    msg2 'iio'
-    pushd linux-${pkgver%_*}/tools/iio
-    make -j1
-    popd
-  fi
+if [[ "$CARCH" == x86_64 ]] || [[ "$CARCH" == i686 ]]; then
+  msg2 'turbostat'
+  pushd linux-${pkgver%_*}/tools/power/x86/turbostat
+  make
+fi
+
+if [[ "$CARCH" == armv7h ]]; then
+  msg2 'gpio'
+  pushd linux-${pkgver%_*}/tools/gpio
+  make -j1
+  popd
+
+  msg2 'iio'
+  pushd linux-${pkgver%_*}/tools/iio
+  make -j1
+  popd
+fi
 }
 
 package_linux-libre-tools-meta() {
@@ -159,11 +160,14 @@ package_linux-libre-tools-meta() {
     'tmon'
     'usbip'
   )
+  conflicts=(
+    'acpidump'
+  )
   depends_x86_64=('turbostat' 'x86_energy_perf_policy')
   depends_i686=('turbostat' 'x86_energy_perf_policy')
   depends_armv7h=('gpio-utils' 'iio-utils')
   replaces=(linux-tools-meta)
-  conflicts=(linux-tools-meta acpidump)
+  conflicts+=(linux-tools-meta)
   provides=(linux-tools-meta)
 }