Commit 18cb2653 authored by Seblu's avatar Seblu
Browse files

linux-seblu: bump 3.12 and swtich to kernel-add

parent 81b05851
Loading
Loading
Loading
Loading
+5 −26
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ shopt -s nullglob
# Always use 3 dot versionning here! (e.g: 3.11.0, not 3.11)
# Althought tarball release are not nammed with the third number, the kernel
# built version contains it. Thus, modules and identifiers are with the last 0.
kernelver=3.12-rc1
kernelver=3.12.0
kernelsuf=-seblu
pkgname=linux
pkgver=1
pkgver=${kernelver//-/_}
pkgrel=1
arch=('x86_64')
license=('GPL2')
@@ -100,7 +100,7 @@ build() {
  cd linux-$kernelbase

  # define current build version
  echo $((pkgver - 1)) > .version
  echo $((pkgrel - 1)) > .version

  # Preapre compilation
  msg2 'Preparing compilation'
@@ -125,32 +125,11 @@ package() {

  # installing modules
  # disable DEPMOD because it fail due to poor hack in scripts/depmod.sh
  # and it's done by kernel-install in .install
  $_nice make INSTALL_MOD_PATH="$pkgdir/usr" DEPMOD=/bin/true modules_install

  # do manual depmod call
  $_nice depmod -b "$pkgdir/usr" -- "$compver"

  # install kernel and map
  $_nice install -D -m644 arch/x86/boot/bzImage "$pkgdir/boot/vmlinuz-$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/vmlinuz-$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
  $_nice install -D -m644 arch/x86/boot/bzImage "$pkgdir/usr/lib/kernel/vmlinuz-$compver"

  # setup current version package (used by install script)
  install -d "$pkgdir/usr/share/$pkgname"
+10 −2
Original line number Diff line number Diff line
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 3.12.0-rc1 Kernel Configuration
# Linux/x86 3.12.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -279,7 +279,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_CMDLINE_PARSER is not set
# CONFIG_BLK_CMDLINE_PARSER is not set

#
# Partition Types
@@ -2565,6 +2565,7 @@ CONFIG_I2C_MUX=m
#
CONFIG_I2C_MUX_PCA9541=m
CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_MUX_PINCTRL=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -2656,6 +2657,13 @@ CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PTP_1588_CLOCK=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PINCTRL=y

#
# Pin controllers
#
# CONFIG_PINMUX is not set
# CONFIG_PINCONF is not set
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIO_DEVRES=y
# CONFIG_GPIOLIB is not set
+10 −16
Original line number Diff line number Diff line
@@ -4,14 +4,11 @@
pkgname=''

post_install () {
  test -e "/usr/share/$pkgname/info" || return
  source /usr/share/$pkgname/info
  echo "==> Updating dependancy..."
  depmod ${KERNEL_BUILD}
  echo "==> Generationg init root filesystem..."
  mkinitcpio -p $pkgname
  if type -P grub-mkconfig >/dev/null; then
    echo "==> Updating grub2 configuration..."
    grub-mkconfig -o /boot/grub/grub.cfg
  if type -P kernel-install >/dev/null; then
    echo '==> Calling kernel-install'
    kernel-install add "${KERNEL_BUILD}" "/usr/lib/kernel/vmlinuz-${KERNEL_BUILD}"
  fi
}

@@ -26,18 +23,15 @@ post_upgrade() {
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 /usr/lib/modules/${KERNEL_BUILD}
  if type -P kernel-install >/dev/null; then
    echo '==> Removing with kernel-install'
    kernel-install remove "${KERNEL_BUILD}" "/usr/lib/kernel/vmlinuz-${KERNEL_BUILD}"
  fi
}

post_remove() {
  if type -P grub-mkconfig >/dev/null; then
    echo "==> Updating grub2 configuration..."
    LANG=C grub-mkconfig -o /boot/grub/grub.cfg
  fi
  echo "==> Cleaning remaining kernel modules"
  rm -rvf /usr/lib/modules/${KERNEL_BUILD}
}

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