From e4dd4e4da2a066e4630c643b5b04de37dccd55af Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 24 Jan 2013 16:34:47 -0200 Subject: 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 --- libre/linux-libre-tools/PKGBUILD | 27 +++++++++---------------- libre/linux-libre-tools/cpupower.conf | 29 --------------------------- libre/linux-libre-tools/cpupower.default | 29 +++++++++++++++++++++++++++ libre/linux-libre-tools/cpupower.rc | 16 --------------- libre/linux-libre-tools/cpupower.systemd | 2 +- libre/linux-libre-tools/usbipd.conf | 3 --- libre/linux-libre-tools/usbipd.rc | 34 -------------------------------- libre/linux-libre-tools/usbipd.service | 1 + 8 files changed, 40 insertions(+), 101 deletions(-) delete mode 100644 libre/linux-libre-tools/cpupower.conf create mode 100644 libre/linux-libre-tools/cpupower.default delete mode 100644 libre/linux-libre-tools/cpupower.rc delete mode 100644 libre/linux-libre-tools/usbipd.conf delete mode 100644 libre/linux-libre-tools/usbipd.rc 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 +# Maintainer: Sébastien Luttringer # Maintainer (Parabola): André Silva 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.conf deleted file mode 100644 index b5c522ea1..000000000 --- a/libre/linux-libre-tools/cpupower.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Define CPUs governor -# valid governors: ondemand, performance, powersave, conservative, userspace. -#governor='ondemand' - -# Limit frequency range -# Valid suffixes: Hz, kHz (default), MHz, GHz, THz -#min_freq="2.25GHz" -#max_freq="3GHz" - -# Specific frequency to be set. -# Requires userspace governor to be available. -# Do not set governor field if you use this one. -#freq= - -# Utilizes cores in one processor package/socket first before processes are -# scheduled to other processor packages/sockets. -# See man (1) CPUPOWER-SET for additional details. -#mc_scheduler= - -# Utilizes thread siblings of one processor core first before processes are -# scheduled to other cores. See man (1) CPUPOWER-SET for additional details. -#smp_scheduler= - -# Sets a register on supported Intel processore which allows software to convey -# its policy for the relative importance of performance versus energy savings to -# the processor. See man (1) CPUPOWER-SET for additional details. -#perf_bias= - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/linux-libre-tools/cpupower.default b/libre/linux-libre-tools/cpupower.default new file mode 100644 index 000000000..b5c522ea1 --- /dev/null +++ b/libre/linux-libre-tools/cpupower.default @@ -0,0 +1,29 @@ +# Define CPUs governor +# valid governors: ondemand, performance, powersave, conservative, userspace. +#governor='ondemand' + +# Limit frequency range +# Valid suffixes: Hz, kHz (default), MHz, GHz, THz +#min_freq="2.25GHz" +#max_freq="3GHz" + +# Specific frequency to be set. +# Requires userspace governor to be available. +# Do not set governor field if you use this one. +#freq= + +# Utilizes cores in one processor package/socket first before processes are +# scheduled to other processor packages/sockets. +# See man (1) CPUPOWER-SET for additional details. +#mc_scheduler= + +# Utilizes thread siblings of one processor core first before processes are +# scheduled to other cores. See man (1) CPUPOWER-SET for additional details. +#smp_scheduler= + +# Sets a register on supported Intel processore which allows software to convey +# its policy for the relative importance of performance versus energy savings to +# the processor. See man (1) CPUPOWER-SET for additional details. +#perf_bias= + +# vim:set ts=2 sw=2 ft=sh et: 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 -- cgit v1.2.3 From 5816fa55d6d4cc21492f89a5d1e2d0f259fcf6c2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 24 Jan 2013 17:03:13 -0200 Subject: virtualbox-libre-modules-lts-4.2.6-5: updating revision * rebuild against linux-libre-lts-3.0.60-1 --- libre/virtualbox-libre-modules-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 1833f020e..b19bb5ba7 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.6 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -- cgit v1.2.3 From 26f73986cc66d7fd68794160527fc385553dc305 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 24 Jan 2013 17:45:54 -0200 Subject: linux-libre-kmod-alx-20130123-1: updating version * changing source code compressed format from tar.bz2 to tar.xz --- libre/linux-libre-kmod-alx/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 335d35218..1aef0dc2e 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: André Silva -_kernver=3.7.1 -_kernrel=2 +_kernver=3.7.4 +_kernrel=1 pkgname=('linux-libre-kmod-alx') -_pkgver=2012-12-19-u -pkgver=20121219 +_pkgver=2013-01-23-1-u +pkgver=20130123 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') @@ -16,9 +16,9 @@ install=linux-libre-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2013/01/23/compat-drivers-$_pkgver.tar.xz) -md5sums=('60756fde830487042a525ff17ccfe7ab') +md5sums=('4ba03ce3edf5a3fd2b79496284172d73') build() { -- cgit v1.2.3 From 9ec59792f8e03a47ac5ba4b2598263f042fe09b1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 24 Jan 2013 18:07:04 -0200 Subject: linux-libre-lts-kmod-alx-20121204-2: updating revision * changing source code compressed format from tar.bz2 to tar.xz * rebuilding against linux-libre-3.0.60-1 --- libre/linux-libre-lts-kmod-alx/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 767609934..5bea880cd 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva -_kernver=3.0.57 +_kernver=3.0.60 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _pkgver=2012-12-04-1-u pkgver=20121204 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -16,9 +16,9 @@ install=linux-libre-lts-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.xz) -md5sums=('bc46200e288acb862149a2af11f4b293') +md5sums=('0759f5668d20f420d6d9dc6d854a2ceb') build() { -- cgit v1.2.3 From 0258b92ad774dce06ed27aeb77e897d3b5bc626e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 26 Jan 2013 12:15:00 -0200 Subject: clementine-libre-1.1.1-4: updating revision * Rebuilding package --- libre/clementine-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 2bfa111f8..85f2b3414 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -9,7 +9,7 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') -- cgit v1.2.3 From 072fcf33f41cce6ec27949da2a5f3d841a6d8cc8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 26 Jan 2013 12:22:16 -0200 Subject: linux-libre-tools-3.7-5: updating revision * fix https://bugs.archlinux.org/task/33549 * put binutils on perf-libre's depends line --- libre/linux-libre-tools/PKGBUILD | 7 ++++--- libre/linux-libre-tools/cpupower.install | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 libre/linux-libre-tools/cpupower.install diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index fbb6ab1fc..d3c01f28c 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -8,7 +8,7 @@ _basekernel=3.7 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=4 +pkgrel=5 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' 'binutils') +makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') # cpupower-libre deps makedepends+=('pciutils') # usbip-libre deps @@ -95,7 +95,7 @@ package_libtraceevent-libre() { package_perf-libre() { pkgdesc='Linux kernel performance auditing tool' - depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') + depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils') replaces=('perf') conflicts=('perf') provides=("perf=$pkgver") @@ -118,6 +118,7 @@ package_cpupower-libre() { replaces=('cpupower' 'cpufrequtils') conflicts=('cpupower' 'cpufrequtils') provides=("cpupower=$pkgver") + install=cpupower.install pushd linux-$pkgver/tools/power/cpupower make \ diff --git a/libre/linux-libre-tools/cpupower.install b/libre/linux-libre-tools/cpupower.install new file mode 100644 index 000000000..10e07ae52 --- /dev/null +++ b/libre/linux-libre-tools/cpupower.install @@ -0,0 +1,13 @@ +#!/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 3.7-4)" -le 0 ]; then + cat << EOF +===> cpupower startup config file moved to /etc/default/cpupower +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: -- cgit v1.2.3