Revert "* kernel26: default powergovernor is now ondemand"

This reverts commit 841e958b5c.

chakra-live/PKGBUILD

@@ -4,18 +4,20 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-pkgbase=chakra-live
+pkgname=chakra-live
-pkgname=('chakra-live' 'chakra-live-profiles')
 pkgver=2011.04
-pkgrel=1
+pkgrel=0.20110623.1
+pkgdesc="Chakra GNU/Linux livecd/liveusb generation scripts"
 arch=('any')
 url="https://gitorious.org/chakra/chakra-live"
 license=('GPL')
+depends=('mkinitcpio' 'mkinitcpio-nfs-utils' 'nbd' 'cdrkit' 'squashfs-tools' 'syslinux')
+optdepends=('qemu: quickly test isos')
 makedepends=('git')
 provides=()
 conflicts=()
 source=(http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz)
-md5sums=(e975f5393900d7a46cc42f8d3dcd9200)
+md5sums=(0522ada174268459fbeaec4ddf8466b6)
 
 # create tarball: source PKGBUILD && mksource
 
@@ -29,20 +31,7 @@ mksource() {
 	  md5sum ${pkgname}-${pkgver}-${pkgrel}.tar.xz
 }
 
-package_chakra-live() {
+package() {
-  pkgdesc="Chakra GNU/Linux livecd/liveusb generation scripts"
+  cd ${srcdir}/${pkgname}/chakra-iso
-  depends=('mkinitcpio' 'mkinitcpio-nfs-utils' 'nbd' 'cdrkit' 'squashfs-tools' 'syslinux')
-  optdepends=('qemu: quickly test isos' 'chakra-live-profiles: Chakra GNU/Linux ISO-Image profiles')
-  cd ${srcdir}/${pkgbase}/chakra-iso
-  sed -ie s'~install -d -m 755 $(DESTDIR)/usr/share/chakraiso/~~'g Makefile
-  sed -ie s'~cp -r ../configs $(DESTDIR)/usr/share/chakraiso/configs~~'g Makefile
   make DESTDIR="$pkgdir" install
 }
-
-package_chakra-live-profiles() {
-  pkgdesc="Chakra-Live Profiles"
-  depends=('chakra-live')
-  cd ${srcdir}/${pkgbase}/
-  mkdir -p $pkgdir/usr/share/chakraiso/
-  cp -r configs $pkgdir/usr/share/chakraiso/configs
-}

kernel26/PKGBUILD

@@ -10,9 +10,9 @@ pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -CHAKRA ke
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.39
 pkgver=${_basekernel}.3
-pkgrel=3
+pkgrel=2
 makedepends=('xmlto' 'docbook-xsl')
-_patchname="patch-${pkgver}-${pkgrel}-CHAKRA"
+_patchname="patch-${pkgver}-1-CHAKRA"
 #_patchname="patch-${pkgver}-1-CHAKRA"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -25,9 +25,9 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
 md5sums=('1aab7a741abe08d42e8eccf20de61e05'
-         '69ee5440a3de7766b6fc35b6ce8f8dfc'
+         '98d940cd4fde3b3f5e26750911273640'
-         '8bc3e4800a0792b1f9d488379f108c20'
+         '694bf6bf9cbeb22ef84cb00bccdb2aa3'
-         '8569bead0c2bb7a47b41f53a28959a6c'
+         '2071b300ec7d6bde3dc678a669c22250'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

kernel26/config

@@ -515,14 +515,14 @@ CONFIG_CPU_FREQ_TABLE=m
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #

kernel26/config.x86_64

@@ -501,14 +501,14 @@ CONFIG_CPU_FREQ_TABLE=m
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #

linux-2.6-CHAKRA/PATCHCFG

@@ -4,7 +4,7 @@ source ../_buildscripts/core-testing-${_arch}-makepkg.conf
 _patch="2.6.39.4-pre"
 _queue="2.6.39"
 # Aufs
-_aufs="39-20110718"
+_aufs="39-20110704"
 # Kernel source file
 SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.39.tar.bz2"
 # Original source directory
@@ -21,7 +21,7 @@ PATCHES=(
 
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-         http://chakra-project.org/sources/kernel26/patches/39/bugfix/$_patch.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/39/bugfix/$_patch.patch%1
 
          # fix #19234 i1915 display size
          http://chakra-project.org/sources/kernel26/patches/39/bugfix/fix-i915.patch%1
@@ -34,7 +34,7 @@ PATCHES=(
          http://chakra-project.org/sources/kernel26/patches/39/aufs2.1/aufs2.1-standalone.tree-$_aufs.patch.bz2%1
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.39.3-3-CHAKRA"
+PATCHNAME="patch-2.6.39.3-1-CHAKRA"
 
 # Run this before applying patches
 pre_apply() {