move linux-rowlf to linux-seblu and update to 3.3

--- a/drivers/platform/x86/intel_ips.c

+++ b/drivers/platform/x86/intel_ips.c

@@ -602,23 +602,16 @@ static bool mcp_exceeded(struct ips_driver *ips)

 	bool ret = false;

 	u32 temp_limit;

 	u32 avg_power;

-	const char *msg = "MCP limit exceeded: ";

 	spin_lock_irqsave(&ips->turbo_status_lock, flags);

 	temp_limit = ips->mcp_temp_limit * 100;

 	if (ips->mcp_avg_temp > temp_limit) {

-		dev_info(&ips->dev->dev,

-			"%sAvg temp %u, limit %u\n", msg, ips->mcp_avg_temp,

-			temp_limit);

 		ret = true;

 	}

 	avg_power = ips->cpu_avg_power + ips->mch_avg_power;

 	if (avg_power > ips->mcp_power_limit) {

-		dev_info(&ips->dev->dev,

-			"%sAvg power %u, limit %u\n", msg, avg_power,

-			ips->mcp_power_limit);

 		ret = true;

 	}

@@ -648,10 +641,6 @@ static bool cpu_exceeded(struct ips_driver *ips, int cpu)

 		ret = true;

 	spin_unlock_irqrestore(&ips->turbo_status_lock, flags);

-	if (ret)

-		dev_info(&ips->dev->dev,

-			 "CPU power or thermal limit exceeded\n");

-

 	return ret;

 }

@@ -715,12 +704,6 @@ static void update_turbo_limits(struct ips_driver *ips)

 	u32 hts = thm_readl(THM_HTS);

 	ips->cpu_turbo_enabled = !(hts & HTS_PCTD_DIS);

-	/* 

-	 * Disable turbo for now, until we can figure out why the power figures

-	 * are wrong

-	 */

-	ips->cpu_turbo_enabled = false;

-

 	if (ips->gpu_busy)

 		ips->gpu_turbo_enabled = !(hts & HTS_GTD_DIS);

@@ -902,7 +885,7 @@ static u32 get_cpu_power(struct ips_driver *ips, u32 *last, int period)

 	ret = (ret * 1000) / 65535;

 	*last = val;

-	return 0;

+	return ret;

 }

 static const u16 temp_decay_factor = 2;

@@ -1193,11 +1176,6 @@ static irqreturn_t ips_irq_handler(int irq, void *arg)

 				STS_GPL_SHIFT;

 			/* ignore EC CPU vs GPU pref */

 			ips->cpu_turbo_enabled = !(sts & STS_PCTD_DIS);

-			/* 

-			 * Disable turbo for now, until we can figure

-			 * out why the power figures are wrong

-			 */

-			ips->cpu_turbo_enabled = false;

 			if (ips->gpu_busy)

 				ips->gpu_turbo_enabled = !(sts & STS_GTD_DIS);

 			ips->mcp_temp_limit = (sts & STS_PTL_MASK) >>

@@ -1585,8 +1563,8 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)

 	/* Save turbo limits & ratios */

 	rdmsrl(TURBO_POWER_CURRENT_LIMIT, ips->orig_turbo_limit);

-	ips_disable_cpu_turbo(ips);

-	ips->cpu_turbo_enabled = false;

+	ips_enable_cpu_turbo(ips);

+	ips->cpu_turbo_enabled = true;

 	/* Create thermal adjust thread */

 	ips->adjust = kthread_create(ips_adjust, ips, "ips-adjust");

# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>

# Customized version of linux for seblu computers

shopt -s nullglob

pkgbase=linux-seblu

pkgname=$pkgbase

pkgver=3.3

pkgrel=1

[[ ${pkgver##*rc} != $pkgver ]] && testing='testing'

kernelver=${pkgver//_/-}

kernelsuf=${pkgbase#linux}

arch=('x86_64')

license=('GPL2')

url='http://www.kernel.org'

options=('!strip')

makedepends=('xmlto' 'docbook-xsl')

source=(

  "http://www.kernel.org/pub/linux/kernel/v3.0/$testing/linux-${kernelver}.tar.xz"

  'config.x86_64'

  'config.i686'

  *.patch)

# small hack to avoid makepkg to check checksum

SKIPCHECKSUMS=1

build() {

  msg2 "Kernel version: $kernelver"

  msg2 "Kernel suffix: $kernelsuf"

  cd linux-$kernelver

  if (( NOEXTRACT==0 )); then

    # patching sources

    for _f in ../*.patch; do

      msg2 "  Applying patch $(basename $_f)"

      patch -N -p1 -i "$_f"

    done

	  # loading default config

    # use make localmodconfig to check .config is correct

    msg2 'Copying config'

    install ../config.$CARCH .config

	  # removing last dot if zero

	  #sed -ri 's/^SUBLEVEL = 0$/SUBLEVEL =/' Makefile

  fi

	# updating suffixe in config (must be the right!)

	msg2 'Setting kernel suffix'

	sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${kernelsuf}\"|g" .config

  # define current build version

  echo $((pkgrel - 1)) > .version

  # Preapre compilation

  msg2 "Preparing compilation"

  yes "" | make config &>/dev/null

  nice -n 19 make prepare &>/dev/null

  cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)

  jc=$((${cpucount:-1}))

  # Compiling sources

  msg2 "Compiling (jobs=$jc)"

  nice -n 19 make -j $jc bzImage modules

}

package() {

  cd linux-$kernelver

  # get real compiled kernel version

  compver=$(make kernelrelease)

  pkgname=linux-${compver}

  pkgdesc="The Linux Kernel, version $compver"

  provides=('linux' 'linux-headers' 'linux-docs')

  depends=('coreutils' 'linux-firmware' 'module-init-tools' 'mkinitcpio')

  install='install'

  sed -ri "s/pkgname=.*/pkgname='$pkgname'/" "$startdir/install"

  # installing modules

  install -d "$pkgdir"/{lib/modules,boot}

  make INSTALL_MOD_PATH="$pkgdir" modules_install

  # install kernel and map

  cp arch/x86/boot/bzImage "$pkgdir/boot/kernel-${compver}"

  # install mkinitcpio preset file for kernel

  install -d "${pkgdir}/etc/mkinitcpio.d/"

  cat > "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" << EOF 

# mkinitcpio preset file for ${pkgname}

ALL_config="/etc/mkinitcpio.conf"

ALL_kver="/boot/kernel-${compver}"

PRESETS=('default' 'fallback')

#default_config="/etc/mkinitcpio.conf"

default_image="/boot/initramfs-${compver}.img"

#default_options=""

#fallback_config="/etc/mkinitcpio.conf"

fallback_image="/boot/initramfs-${compver}-fallback.img"

fallback_options="-S autodetect"

EOF

  # setup current version package (used by install script)

  install -d "${pkgdir}/usr/share/${pkgname}"

  cat > "${pkgdir}/usr/share/${pkgname}/info" << EOF

KERNEL_NAME=${pkgname}

KERNEL_VERSION=${kernelver}

KERNEL_SUFFIX=${kernelsuf}

KERNEL_BUILD=${compver}

EOF

  # remove build and source links

  rm -f "$pkgdir/lib/modules/$compver"/{source,build}

  # remove the firmware (avoiding conflict with 2.6

  rm -rf "$pkgdir/lib/firmware"

  # copy documentation

  install -d "$pkgdir/usr/src/linux-$compver"

  cp -r Documentation "$pkgdir/usr/src/linux-$compver"

  # copy headers

  copy_headers

  # check rights

  chown -R root.root "$pkgdir/usr/src/linux-$compver"

  chmod -R u=rwX,go=rX "$pkgdir/usr/src/linux-$compver"

  # gzip -9 all modules to safe 100MB of space

  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;

}

copy_headers() {

  install -d "$pkgdir/lib/modules/$compver"

  ln -sf ../../../usr/src/linux-$compver "$pkgdir/lib/modules/$compver/build"

  cd "$srcdir/linux-$kernelver"

  install -D -m644 Makefile "$pkgdir/usr/src/linux-$compver/Makefile"

  install -D -m644 kernel/Makefile "$pkgdir/usr/src/linux-$compver/kernel/Makefile"

  install -D -m644 .config "$pkgdir/usr/src/linux-$compver/.config"

  for i in localversion*; do

    install -m644 "$i" "$pkgdir/usr/src/linux-$compver/$i"

  done

  install -d "$pkgdir/usr/src/linux-$compver/include"

  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do

    cp -a include/$i "$pkgdir/usr/src/linux-$compver/include/"

  done

  # copy arch includes for external modules

  install -d "$pkgdir/usr/src/linux-$compver/arch/x86"

  cp -a arch/x86/include "$pkgdir/usr/src/linux-$compver/arch/x86/"

  # copy files necessary for later builds, like nvidia and vmware

  cp Module.symvers "$pkgdir/usr/src/linux-$compver"

  cp -a scripts "$pkgdir/usr/src/linux-$compver"

  # fix permissions on scripts dir

  chmod og-w -R "$pkgdir/usr/src/linux-$compver/scripts"

  install -d "$pkgdir/usr/src/linux-$compver/.tmp_versions"

  install -d "$pkgdir/usr/src/linux-$compver/arch/x86/kernel"

  cp arch/x86/Makefile "$pkgdir/usr/src/linux-$compver/arch/x86/"

  cp arch/x86/kernel/asm-offsets.s "$pkgdir/usr/src/linux-$compver/arch/x86/kernel/"

  # add headers for lirc package

  install -d "$pkgdir/usr/src/linux-$compver/drivers/media/video"

  cp drivers/media/video/*.h  "$pkgdir/usr/src/linux-$compver/drivers/media/video/"

  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do

   install -d "$pkgdir/usr/src/linux-$compver/drivers/media/video/$i"

   cp -a drivers/media/video/$i/*.h "$pkgdir/usr/src/linux-$compver/drivers/media/video/$i"

  done

  # add docbook makefile

  install -D -m644 Documentation/DocBook/Makefile \

    "$pkgdir/usr/src/linux-$compver/Documentation/DocBook/Makefile"

  # add dm headers

  install -d "$pkgdir/usr/src/linux-$compver/drivers/md"

  cp drivers/md/*.h  "$pkgdir/usr/src/linux-$compver/drivers/md"

  # add inotify.h

  install -d "$pkgdir/usr/src/linux-$compver/include/linux"

  cp include/linux/inotify.h "$pkgdir/usr/src/linux-$compver/include/linux/"

  # add wireless headers

  install -d "$pkgdir/usr/src/linux-$compver/net/mac80211/"

  cp net/mac80211/*.h "$pkgdir/usr/src/linux-$compver/net/mac80211/"

  # add dvb headers for external modules

  # in reference to:

  # http://bugs.archlinux.org/task/9912

  install -d "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/dvb-core"

  cp drivers/media/dvb/dvb-core/*.h "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/dvb-core/"

  # add dvb headers for external modules

  # in reference to:

  # http://bugs.archlinux.org/task/11194

  install -d "$pkgdir/usr/src/linux-$compver/include/config/dvb/"

  cp include/config/dvb/*.h "$pkgdir/usr/src/linux-$compver/include/config/dvb/"

  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new

  # in reference to:

  # http://bugs.archlinux.org/task/13146

  install -d "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/frontends/"

  cp drivers/media/dvb/frontends/lgdt330x.h "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/frontends/"

  cp drivers/media/video/msp3400-driver.h "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/frontends/"

  # add dvb headers  

  # in reference to:

  # http://bugs.archlinux.org/task/20402

  install -d "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/dvb-usb"

  cp drivers/media/dvb/dvb-usb/*.h "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/dvb-usb/"

  install -d "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/frontends"

  cp drivers/media/dvb/frontends/*.h "$pkgdir/usr/src/linux-$compver/drivers/media/dvb/frontends/"

  install -d "$pkgdir/usr/src/linux-$compver/drivers/media/common/tuners"

  cp drivers/media/common/tuners/*.h "$pkgdir/usr/src/linux-$compver/drivers/media/common/tuners/"

  # add xfs and shmem for aufs building

  install -d "$pkgdir/usr/src/linux-$compver/fs/xfs"

  install -d "$pkgdir/usr/src/linux-$compver/mm"

  cp fs/xfs/xfs_sb.h "$pkgdir/usr/src/linux-$compver/fs/xfs/xfs_sb.h"

  # add headers vor virtualbox

  # in reference to:

  # http://bugs.archlinux.org/task/14568

  cp -a include/drm "$pkgdir/usr/src/linux-$compver/include/"

  # add headers for broadcom wl

  # in reference to:

  # http://bugs.archlinux.org/task/14568

  cp -a include/trace "$pkgdir/usr/src/linux-$compver/include/"

  # copy in Kconfig files

  for i in `find . -name "Kconfig*"`; do 

    install -d "$pkgdir/usr/src/linux-$compver"/$(echo $i | sed 's|/Kconfig.*||')

    cp "$i" "$pkgdir/usr/src/linux-$compver/$i"

  done

  # remove unneeded architectures

  rm -rf "$pkgdir/usr/src/linux-$compver/arch"/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}

}

# vim:set ts=2 sw=2 ft=sh et:

# arg 1:  the new package version

# arg 2:  the old package version

pkgname='linux-3.2.4-rwolf'

post_install () {

  source /usr/share/$pkgname/info

  echo "==> Updating dependancy..."

  depmod ${KERNEL_BUILD}

  echo "==> Generationg init root filesystem..."

  /sbin/mkinitcpio -p $pkgname

  if [[ -x /sbin/grub-mkconfig ]]; then

    echo "==> Updating grub2 configuration..."

    /sbin/grub-mkconfig -o /boot/grub/grub.cfg

  fi

  #if test -e /usr/bin/VirtualBox; then

  #  compile_vbox_modules

  #fi

}

pre_upgrade() {

  pre_remove

}

post_upgrade() {

  post_install

}

pre_remove() {

  test -e "/usr/share/$pkgname/info" || return

  source /usr/share/$pkgname/info

  echo "==> Cleaning initcpio..."

  rm -vf /boot/initramfs-${KERNEL_BUILD}.img

  rm -vf /boot/initramfs-${KERNEL_BUILD}-fallback.img

  echo "==> Cleaning kernel modules"

  rm -rf /lib/modules/${KERNEL_BUILD}

}

post_remove() {

  if [[ -x /sbin/grub-mkconfig ]]; then

    echo "==> Updating grub2 configuration..."

    /sbin/grub-mkconfig -o /boot/grub/grub.cfg

  fi

}

#compile_vbox_modules() {

#    echo "==> Compiling VirtualBox modules"

#

#    # Preparing environment

#    export KERN_DIR=/lib/modules/${KERNEL_BUILD}/build

#    export MODULE_DIR=/lib/modules/${KERNEL_BUILD}/misc

#    LOG="/var/log/vbox-install.log"

#    . /etc/vbox/vbox.cfg

#

#    if [ -n "$INSTALL_DIR" ]; then

#      VBOXMANAGE="$INSTALL_DIR/VBoxManage"

#      BUILDVBOXDRV="$INSTALL_DIR/src/vboxhost/vboxdrv/build_in_tmp"

#      BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxhost/vboxnetflt/build_in_tmp"

#      BUILDVBOXNETADP="$INSTALL_DIR/src/vboxhost/vboxnetadp/build_in_tmp"

#    else

#      echo "==> Missing vbox.cfg"

#      return

#    fi

#

#    # building vboxdrv

#    echo "==> Compiling vboxdrv"

#    if ! $BUILDVBOXDRV \

#      --save-module-symvers /tmp/vboxdrv-Module.symvers \

#      --no-print-directory install > $LOG 2>&1; then

#      echo  "Look at $LOG to find out what went wrong"

#    fi

#

#    # building vboxnetflt

#    echo "==> Compiling vboxnetflt"

#    if ! $BUILDVBOXNETFLT \

#      --use-module-symvers /tmp/vboxdrv-Module.symvers \

#      --no-print-directory install >> $LOG 2>&1; then

#      echo "Look at $LOG to find out what went wrong"

#    fi

#

#    # build vboxnetadp

#    echo "==> Compiling vboxnetadp"

#    if ! $BUILDVBOXNETADP \

#      --use-module-symvers /tmp/vboxdrv-Module.symvers \

#      --no-print-directory install >> $LOG 2>&1; then

#      echo "Look at $LOG to find out what went wrong"

#    fi

#}

# vim:set ts=2 sw=2 ft=sh et: