Update to 4.8.8-2

1 files changed, 349 insertions, 339 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3bcac000f692..7e6eb60d8db5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,11 +44,10 @@ _use_current=
 
 ### Do no edit below this line unless you know what you're doing
 
-pkgname=(linux-ck linux-ck-headers)
-_kernelname=-ck
+pkgbase=linux-ck
 _srcname=linux-4.8
 pkgver=4.8.8
-pkgrel=1
+pkgrel=2
 _ckpatchversion=7
 arch=('i686' 'x86_64')
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -58,360 +57,371 @@ options=('!strip')
 _ckpatchname="patch-4.8-ck${_ckpatchversion}"
 _gcc_patch='enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch'
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
-"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
-"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
-"http://ck.kolivas.org/patches/4.0/4.8/4.8-ck${_ckpatchversion}/${_ckpatchname}.xz"
-"http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
-'config.x86_64' 'config'
-'linux-ck.preset'
-'change-default-console-loglevel.patch')
+        "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
+        "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+        "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
+        "http://ck.kolivas.org/patches/4.0/4.8/4.8-ck${_ckpatchversion}/${_ckpatchname}.xz"
+        "http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
+        # the main kernel config files
+        'config.x86_64' 'config'
+        # pacman hook for initramfs regeneration
+        '99-linux.hook'
+        # standard config files for mkinitcpio ramdisk
+        'linux.preset'
+        'change-default-console-loglevel.patch'
+        )
 sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
             'SKIP'
             '588b6537cb660c2f7d483aca13f7509a5fc86c60df32c167d40e81d6c7ab4f9c'
             'SKIP'
             '65a9a1d4ab050fa3c4d5640197d8e72dbe99a4464c97b607003729047f5b96da'
             'e1b8c54c3b81dfd526e24287436b16ec523715e6b3b96156c3e57af035ade127'
-            'e63d02c41fbdeff8b5511177d5e67c8a6f5141951c21576d8dee4b0fc7bb03b4'
-            '58dba408b142d61d1ee2f59ad8a669e4e824e6838faa14597e0891f328342fea'
-            '2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
+            '20e96e210af16f072f49a4adfbd8a5312b8c898b01d7728442094b9e6a41b565'
+            'f4b4a9bd1fbe1cfd1daba04ce2a3974c51dbca91af5298ddf1f8f033ff6e5002'
+            '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
+            'a8cae3381e5669a70e20e36562d7433f61b13d24ad8c688cf6c398d5128e2c02'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
              )
 
+_kernelname=${pkgbase#linux}
 prepare() {
-	cd "${_srcname}"
-
-	# add upstream patch
-	patch -p1 -i "${srcdir}/patch-${pkgver}"
-
-	# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
-	# remove this when a Kconfig knob is made available by upstream
-	# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-	patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
-
-	# fix naming schema in EXTRAVERSION of ck patch set
-	sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"
-
-	msg "Patching source with ck patchset including MuQSS"
-	patch -Np1 -i "${srcdir}/${_ckpatchname}"
-
-	# Patch source to enable more gcc CPU optimizatons via the make nconfig
-	msg "Patching source with gcc patch to enable more cpus types"
-	patch -Np1 -i "${srcdir}/${_gcc_patch}"
-
-	# Clean tree and copy ARCH config over
-	msg "Running make mrproper to clean source tree"
-	make mrproper
-
-	if [ "${CARCH}" = "x86_64" ]; then
-		cat "${srcdir}/config.x86_64" > ./.config
-	else
-		cat "${srcdir}/config" > ./.config
-	fi
-	
-	# MuQSS is now a tickless scheduler. That means it can maintain its
-	# guaranteed low latency even in a build configured with a low Hz tick rate.
-	# To that end, it is now defaulting to 100Hz, and it is recommended to use
-	# this as the default choice for it leads to more throughput and power
-	# savings as well.
-	sed -i -e 's/^CONFIG_HZ_300=y/# CONFIG_HZ_300 is not set/' \
-		-i -e 's/^# CONFIG_HZ_100 is not set/CONFIG_HZ_100=y/' \
-		-i -e 's/^CONFIG_HZ=300/CONFIG_HZ=100/' .config
-	
-	### Optionally disable NUMA for 64-bit kernels only
-	# (x86 kernels do not support NUMA)
-	if [ -n "$_NUMAdisable" ]; then
-		if [ "${CARCH}" = "x86_64" ]; then
-			msg "Disabling NUMA from kernel config..."
-			sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \
-				-i -e '/CONFIG_AMD_NUMA=y/d' \
-				-i -e '/CONFIG_X86_64_ACPI_NUMA=y/d' \
-				-i -e '/CONFIG_NODES_SPAN_OTHER_NODES=y/d' \
-				-i -e '/# CONFIG_NUMA_EMU is not set/d' \
-				-i -e '/CONFIG_NODES_SHIFT=6/d' \
-				-i -e '/CONFIG_NEED_MULTIPLE_NODES=y/d' \
-				-i -e '/# CONFIG_MOVABLE_NODE is not set/d' \
-				-i -e '/CONFIG_USE_PERCPU_NUMA_NODE_ID=y/d' \
-				-i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
-		fi
-	fi
-
-	### Optionally use running kernel's config
-	# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
-	if [ -n "$_use_current" ]; then
-		if [[ -s /proc/config.gz ]]; then
-			msg "Extracting config from /proc/config.gz..."
-			# modprobe configs
-			zcat /proc/config.gz > ./.config
-		else
-			warning "Your kernel was not compiled with IKCONFIG_PROC!"
-			warning "You cannot read the current config!"
-			warning "Aborting!"
-			exit
-		fi
-	fi
-
-	if [ "${_kernelname}" != "" ]; then
-		sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-		sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-	fi
-
-	### Optionally enable BFQ as the default I/O scheduler
-	if [ -n "$_BFQ_enable_" ]; then
-		msg "Setting BFQ as default I/O scheduler..."
-		sed -i -e '/CONFIG_DEFAULT_IOSCHED/ s,cfq,bfq,' \
-			-i -e s'/CONFIG_DEFAULT_CFQ=y/# CONFIG_DEFAULT_CFQ is not set\nCONFIG_DEFAULT_BFQ=y/' ./.config
-	fi
-
-	# set extraversion to pkgrel
-	sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
-
-	# don't run depmod on 'make install'. We'll do this ourselves in packaging
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# get kernel version
-	msg "Running make prepare for you to enable patched options of your choosing"
-	make prepare
-
-	### Optionally load needed modules for the make localmodconfig
-	# See https://aur.archlinux.org/packages/modprobed-db
-		if [ -n "$_localmodcfg" ]; then
-		msg "If you have modprobed-db installed, running it in recall mode now"
-		if [ -e /usr/bin/modprobed-db ]; then
-			[[ ! -x /usr/bin/sudo ]] && echo "Cannot call modprobe with sudo.  Install via pacman -S sudo and configure to work with this user." && exit 1
-			sudo /usr/bin/modprobed-db recall
-		fi
-		msg "Running Steven Rostedt's make localmodconfig now"
-		make localmodconfig
-	fi
-
-	if [ -n "$_makenconfig" ]; then
-		msg "Running make nconfig"
-		make nconfig
-	fi
-
-	# rewrite configuration
-	yes "" | make config >/dev/null
-
-	# save configuration for later reuse
-	if [ "${CARCH}" = "x86_64" ]; then
-		cat .config > "${startdir}/config.x86_64.last"
-	else
-		cat .config > "${startdir}/config.last"
-	fi
+  cd "${srcdir}/${_srcname}"
+
+  # add upstream patch
+  patch -p1 -i "${srcdir}/patch-${pkgver}"
+
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+  # fix naming schema in EXTRAVERSION of ck patch set
+  sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"
+
+  msg "Patching source with ck patchset including MuQSS"
+  patch -Np1 -i "${srcdir}/${_ckpatchname}"
+
+  # Patch source to enable more gcc CPU optimizatons via the make nconfig
+  msg "Patching source with gcc patch to enable more cpus types"
+  patch -Np1 -i "${srcdir}/${_gcc_patch}"
+
+  # Clean tree and copy ARCH config over
+  msg "Running make mrproper to clean source tree"
+  make mrproper
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    cat "${srcdir}/config.x86_64" > ./.config
+  else
+    cat "${srcdir}/config" > ./.config
+  fi
+
+  # MuQSS is now a tickless scheduler. That means it can maintain its
+  # guaranteed low latency even in a build configured with a low Hz tick rate.
+  # To that end, it is now defaulting to 100Hz, and it is recommended to use
+  # this as the default choice for it leads to more throughput and power
+  # savings as well.
+  sed -i -e 's/^CONFIG_HZ_300=y/# CONFIG_HZ_300 is not set/' \
+    -i -e 's/^# CONFIG_HZ_100 is not set/CONFIG_HZ_100=y/' \
+    -i -e 's/^CONFIG_HZ=300/CONFIG_HZ=100/' .config
+
+  ### Optionally disable NUMA for 64-bit kernels only
+  # (x86 kernels do not support NUMA)
+  if [ -n "$_NUMAdisable" ]; then
+    if [ "${CARCH}" = "x86_64" ]; then
+      msg "Disabling NUMA from kernel config..."
+      sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \
+        -i -e '/CONFIG_AMD_NUMA=y/d' \
+        -i -e '/CONFIG_X86_64_ACPI_NUMA=y/d' \
+        -i -e '/CONFIG_NODES_SPAN_OTHER_NODES=y/d' \
+        -i -e '/# CONFIG_NUMA_EMU is not set/d' \
+        -i -e '/CONFIG_NODES_SHIFT=6/d' \
+        -i -e '/CONFIG_NEED_MULTIPLE_NODES=y/d' \
+        -i -e '/# CONFIG_MOVABLE_NODE is not set/d' \
+        -i -e '/CONFIG_USE_PERCPU_NUMA_NODE_ID=y/d' \
+        -i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
+    fi
+  fi
+
+  ### Optionally use running kernel's config
+  # code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
+  if [ -n "$_use_current" ]; then
+    if [[ -s /proc/config.gz ]]; then
+      msg "Extracting config from /proc/config.gz..."
+      # modprobe configs
+      zcat /proc/config.gz > ./.config
+    else
+      warning "Your kernel was not compiled with IKCONFIG_PROC!"
+      warning "You cannot read the current config!"
+      warning "Aborting!"
+      exit
+    fi
+  fi
+
+  if [ "${_kernelname}" != "" ]; then
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
+  fi
+
+  ### Optionally enable BFQ as the default I/O scheduler
+  if [ -n "$_BFQ_enable_" ]; then
+    msg "Setting BFQ as default I/O scheduler..."
+    sed -i -e '/CONFIG_DEFAULT_IOSCHED/ s,cfq,bfq,' \
+      -i -e s'/CONFIG_DEFAULT_CFQ=y/# CONFIG_DEFAULT_CFQ is not set\nCONFIG_DEFAULT_BFQ=y/' ./.config
+  fi
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+
+  # get kernel version
+  msg "Running make prepare for you to enable patched options of your choosing"
+  make prepare
+
+  ### Optionally load needed modules for the make localmodconfig
+  # See https://aur.archlinux.org/packages/modprobed-db
+    if [ -n "$_localmodcfg" ]; then
+    msg "If you have modprobed-db installed, running it in recall mode now"
+    if [ -e /usr/bin/modprobed-db ]; then
+      [[ ! -x /usr/bin/sudo ]] && echo "Cannot call modprobe with sudo.  Install via pacman -S sudo and configure to work with this user." && exit 1
+      sudo /usr/bin/modprobed-db recall
+    fi
+    msg "Running Steven Rostedt's make localmodconfig now"
+    make localmodconfig
+  fi
+
+  if [ -n "$_makenconfig" ]; then
+    msg "Running make nconfig"
+    make nconfig
+  fi
+
+  # rewrite configuration
+  yes "" | make config >/dev/null
+
+  # save configuration for later reuse
+  if [ "${CARCH}" = "x86_64" ]; then
+    cat .config > "${startdir}/config.x86_64.last"
+  else
+    cat .config > "${startdir}/config.last"
+  fi
 }
 
 build() {
-		cd "${_srcname}"
-		make ${MAKEFLAGS} LOCALVERSION= bzImage modules
-		msg "Running make bzImage and modules"
-}
+  cd "${srcdir}/${_srcname}"
 
-package_linux-ck() {
-	pkgdesc='Linux Kernel with the ck7 patchset featuring MuQSS CPU scheduler v0.140'
-	#_Kpkgdesc='Linux Kernel and modules with the ck7 patchset featuring MuQSS CPU scheduler v0.140'
-	#pkgdesc="${_Kpkgdesc}"
-	depends=('coreutils' 'linux-firmware' 'mkinitcpio>=0.7')
-	optdepends=('crda: to set the correct wireless channels of your country' 'nvidia-ck: nVidia drivers for linux-ck' 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
-	provides=("linux-ck=${pkgver}")
-	conflicts=('linux-ck-corex' 'linux-ck-p4' 'linux-ck-pentm' 'linux-ck-atom' 'linux-ck-core2' 'linux-ck-nehalem' 'linux-ck-sandybridge' 'linux-ck-ivybridge' 'linux-ck-broadwell' 'linux-ck-skylake' 'linux-ck-haswell' 'linux-ck-kx' 'linux-ck-k10' 'linux-ck-barcelona' 'linux-ck-bulldozer' 'linux-ck-piledriver' 'linux-ck-silvermont')
-	backup=("etc/mkinitcpio.d/linux-ck.preset")
-	install=linux-ck.install
-	#groups=('ck-generic')
-
-	cd "${_srcname}"
-
-	KARCH=x86
-
-	# get kernel version
-	_kernver="$(make LOCALVERSION= kernelrelease)"
-	_basekernel=${_kernver%%-*}
-	_basekernel=${_basekernel%.*}
-
-	mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
-	make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
-	cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-linux-ck"
-
-	# set correct depmod command for install
-	cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
-	true && install=${install}.pkg
-
-	sed \
-		-e  "s/KERNEL_NAME=.*/KERNEL_NAME=-ck/g" \
-		-e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-		-i "${startdir}/${install}"
-
-	# install mkinitcpio preset file for kernel
-	install -D -m644 "${srcdir}/linux-ck.preset" "${pkgdir}/etc/mkinitcpio.d/linux-ck.preset"
-	sed \
-		-e "1s|'linux.*'|'linux-ck'|" \
-		-e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-linux-ck\"|" \
-		-e "s|default_image=.*|default_image=\"/boot/initramfs-linux-ck.img\"|" \
-		-e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-linux-ck-fallback.img\"|" \
-		-i "${pkgdir}/etc/mkinitcpio.d/linux-ck.preset"
-
-	# remove build and source links
-	rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
-	# remove the firmware
-	rm -rf "${pkgdir}/lib/firmware"
-	# make room for external modules
-	ln -s "../extramodules-${_basekernel}${_kernelname:ck}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
-	# add real version for building modules and running depmod from post_install/upgrade
-	mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:ck}"
-	echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:ck}/version"
-
-	# Now we call depmod...
-	depmod -b "${pkgdir}" -F System.map "${_kernver}"
-
-	# move module tree /lib -> /usr/lib
-	mkdir -p "${pkgdir}/usr"
-	mv "${pkgdir}/lib" "${pkgdir}/usr/"
-
-	# add vmlinux
-	install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
+  make ${MAKEFLAGS} LOCALVERSION= bzImage modules
 }
 
+_package() {
+  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules with the ck7 patchset featuring MuQSS CPU scheduler v0.140"
+  #_Kpkgdesc="The ${pkgbase/linux/Linux} kernel and modules with the ck7 patchset featuring MuQSS CPU scheduler v0.140"
+  #pkgdesc="${_Kpkgdesc}"
+  depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
+  optdepends=('crda: to set the correct wireless channels of your country')
+  provides=("linux-ck=${pkgver}")
+  conflicts=('linux-ck-corex' 'linux-ck-p4' 'linux-ck-pentm' 'linux-ck-atom' 'linux-ck-core2' 'linux-ck-nehalem' 'linux-ck-sandybridge' 'linux-ck-ivybridge' 'linux-ck-broadwell' 'linux-ck-skylake' 'linux-ck-haswell' 'linux-ck-kx' 'linux-ck-k10' 'linux-ck-barcelona' 'linux-ck-bulldozer' 'linux-ck-piledriver' 'linux-ck-silvermont')
+  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
+  install=linux.install
+  #groups=('ck-generic')
+
+  cd "${srcdir}/${_srcname}"
+
+  KARCH=x86
+
+  # get kernel version
+  _kernver="$(make LOCALVERSION= kernelrelease)"
+  _basekernel=${_kernver%%-*}
+  _basekernel=${_basekernel%.*}
+
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+  make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
+  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
+
+  # set correct depmod command for install
+  sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \
+    "${startdir}/${install}" > "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+
+  # 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}
+  # remove the firmware
+  rm -rf "${pkgdir}/lib/firmware"
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
+
+  # Now we call depmod...
+  depmod -b "${pkgdir}" -F System.map "${_kernver}"
+
+  # move module tree /lib -> /usr/lib
+  mkdir -p "${pkgdir}/usr"
+  mv "${pkgdir}/lib" "${pkgdir}/usr/"
+
+  # add vmlinux
+  install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
+}
 
-package_linux-ck-headers() {
-	pkgdesc='Header files and scripts to build modules for linux-ck.'
-	#_Hpkgdesc='Header files and scripts to build modules for linux-ck.'
-	#pkgdesc="${_Hpkgdesc}"
-	depends=('linux-ck') # added to keep kernel and headers packages matched
-	provides=("linux-ck-headers=${pkgver}" "linux-headers=${pkgver}")
-	conflicts=('linux-ck-corex-headers' 'linux-ck-p4-headers' 'linux-ck-pentm-headers' 'linux-ck-atom-headers' 'linux-ck-core2-headers' 'linux-ck-nehalem-headers' 'linux-ck-sandybridge-headers' 'linux-ck-ivybridge-headers' 'linux-ck-haswell-headers' 'linux-ck-broadwell-headers' 'linux-ck-skylake-headers' 'linux-ck-kx-headers' 'linux-ck-k10-headers' 'linux-ck-barcelona-headers' 'linux-ck-bulldozer-headers' 'linux-ck-piledriver-headers' 'linux-ck-silvermont-headers')
-	#groups=('ck-generic')
-
-	install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
-
-	cd "${srcdir}/${_srcname}"
-	install -D -m644 Makefile \
-		"${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
-	install -D -m644 kernel/Makefile \
-		"${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile"
-	install -D -m644 .config \
-		"${pkgdir}/usr/lib/modules/${_kernver}/build/.config"
-
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
-
-	for i in acpi asm-generic config crypto drm generated keys linux math-emu \
-		media net pcmcia scsi soc sound trace uapi video xen; do
-	cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
-	done
-
-	# copy arch includes for external modules
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86"
-	cp -a arch/x86/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86/"
-
-	# copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
-	cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
-
-	# fix permissions on scripts dir
-	chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
-
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
-
-	cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-
-	if [ "${CARCH}" = "i686" ]; then
-		cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-	fi
-
-	cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
-
-	# add docbook makefile
-	install -D -m644 Documentation/DocBook/Makefile \
-	"${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
-
-	# add dm headers
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
-	cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
-
-	# add inotify.h
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux"
-	cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/"
-
-	# add wireless headers
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
-	cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
-
-	# add dvb headers for external modules
-	# in reference to:
-	# http://bugs.archlinux.org/task/9912
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
-	cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
-	# and...
-	# http://bugs.archlinux.org/task/11194
-	###
-	### DO NOT MERGE OUT THIS IF STATEMENT
-	### IT AFFECTS USERS WHO STRIP OUT THE DVB STUFF SO THE OFFICIAL ARCH CODE HAS A CP
-	### LINE THAT CAUSES MAKEPKG TO END IN AN ERROR
-	###
-	if [ -d include/config/dvb/ ]; then
-		mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
-		cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
-	fi
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	# in reference to:
-	# http://bugs.archlinux.org/task/13146
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
-	cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
-	cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
-
-	# add dvb headers
-	# in reference to:
-	# http://bugs.archlinux.org/task/20402
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
-	cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
-	cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
-	cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
-
-	# add xfs and shmem for aufs building
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
-	mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
-	# removed in 3.17 series
-	#cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
-
-	# copy in Kconfig files
-	for i in $(find . -name "Kconfig*"); do
-		mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
-		cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
-	done
-
-	# add objtool for external module building and enabled VALIDATION_STACK option
-	if [ -f tools/objtool/objtool ];  then
-		mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool"
-		cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/
-	fi
-
-	chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
-	find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;
-
-	# strip scripts directory
-	find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
-	case "$(file -bi "${binary}")" in
-	*application/x-sharedlib*) # Libraries (.so)
-		/usr/bin/strip ${STRIP_SHARED} "${binary}";;
-	*application/x-archive*) # Libraries (.a)
-		/usr/bin/strip ${STRIP_STATIC} "${binary}";;
-	*application/x-executable*) # Binaries
-		/usr/bin/strip ${STRIP_BINARIES} "${binary}";;
-	esac
-	done
-
-	 # remove unneeded architectures
-	 rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
-
-	 # remove a files already in linux-docs package
-	 rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-01"
-	 rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-02"
-	 rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.select-break"
+_package-headers() {
+  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+  #_Hpkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+  #pkgdesc="${_Hpkgdesc}"
+  depends=('linux-ck') # added to keep kernel and headers packages matched
+  provides=("linux-ck-headers=${pkgver}" "linux-headers=${pkgver}")
+  conflicts=('linux-ck-corex-headers' 'linux-ck-p4-headers' 'linux-ck-pentm-headers' 'linux-ck-atom-headers' 'linux-ck-core2-headers' 'linux-ck-nehalem-headers' 'linux-ck-sandybridge-headers' 'linux-ck-ivybridge-headers' 'linux-ck-haswell-headers' 'linux-ck-broadwell-headers' 'linux-ck-skylake-headers' 'linux-ck-kx-headers' 'linux-ck-k10-headers' 'linux-ck-barcelona-headers' 'linux-ck-bulldozer-headers' 'linux-ck-piledriver-headers' 'linux-ck-silvermont-headers')
+  #groups=('ck-generic')
+
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
+
+  cd "${srcdir}/${_srcname}"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/.config"
+
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
+
+  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+    media net pcmcia scsi soc sound trace uapi video xen; do
+    cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
+  done
+
+  # copy arch includes for external modules
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86"
+  cp -a arch/x86/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86/"
+
+  # copy files necessary for later builds, like nvidia and vmware
+  cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+  fi
+
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
+
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/"
+
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  ###
+  ### DO NOT MERGE OUT THIS IF STATEMENT
+  ### IT AFFECTS USERS WHO STRIP OUT THE DVB STUFF SO THE OFFICIAL ARCH CODE HAS A CP
+  ### LINE THAT CAUSES MAKEPKG TO END IN AN ERROR
+  ###
+  if [ -d include/config/dvb/ ]; then
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+    cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+  fi
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
+  # http://bugs.archlinux.org/task/13146
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
+
+  # add xfs and shmem for aufs building
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
+  # removed in 3.17 series
+  # cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
+
+  # copy in Kconfig files
+  for i in $(find . -name "Kconfig*"); do
+    mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
+  done
+
+  # add objtool for external module building and enabled VALIDATION_STACK option
+  if [ -f tools/objtool/objtool ];  then
+      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool"
+      cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/
+  fi
+
+  chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;
+
+  # strip scripts directory
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
+    esac
+  done
+
+  # remove unneeded architectures
+  rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+
+  # remove a files already in linux-docs package
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-01"
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-02"
+  rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.select-break"
 }
+
+pkgname=("${pkgbase}" "${pkgbase}-headers")
+for _p in ${pkgname[@]}; do
+  eval "package_${_p}() {
+    $(declare -f "_package${_p#${pkgbase}}")
+    _package${_p#${pkgbase}}
+  }"
+done
+
+# vim:set ts=8 sts=2 sw=2 et: