summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-01-24 16:34:47 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-01-24 16:34:47 -0200
commite4dd4e4da2a066e4630c643b5b04de37dccd55af (patch)
tree5853fd1f96ffa3def994002e68740dc22bbb6e85
parentcc7ef32205c9b61934232f1ffa4b88d1d53ccefc (diff)
downloadabslibre-e4dd4e4da2a066e4630c643b5b04de37dccd55af.tar.gz
abslibre-e4dd4e4da2a066e4630c643b5b04de37dccd55af.tar.bz2
abslibre-e4dd4e4da2a066e4630c643b5b04de37dccd55af.zip
linux-libre-tools-3.7-4: updating revision
* Drop rc scripts - remove ft=sh from vim modeline in PKGBUILD * Add After=network.target in usbip service * Fix https://bugs.archlinux.org/task/33370
-rw-r--r--libre/linux-libre-tools/PKGBUILD27
-rw-r--r--libre/linux-libre-tools/cpupower.default (renamed from libre/linux-libre-tools/cpupower.conf)0
-rw-r--r--libre/linux-libre-tools/cpupower.rc16
-rw-r--r--libre/linux-libre-tools/cpupower.systemd2
-rw-r--r--libre/linux-libre-tools/usbipd.conf3
-rw-r--r--libre/linux-libre-tools/usbipd.rc34
-rw-r--r--libre/linux-libre-tools/usbipd.service1
7 files changed, 11 insertions, 72 deletions
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 7e988e5dc..fbb6ab1fc 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,5 +1,5 @@
# $Id$
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=linux-libre-tools
@@ -8,7 +8,7 @@ _basekernel=3.7
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=3.1
+pkgrel=4
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -17,7 +17,7 @@ options=('!strip')
# kernel source deps
makedepends=('asciidoc' 'xmlto')
# perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
# cpupower-libre deps
makedepends+=('pciutils')
# usbip-libre deps
@@ -25,21 +25,15 @@ makedepends+=('glib2' 'sysfsutils')
groups=("$pkgbase")
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
#"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
- 'cpupower.conf'
- 'cpupower.rc'
+ 'cpupower.default'
'cpupower.systemd'
'cpupower.service'
- 'usbipd.conf'
- 'usbipd.rc'
'usbipd.service')
md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
'56883c159381ba89e50ab8ea65efec77'
- '5fc1fcda4cef93f16e752b1931db23e3'
- 'c0d17b5295fe964623c772a2dd981771'
+ '7e0710c2f31c1eb1e1417a7972e676b1'
'2450e8ff41b30eb58d43b5fffbfde1f4'
- 'e8fac9c45a628015644b4150b139278a'
- '8a3831d962ff6a9968c0c20fd601cdec'
- 'ba7c1c513314dd21fb2334fb8417738f')
+ 'a8fb0c6159bee1b9e345a87cabb3ba27')
build() {
# apply stable patching set
@@ -119,7 +113,7 @@ package_perf-libre() {
package_cpupower-libre() {
pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
- backup=('etc/conf.d/cpupower')
+ backup=('etc/default/cpupower')
depends=('bash' 'pciutils')
replaces=('cpupower' 'cpufrequtils')
conflicts=('cpupower' 'cpufrequtils')
@@ -133,8 +127,7 @@ package_cpupower-libre() {
install install-man
popd
# install startup scripts
- install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
- install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+ install -Dm 644 cpupower.default "$pkgdir/etc/default/cpupower"
install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
}
@@ -165,9 +158,7 @@ package_usbip-libre() {
# module loading
install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- # install daemon scripts
- install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
- install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+ # systemd
install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
}
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.default
index b5c522ea1..b5c522ea1 100644
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.default
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
deleted file mode 100644
index 88edaf791..000000000
--- a/libre/linux-libre-tools/cpupower.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start|restart)
- status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
- ;;
- *)
- echo "usage: ${0##*/} {start|restart}" >&2
- exit 1
- ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
index f45b02bc8..51c645415 100644
--- a/libre/linux-libre-tools/cpupower.systemd
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -1,6 +1,6 @@
#!/bin/bash
-. /etc/conf.d/cpupower
+. /etc/default/cpupower
declare -i fail=0
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
deleted file mode 100644
index 5990b857a..000000000
--- a/libre/linux-libre-tools/usbipd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-DAEMON_OPTS=''
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
deleted file mode 100644
index 15a1bcf00..000000000
--- a/libre/linux-libre-tools/usbipd.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/usbipd
-PID=$(pidof -o %PPID $DAEMON)
-DAEMON_OPTS="--daemon $DAEMON_OPTS"
-
-case "$1" in
- start)
- stat_busy "Starting ${0##*/} daemon"
- [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
- stat_fail
- ;;
- stop)
- stat_busy "Stopping ${0##*/} daemon"
- [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
- stat_fail
- ;;
- restart)
- $0 stop
- $0 start
- exit 0
- ;;
- *)
- echo "usage: ${0##*/} {start|stop|restart}" >&2
- ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
index ac2f5f7c1..1f3da08db 100644
--- a/libre/linux-libre-tools/usbipd.service
+++ b/libre/linux-libre-tools/usbipd.service
@@ -1,5 +1,6 @@
[Unit]
Description=USB/IP server
+After=network.target
[Service]
ExecStart=/usr/sbin/usbipd