Commit 9f7b915b authored by Seblu's avatar Seblu
Browse files

upgrade linux kernel


git-svn-id: https://seblu.net/s/archpkg@124 02741741-5192-46b8-8916-7152b19231d9
parent eda60c69
Loading
Loading
Loading
Loading

linux-rwolf/PKGBUILD

0 → 100644
+248 −0
Original line number Diff line number Diff line
# Maintainer: Sebastien Luttringer <seblu@seblu.net>

pkgbase=linux-rwolf
pkgname=$pkgbase
pkgver=3.0.1
pkgrel=1
arch=('x86_64')
license=('GPL2')
url="http://www.kernel.org"
options=('!strip')

kernelver=$pkgver
kernelsuf=${pkgbase#linux}

shopt -s nullglob

build() {
  msg2 "Kernel version: $kernelver"
  msg2 "Kernel suffix: $kernelsuf"

  # Preparing sources (no traditional to escape checksum and handle rc)
  if [[ ! -d "${srcdir}/linux-$kernelver" ]]; then
    msg2 "Preparing sources"
    # get sources if needed
    if [[ -e "${startdir}/linux-$kernelver.tar.bz2" ]]; then
      msg2 "  Source already downloaded"
    else
      msg2 "  Downloading source"
      cd "${startdir}"
      if echo "$kernelver" | grep -q rc; then
        src="http://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${kernelver}.tar.bz2"
      else
        src="http://www.kernel.org/pub/linux/kernel/v3.0/linux-${kernelver}.tar.bz2"
      fi
      wget "$src"
    fi

    # unpacting sources
    msg2 "Untaring sources"
    cd "${srcdir}"
    tar xf "${startdir}/linux-${kernelver}.tar.bz2"
    cd "${srcdir}/linux-$kernelver"
  
    # patching sources
    if [[ -d "${startdir}/patch.d" ]]; then
      msg2 "Patching sources"
      for f in "${startdir}/patch.d/"*.patch; do
        msg2 "  Patching $f"
        patch -N -p1 -i "$f"
      done
    fi
  else  
    cd "${srcdir}/linux-$kernelver"
  fi

  # loading default config
  if [[ ! -e '.config' && -e "${startdir}/config" ]]; then
    msg2 'Copying default config'
    cp -f "${startdir}/config" '.config'
  fi

  # updating suffixe in config (must be the right!)
  msg2 "Setting kernel suffix to $kernelsuf"
  sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${kernelsuf}\"|g" ./.config

  # 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}
  pkgver=$(cat .version)
  pkgdesc="The Linux Kernel, version $compver"
  groups=('base')
  provides=('linux')
  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:

linux-rwolf/config

0 → 100644
+4889 −0

File added.

Preview size limit exceeded, changes collapsed.

linux-rwolf/install

0 → 100644
+90 −0
Original line number Diff line number Diff line
# arg 1:  the new package version
# arg 2:  the old package version

pkgname='linux-3.0.1-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:
+64 −0
Original line number Diff line number Diff line
Index: linux-2.6/drivers/acpi/ac.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ac.c
+++ linux-2.6/drivers/acpi/ac.c
@@ -100,24 +100,7 @@ static const struct file_operations acpi
 	.release = single_release,
 };
 #endif
-static int get_ac_property(struct power_supply *psy,
-			   enum power_supply_property psp,
-			   union power_supply_propval *val)
-{
-	struct acpi_ac *ac = to_acpi_ac(psy);
-	switch (psp) {
-	case POWER_SUPPLY_PROP_ONLINE:
-		val->intval = ac->state;
-		break;
-	default:
-		return -EINVAL;
-	}
-	return 0;
-}
 
-static enum power_supply_property ac_props[] = {
-	POWER_SUPPLY_PROP_ONLINE,
-};
 /* --------------------------------------------------------------------------
                                AC Adapter Management
    -------------------------------------------------------------------------- */
@@ -140,6 +123,34 @@ static int acpi_ac_get_state(struct acpi
 	return 0;
 }
 
+/* --------------------------------------------------------------------------
+                            sysfs I/F
+   -------------------------------------------------------------------------- */
+static int get_ac_property(struct power_supply *psy,
+			   enum power_supply_property psp,
+			   union power_supply_propval *val)
+{
+	struct acpi_ac *ac = to_acpi_ac(psy);
+
+	if (!ac)
+		return -ENODEV;
+
+	if (acpi_ac_get_state(ac))
+		return -ENODEV;
+
+	switch (psp) {
+	case POWER_SUPPLY_PROP_ONLINE:
+		val->intval = ac->state;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static enum power_supply_property ac_props[] = {
+	POWER_SUPPLY_PROP_ONLINE,
+};
 #ifdef CONFIG_ACPI_PROCFS_POWER
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
+21 −0
Original line number Diff line number Diff line
--- linux-2.6.orig/drivers/acpi/battery.c
+++ linux-2.6/drivers/acpi/battery.c
@@ -177,6 +177,8 @@ static int acpi_battery_is_charged(struc
 	return 0;
 }
 
+static int acpi_battery_update(struct acpi_battery *battery);
+
 static int acpi_battery_get_property(struct power_supply *psy,
 				     enum power_supply_property psp,
 				     union power_supply_propval *val)
@@ -184,6 +186,9 @@ static int acpi_battery_get_property(str
 	int ret = 0;
 	struct acpi_battery *battery = to_acpi_battery(psy);
 
+	if (acpi_battery_update(battery))
+		return -ENODEV;
+
 	if (acpi_battery_present(battery)) {
 		/* run battery update only if it is present */
 		acpi_battery_get_state(battery);
Loading