[arch-commits] Commit in linux-tools/trunk (3 files)

[Sébastien Luttringer]

    Date: Sunday, April 17, 2016 @ 12:28:21
  Author: seblu
Revision: 171247

upgpkg: linux-tools 4.5-2

- implement FS#44270
- fix FS#48788

Modified:
  linux-tools/trunk/PKGBUILD
  linux-tools/trunk/cpupower.service
  linux-tools/trunk/cpupower.systemd

------------------+
 PKGBUILD         |   22 ++++++++++++----------
 cpupower.service |    1 +
 cpupower.systemd |    2 --
 3 files changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-17 10:21:46 UTC (rev 171246)
+++ PKGBUILD	2016-04-17 10:28:21 UTC (rev 171247)
@@ -14,7 +14,7 @@
   'x86_energy_perf_policy'
 )
 pkgver=4.5
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -41,8 +41,8 @@
         '04-fix-usip-h-path.patch')
 md5sums=('SKIP'
          '56883c159381ba89e50ab8ea65efec77'
-         '7e0710c2f31c1eb1e1417a7972e676b1'
-         '2450e8ff41b30eb58d43b5fffbfde1f4'
+         '34f5ecc19770a1abbcd0fd65bfd1f065'
+         '86c4e419e4ba80835c330d49ba3f56ad'
          'bb35634f480325a78b943f7e10165e86'
          '1bc4f8c7a21a30e1a873d07e69fb698b'
          'a73ea3ea6d9c9ecb1cc910871eead3ff')
@@ -69,9 +69,9 @@
   msg2 'perf'
   pushd linux/tools/perf
   make \
+    prefix=/usr \
+    DESTDIR="$pkgdir" \
     WERROR=0 \
-    DESTDIR="$pkgdir/usr" \
-    perfexecdir='lib/perf' \
     PYTHON=python2 \
     PYTHON_CONFIG=python2-config \
     PERF_VERSION=$pkgver-$pkgrel \
@@ -148,17 +148,19 @@
 
   cd linux/tools/perf
   make \
+    prefix=/usr \
+    DESTDIR="$pkgdir" \
     WERROR=0 \
-    DESTDIR="$pkgdir/usr" \
-    perfexecdir='lib/perf' \
     PYTHON=python2 \
     PYTHON_CONFIG=python2-config \
     PERF_VERSION=$pkgver-$pkgrel \
     install install-man
+  cd "$pkgdir"
   # move completion in new directory
-  cd "$pkgdir"
-  install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/completions/perf
-  rm -r usr/etc
+  install -Dm644 etc/bash_completion.d/perf usr/share/bash-completion/completions/perf
+  rm -r etc
+  # no exec on usr/share
+  find usr/share -type f -exec chmod a-x {} \;
 }
 
 package_cpupower() {

Modified: cpupower.service
===================================================================
--- cpupower.service	2016-04-17 10:21:46 UTC (rev 171246)
+++ cpupower.service	2016-04-17 10:28:21 UTC (rev 171247)
@@ -3,6 +3,7 @@
 
 [Service]
 Type=oneshot
+EnvironmentFile=/etc/default/cpupower
 ExecStart=/usr/lib/systemd/scripts/cpupower
 RemainAfterExit=yes
 

Modified: cpupower.systemd
===================================================================
--- cpupower.systemd	2016-04-17 10:21:46 UTC (rev 171246)
+++ cpupower.systemd	2016-04-17 10:28:21 UTC (rev 171247)
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. /etc/default/cpupower
-
 declare -i fail=0
 
 # parse frequency options