update to pkgver 26-1 kernel version 4.15.0-rc6

4 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9cb7cc85871b..544a1118d9b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Dec 17 14:04:10 UTC 2017
+# Tue Jan  9 21:37:45 UTC 2018
 pkgbase = linux-x205ta-sound
 	pkgdesc = Pre-built linux kernel with Pierre Bossart's patches to get the ASUS x205ta's Realtek RT5648 sound card working. Binary provided by harryharryharry.
-	pkgver = 24
+	pkgver = 26
 	pkgrel = 1
 	url = https://ubuntuforums.org/showthread.php?t=2254322&p=13595504#post13595504
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = linux-x205ta-sound
 	depends = linux-firmware
 	depends = kmod
 	depends = mkinitcpio>=0.7
-	source = ftp://x205ta.myftp.org:1337/kernel/kernel-64bit-4.14.0-rc7-sound-24.tar
-	sha256sums = 25797436fee9a995b3d1e9d0a0ffb70f2f1f06ab19676e7a5914ae499464971b
+	source = http://x205ta.myftp.org:1337/kernel/kernel-64bit-4.15.0-rc6-sound-26.tar
+	sha256sums = be50a4ab4c8a8af50e58371f7d0d14f685d500a37dce418d02a2385fc93a0d53
 
 pkgname = linux-x205ta-sound
 
diff --git a/60-linux.hook b/60-linux.hook
new file mode 100644
index 000000000000..b33873c854fb
--- /dev/null
+++ b/60-linux.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/%KERNVER%/*
+Target = usr/lib/modules/%EXTRAMODULES%/*
+
+[Action]
+Description = Updating %PKGBASE% module dependencies...
+When = PostTransaction
+Exec = /usr/bin/depmod %KERNVER%
diff --git a/PKGBUILD b/PKGBUILD
index 526a4a378d1d..7659e3fc4247 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Pieter Lenaerts <pieter dot aj dot lenaerts gmail>
 pkgname=linux-x205ta-sound
-pkgver=24
+pkgver=26
 pkgrel=1
-_kernver=4.14.0-rc7
+_kernver=4.15.0-rc6
 _kernel="vmlinuz-${_kernver}-sound-${pkgver}"
 _moddir="${_kernver}-sound-${pkgver}"
+_kernbase="${_kernver%.*}"
 pkgdesc="Pre-built linux kernel with Pierre Bossart's patches to get the ASUS x205ta's Realtek RT5648 sound card working. Binary provided by harryharryharry."
 arch=(x86_64)
 url="https://ubuntuforums.org/showthread.php?t=2254322&p=13595504#post13595504"
@@ -20,9 +21,9 @@ backup=()
 options=()
 install=
 changelog=
-source=("ftp://x205ta.myftp.org:1337/kernel/kernel-64bit-${_kernver}-sound-${pkgver}.tar")
+source=("http://x205ta.myftp.org:1337/kernel/kernel-64bit-${_kernver}-sound-${pkgver}.tar")
 noextract=()
-sha256sums=("25797436fee9a995b3d1e9d0a0ffb70f2f1f06ab19676e7a5914ae499464971b")
+sha256sums=('be50a4ab4c8a8af50e58371f7d0d14f685d500a37dce418d02a2385fc93a0d53')
 validpgpkeys=()
 
 prepare() {
@@ -31,7 +32,7 @@ prepare() {
 }
 
 package() {
-	mkdir -p "${pkgdir}"/{boot,usr/lib/modules,usr/lib/firmware/brcm}
+	mkdir -p "${pkgdir}"/{boot,usr/lib/modules,usr/lib/modules/extramodules-${_kernbase}-sound,usr/lib/firmware/brcm}
 	cp ${srcdir}/boot/${_kernel} ${pkgdir}/boot/${_kernel}
 	cp -r ${srcdir}/lib/modules/${_moddir} ${pkgdir}/usr/lib/modules/
 	cp -r ${srcdir}/lib/firmware/brcm/brcmfmac43340-sdio.txt ${pkgdir}/usr/lib/firmware/brcm/
@@ -39,9 +40,14 @@ package() {
 	local _subst="
 	s|%KERNEL%|${_kernel}|g
 	s|%INITRD%|${_kernel/vmlinuz/initramfs}|g
+	s|%KERNVER%|${_moddir}|g
+	s|%EXTRAMODULES%|extramodules-${_kernbase}-sound|g
+	s|%PKGBASE%|${pkgname}|g
 	"
 
 	# install pacman hook
+  	sed "${_subst}" ../60-linux.hook |
+		install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgname}.hook"
 	sed "${_subst}" ../90-linux.hook |
 		install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgname}.hook"
 	# install mkinitcpio preset
diff --git a/linux.preset b/linux.preset
index b09102751893..e9d82ab133ad 100644
--- a/linux.preset
+++ b/linux.preset
@@ -6,7 +6,7 @@ ALL_kver="/boot/%KERNEL%"
 PRESETS=('default' 'fallback')
 
 #default_config="/etc/mkinitcpio.conf"
-default_image="/boot/%INITRD%"
+default_image="/boot/%INITRD%.img"
 #default_options=""
 
 #fallback_config="/etc/mkinitcpio.conf"