linux-ec2: upgrade to 4.8.15

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

7 files changed, 81 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8823cd9f6616..453142661e22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.1
-# Tue Nov  1 02:08:28 UTC 2016
+# Sat Dec 17 22:17:53 UTC 2016
 pkgbase = linux-ec2
 	pkgdesc = Linux kernel for Amazon EC2
-	pkgver = 4.8.6
+	pkgver = 4.8.15
 	pkgrel = 1
 	url = http://git.uplinklabs.net/snoonan/projects/archlinux/ec2/ec2-packages.git/tree/linux-ec2
 	arch = i686
@@ -13,29 +13,57 @@ pkgbase = linux-ec2
 	makedepends = kmod
 	makedepends = inetutils
 	makedepends = bc
+	makedepends = libelf
 	options = !strip
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.xz
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.sign
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.6.xz
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.6.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.15.xz
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.15.sign
 	source = config.i686
 	source = config.x86_64
+	source = 99-linux.hook
 	source = linux.preset
 	source = 0001-xhci-demote-annoying-warning.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a
 	sha256sums = SKIP
-	sha256sums = 3ac0ea443ac8a7aa40f8d5ce8ec33b84abbad4dbfc567c7699df728c2c21df37
+	sha256sums = cdeff3a6e0dc3d6189d1b1d4d6318f0942b9a28409491cf65592879e4c42b1f7
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 7460d523b7c5af4d7dcd87236ec708c70511a62cd54c400dc8b770e8c79cbfcb
+	sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0
+	sha256sums = fc21139a4b77d2739f4aaa4e3d35229c395c311de89709904de15f653b8991fd
 	sha256sums = 4fc90b07eb212f00132cdde0a5318b1c89c51c97c0af3dcc32c494f4b06000f3
 
 pkgname = linux-ec2
+	pkgdesc = The linux-ec2 kernel and modules
+	install = linux.install
+	depends = coreutils
+	depends = linux-firmware
+	depends = kmod
+	depends = mkinitcpio>=0.7
+	optdepends = crda: to set the correct wireless channels of your country
+	provides = kernel26-ec2=4.8.15
+	provides = linux=4.8.15
+	conflicts = kernel26-ec2
+	replaces = kernel26-ec2
+	options = strip
+	options = debug
+	backup = etc/mkinitcpio.d/linux-ec2.preset
 
 pkgname = linux-ec2-headers
+	pkgdesc = Header files and scripts for building modules for linux-ec2 kernel
+	provides = kernel26-ec2-headers=4.8.15
+	provides = linux-headers=4.8.15
+	conflicts = kernel26-ec2-headers
+	replaces = kernel26-ec2-headers
+	options = !strip
 
 pkgname = linux-ec2-docs
+	pkgdesc = Kernel hackers manual - HTML documentation that comes with the linux-ec2 kernel
+	provides = kernel26-ec2-docs=4.8.15
+	provides = linux-docs=4.8.15
+	conflicts = kernel26-ec2-docs
+	replaces = kernel26-ec2-docs
 
diff --git a/99-linux.hook b/99-linux.hook
new file mode 100644
index 000000000000..9851151995bc
--- /dev/null
+++ b/99-linux.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-%PKGBASE%
+Target = usr/lib/initcpio/*
+
+[Action]
+Description = Updating %PKGBASE% initcpios
+When = PostTransaction
+Exec = /usr/bin/mkinitcpio -p %PKGBASE%
diff --git a/PKGBUILD b/PKGBUILD
index ac2e6914e794..4b34b4c82b0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgbase=linux-ec2
 _srcname=linux-4.8
-pkgver=4.8.6
+pkgver=4.8.15
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://git.uplinklabs.net/snoonan/projects/archlinux/ec2/ec2-packages.git/tree/linux-ec2"
 license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
@@ -15,21 +15,23 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
         # the main kernel config files
         'config.i686' 'config.x86_64'
+        # pacman hook for initramfs regeneration
+        '99-linux.hook'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         '0001-xhci-demote-annoying-warning.patch'
         )
 sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
             'SKIP'
-            '3ac0ea443ac8a7aa40f8d5ce8ec33b84abbad4dbfc567c7699df728c2c21df37'
+            'cdeff3a6e0dc3d6189d1b1d4d6318f0942b9a28409491cf65592879e4c42b1f7'
             'SKIP'
             'SKIP'
             'SKIP'
-            '7460d523b7c5af4d7dcd87236ec708c70511a62cd54c400dc8b770e8c79cbfcb'
+            '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
+            'fc21139a4b77d2739f4aaa4e3d35229c395c311de89709904de15f653b8991fd'
             '4fc90b07eb212f00132cdde0a5318b1c89c51c97c0af3dcc32c494f4b06000f3')
-
 validpgpkeys=(
-              'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
+              'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
              )
 
@@ -106,19 +108,17 @@ _package() {
   install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
   # set correct depmod command for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \
+    "${startdir}/${install}" > "${startdir}/${install}.pkg"
   true && install=${install}.pkg
-  sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${install}"
-
-  sed \
-    -e "1s|'linux.*'|'${pkgbase}'|" \
-    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
-    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
-    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+  # install mkinitcpio preset file for kernel
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
+    install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+  # install pacman hook for initramfs regeneration
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
+    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
 
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
@@ -285,6 +285,7 @@ pkgdesc="Linux kernel for Amazon EC2"
 true && pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
+    $(declare -f "_package${_p#${pkgbase}}")
     _package${_p#${pkgbase}}
   }"
 done
diff --git a/config.i686 b/config.i686
index 14cbdec410b3..5a4ec0086d95 100644
--- a/config.i686
+++ b/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.1-1 Kernel Configuration
+# Linux/x86 4.8.15-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -3601,7 +3601,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_HYPERV is not set
+CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/config.x86_64 b/config.x86_64
index a2f91d36866e..a943da7bf8bf 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.1-1 Kernel Configuration
+# Linux/x86 4.8.15-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -3660,7 +3660,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_HYPERV is not set
+CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/linux.install b/linux.install
index 449a9cde7736..046277584140 100644
--- a/linux.install
+++ b/linux.install
@@ -1,65 +1,27 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=
-KERNEL_VERSION=
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
+  depmod %KERNVER%
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
+  depmod %KERNVER%
+
+  if [ $(vercmp $2 3.13) -lt 0 ]; then
+    echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+    echo ">>>          In order to use your keyboard during early init, you MUST"
+    echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+  fi
 }
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-%PKGBASE%.img
+  rm -f boot/initramfs-%PKGBASE%-fallback.img
 }
diff --git a/linux.preset b/linux.preset
index 36d2847ec851..0b574f5cfb31 100644
--- a/linux.preset
+++ b/linux.preset
@@ -1,10 +1,10 @@
-# mkinitcpio preset file for the 'linux-ec2' package
+# mkinitcpio preset file for the '%PKGBASE%' package
 
 ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-ec2"
+ALL_kver="/boot/vmlinuz-%PKGBASE%"
 
 PRESETS=('default')
 
 #default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-ec2.img"
+default_image="/boot/initramfs-%PKGBASE%.img"
 default_options="-S autodetect"