Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

3 files changed, 45 insertions, 32 deletions

diff --git a/libre/filesystem-parabola/PKGBUILD b/libre/filesystem-parabola/PKGBUILD
index b4dba77c0..0bc0fac54 100644
--- a/libre/filesystem-parabola/PKGBUILD
+++ b/libre/filesystem-parabola/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=filesystem
 pkgname=filesystem-parabola
 pkgver=2014.07
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/filesystem-parabola/filesystem.install b/libre/filesystem-parabola/filesystem.install
index 065a79d6c..d70906f47 100644
--- a/libre/filesystem-parabola/filesystem.install
+++ b/libre/filesystem-parabola/filesystem.install
@@ -12,6 +12,17 @@ _adduser() {
 	fi
 }
 
+post_install() {
+	_backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
+	        'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
+	        'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
+	for _bk in ${_backup[@]}; do
+		if [ -f ${_bk}.pacsave ]; then
+			cp -av ${_bk}{.pacsave,}
+		fi
+	done
+}
+
 post_upgrade() {
 	_addgroup optical -g 93
 	_addgroup audio   -g 92
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index f390a3d9d..ebdd31fa6 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 116876 2014-08-05 00:19:20Z seblu $
 # Maintainer (Arch): Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
+_pkgdesc='Linux-libre kernel'
 pkgbase=linux-libre-tools
 _pkgname=(
-  'acpidump-parabola'
-  'cgroup_event_listener-parabola'
-  'cpupower-parabola'
-  'libtraceevent-parabola'
-  'perf-parabola'
-  'tmon-parabola'
-  'usbip-parabola'
-  'x86_energy_perf_policy-parabola'
+  'acpidump'
+  'cgroup_event_listener'
+  'cpupower'
+  'libtraceevent'
+  'perf'
+  'tmon'
+  'usbip'
+  'x86_energy_perf_policy'
 )
-pkgname=("${pkgbase}-meta" "${_pkgname[@]}")
+pkgname=("${pkgbase}-meta" "${_pkgname[@]/#/${pkgbase}_}")
 
 _pkgbasever=3.16-gnu
 _pkgver=3.16-gnu
@@ -22,7 +23,7 @@ _pkgver=3.16-gnu
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/.}
-pkgrel=1.2
+pkgrel=1.3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -126,17 +127,17 @@ build() {
   popd
 }
 
-package_linux-libre-tools-meta() {
-  pkgdesc='Linux-libre kernel tools meta package'
+_package_meta() {
+  pkgdesc="${_pkgdesc} tools meta package"
   groups=()
-  depends=("${_pkgname[@]}")
+  depends=("${_pkgname[@]/#/${pkgbase}_}")
   replaces=(linux-tools-meta)
   conflicts=(linux-tools-meta)
   provides=(linux-tools-meta=$_archpkgver)
 }
 
-_package_libtraceevent-parabola() {
-  pkgdesc='Linux-libre kernel trace event library'
+_package_libtraceevent() {
+  pkgdesc="${_pkgdesc} trace event library"
   depends=('glibc')
 
   cd $_srcname/tools/lib/traceevent
@@ -144,8 +145,8 @@ _package_libtraceevent-parabola() {
   install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
 }
 
-_package_perf-parabola() {
-  pkgdesc='Linux-libre kernel performance auditing tool'
+_package_perf() {
+  pkgdesc="${_pkgdesc} performance auditing tool"
   depends=('binutils')
 
   cd $_srcname/tools/perf
@@ -164,8 +165,8 @@ _package_perf-parabola() {
   rm -r usr/etc
 }
 
-_package_cpupower-parabola() {
-  pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
+_package_cpupower() {
+  pkgdesc="${_pkgdesc} tool to examine and tune power saving related features of your processor"
   backup=('etc/default/cpupower')
   depends=('bash')
   replaces=('cpufrequtils')
@@ -186,7 +187,7 @@ _package_cpupower-parabola() {
   install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
 
-_package_x86_energy_perf_policy-parabola() {
+_package_x86_energy_perf_policy() {
   pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
   depends=('glibc')
 
@@ -195,7 +196,7 @@ _package_x86_energy_perf_policy-parabola() {
   install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
 }
 
-_package_usbip-parabola() {
+_package_usbip() {
   pkgdesc='An USB device sharing system over IP network'
 
   pushd $_srcname/drivers/staging/usbip/userspace
@@ -208,15 +209,15 @@ _package_usbip-parabola() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
-_package_tmon-parabola() {
-  pkgdesc='Monitoring and Testing Tool for Linux-libre kernel thermal subsystem'
+_package_tmon() {
+  pkgdesc="Monitoring and Testing Tool for ${_pkgdesc} thermal subsystem"
   depends=('glibc')
 
   cd $_srcname/tools/thermal/tmon
   make install INSTALL_ROOT="$pkgdir"
 }
 
-_package_acpidump-parabola() {
+_package_acpidump() {
   pkgdesc='Dump system ACPI tables to an ASCII file'
   depends=('glibc')
   conflicts=('iasl')
@@ -227,7 +228,7 @@ _package_acpidump-parabola() {
   #install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
 }
 
-_package_cgroup_event_listener-parabola() {
+_package_cgroup_event_listener() {
   pkgdesc='Simple listener of cgroup events'
   depends=('glibc')
 
@@ -235,14 +236,15 @@ _package_cgroup_event_listener-parabola() {
   install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
 }
 
+eval "package_${pkgbase}-meta() { _package_meta; }"
 for _p in "${_pkgname[@]}"; do
   eval "
-    package_${_p}() {
+    package_${pkgbase}_${_p}() {
       _package_${_p}
-      depends+=(${_depends[${_p%-parabola}]})
-      replaces+=("${_p%-parabola}" "${_p/parabola/libre}")
-      conflicts+=("${_p%-parabola}" "${_p/parabola/libre}")
-      provides+=(${_p%-parabola}=${_archpkgver})
+      depends+=(${_depends[${_p}]})
+      replaces+=("${_p}" "${_p}-libre" "${_p}-parabola")
+      conflicts+=("${_p}" "${_p}-libre" "${_p}-parabola")
+      provides+=(${_p}=${_archpkgver})
     }"
 done