Fri Jun 29 03:19:21 UTC 2012

6 files changed, 30 insertions, 14 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 7b9198d8d..d63a33ec9 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,11 +1,11 @@
 # $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
 
 pkgname=grub
 pkgver=0.97
-pkgrel=21.3
+pkgrel=21.4
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/libre/grub/menu.lst b/libre/grub/menu.lst
index 43d2ac8db..f405baa91 100644
--- a/libre/grub/menu.lst
+++ b/libre/grub/menu.lst
@@ -26,7 +26,7 @@
 # general configuration:
 timeout   5
 default   0
-color light-blue/black light-cyan/blue
+color magenta/black white/magenta
 
 # boot sections follow
 # each is implicitly numbered from 0 in the order of appearance below
diff --git a/libre/grub/rePKGBUILD b/libre/grub/rePKGBUILD
index b14550034..a73289fb5 100644
--- a/libre/grub/rePKGBUILD
+++ b/libre/grub/rePKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: André Silva <andre.paulista@adinet.com.uy>
+# Contributor: André Silva <emulatorman@lavabit.com>
 source PKGBUILD
 CARCH=i686
 unset build package md5sums source
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 936a5d41f..5b1769f95 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -11,7 +11,7 @@ _grub_915_ver=9
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
 pkgver=2.00rc1
-pkgrel=1
+pkgrel=1.1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -38,7 +38,7 @@ sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
           'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
           '31aa740fc225b3f3ed4917843038f9e8658a71be'
-          '348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
+          '9a81f8bebcbee3d300315a29266ce7a5c9e5881c'
           '9735043d518e16f147f64ef283eceb2549fed860'
           'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
 
diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default
index 4ab37bbfc..d0c959059 100644
--- a/libre/grub2/grub.default
+++ b/libre/grub2/grub.default
@@ -34,8 +34,8 @@ GRUB_DISABLE_RECOVERY=true
 
 # Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
 # modes only.  Entries specified as foreground/background.
-#GRUB_COLOR_NORMAL="light-blue/black"
-#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+GRUB_COLOR_NORMAL="magenta/black"
+GRUB_COLOR_HIGHLIGHT="white/magenta"
 
 # Uncomment one of them for the gfx desired, a image background or a gfxtheme
 #GRUB_BACKGROUND="/path/to/wallpaper"
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index b7dc50f94..083cce961 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,15 +1,15 @@
 # $Id$
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
-_pkgname=('perf' 'cpupower')
-pkgname=('perf-libre' 'cpupower-libre')
+_pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
+pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre')
 _basekernel=3.4
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=2
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -34,7 +34,6 @@ build() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  cd ${srcdir}
   msg2 'Build perf'
   pushd linux-$pkgver/tools/perf
   make \
@@ -47,10 +46,16 @@ build() {
   popd
 
   msg2 'Build cpupower'
-  cd linux-$pkgver/tools/power/cpupower
+  pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
+  popd
+
+  msg2 'Build x86_energy_perf_policy'
+  pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  make
+  popd
 }
 
 package_perf-libre() {
@@ -91,4 +96,15 @@ package_cpupower-libre() {
   install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
 }
 
+package_x86_energy_perf_policy-libre() {
+  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+  replaces=('x86_energy_perf_policy')
+  conflicts=('x86_energy_perf_policy')
+  provides=("x86_energy_perf_policy=$pkgver")
+
+  cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+  install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+}
+
 # vim:set ts=2 sw=2 ft=sh et: