Update prepare() on kernels PKGBUILDs

4 files changed, 49 insertions, 40 deletions

diff --git a/kernels/linux-libre-lts-xtreme/PKGBUILD b/kernels/linux-libre-lts-xtreme/PKGBUILD
index f173fbb58..5b7f63a7a 100644
--- a/kernels/linux-libre-lts-xtreme/PKGBUILD
+++ b/kernels/linux-libre-lts-xtreme/PKGBUILD
@@ -144,12 +144,12 @@ prepare() {
   
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
-  patch -p1 -i "${srcdir}/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch"
+  patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
 
   # fix Atmel maXTouch touchscreen support
   # https://labs.parabola.nu/issues/877
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
-  patch -p1 -i "${srcdir}/0002-fix-Atmel-maXTouch-touchscreen-support.patch"
+  patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
   cp -Tf ../config.$CARCH .config
 
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 3b1234cf9..528c159da 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -85,7 +85,7 @@ prepare() {
   
   # add freedo as boot logo
   install -m644 -t drivers/video/logo \
-    "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
+    ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -140,7 +140,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase^} kernel and modules"
+  pkgdesc="The ${pkgbase^} kernel and modules with PAE support (HIGHMEM64G)"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 51cfd5b02..867c43e25 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -131,7 +131,7 @@ prepare() {
   chmod +x tools/objtool/sync-check.sh  # GNU patch doesn't support git-style file mode
   
   # add realtime patch
-  patch -p1 -i "${srcdir}/patch-${_pkgver%-*}-${_rtpatchver}.patch"
+  patch -p1 -i ../patch-${_pkgver%-*}-${_rtpatchver}.patch
   rm localversion-rt
   
   if [ "${CARCH}" = "armv7h" ]; then
@@ -139,28 +139,28 @@ prepare() {
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
     # We are supporting AUFS in linux-libre-pck through PCK patch.
     # See https://wiki.parabola.nu/PCK for further details.
-    git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+    git apply -v ../rcn-libre-${_pkgver%-*}-${rcnrel}.patch
 
     # ALARM patches
-    patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
-    patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
-    patch -p1 -i "${srcdir}/0003-SMILE-Plug-device-tree-file.patch"
-    patch -p1 -i "${srcdir}/0004-fix-mvsdio-eMMC-timing.patch"
-    patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch"
-    patch -p1 -i "${srcdir}/0006-set-default-cubietruck-led-triggers.patch"
-    patch -p1 -i "${srcdir}/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch"
-    patch -p1 -i "${srcdir}/0008-disable-USB3-port-on-ODROID-XU.patch"
-    patch -p1 -i "${srcdir}/0009-ARM-dove-enable-ethernet-on-D3Plug.patch"
-    patch -p1 -i "${srcdir}/0010-power-add-power-sequence-library.patch"
-    patch -p1 -i "${srcdir}/0011-usb-core-add-power-sequence-handling-for-USB-devices.patch"
-    patch -p1 -i "${srcdir}/0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch"
-    patch -p1 -i "${srcdir}/0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch"
-    patch -p1 -i "${srcdir}/0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch"
+    patch -p1 -i ../0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+    patch -p1 -i ../0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+    patch -p1 -i ../0003-SMILE-Plug-device-tree-file.patch
+    patch -p1 -i ../0004-fix-mvsdio-eMMC-timing.patch
+    patch -p1 -i ../0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+    patch -p1 -i ../0006-set-default-cubietruck-led-triggers.patch
+    patch -p1 -i ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+    patch -p1 -i ../0008-disable-USB3-port-on-ODROID-XU.patch
+    patch -p1 -i ../0009-ARM-dove-enable-ethernet-on-D3Plug.patch
+    patch -p1 -i ../0010-power-add-power-sequence-library.patch
+    patch -p1 -i ../0011-usb-core-add-power-sequence-handling-for-USB-devices.patch
+    patch -p1 -i ../0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
+    patch -p1 -i ../0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
+    patch -p1 -i ../0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
   fi
   
   # add freedo as boot logo
   install -m644 -t drivers/video/logo \
-    "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
+    ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
   # security patches
 
@@ -172,6 +172,15 @@ prepare() {
 
   # https://bugs.archlinux.org/task/56711
   patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+  
+  # maintain the TTY over USB disconnects
+  # http://www.coreboot.org/EHCI_Gadget_Debug
+  patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+
+  # fix Atmel maXTouch touchscreen support
+  # https://labs.parabola.nu/issues/877
+  # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
+  patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
   cp -Tf ../config.$CARCH .config
 
diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index 2883dc8d7..653a802cf 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -129,31 +129,31 @@ prepare() {
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
     # We are supporting AUFS in linux-libre-pck through PCK patch.
     # See https://wiki.parabola.nu/PCK for further details.
-    git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+    git apply -v ../rcn-libre-${_pkgver%-*}-${rcnrel}.patch
 
     # ALARM patches
-    patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
-    patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
-    patch -p1 -i "${srcdir}/0003-SMILE-Plug-device-tree-file.patch"
-    patch -p1 -i "${srcdir}/0004-fix-mvsdio-eMMC-timing.patch"
-    patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch"
-    patch -p1 -i "${srcdir}/0006-set-default-cubietruck-led-triggers.patch"
-    patch -p1 -i "${srcdir}/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch"
-    patch -p1 -i "${srcdir}/0008-disable-USB3-port-on-ODROID-XU.patch"
-    patch -p1 -i "${srcdir}/0009-ARM-dove-enable-ethernet-on-D3Plug.patch"
-    patch -p1 -i "${srcdir}/0010-power-add-power-sequence-library.patch"
-    patch -p1 -i "${srcdir}/0011-usb-core-add-power-sequence-handling-for-USB-devices.patch"
-    patch -p1 -i "${srcdir}/0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch"
-    patch -p1 -i "${srcdir}/0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch"
-    patch -p1 -i "${srcdir}/0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch"
+    patch -p1 -i ../0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+    patch -p1 -i ../0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+    patch -p1 -i ../0003-SMILE-Plug-device-tree-file.patch
+    patch -p1 -i ../0004-fix-mvsdio-eMMC-timing.patch
+    patch -p1 -i ../0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+    patch -p1 -i ../0006-set-default-cubietruck-led-triggers.patch
+    patch -p1 -i ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+    patch -p1 -i ../0008-disable-USB3-port-on-ODROID-XU.patch
+    patch -p1 -i ../0009-ARM-dove-enable-ethernet-on-D3Plug.patch
+    patch -p1 -i ../0010-power-add-power-sequence-library.patch
+    patch -p1 -i ../0011-usb-core-add-power-sequence-handling-for-USB-devices.patch
+    patch -p1 -i ../0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
+    patch -p1 -i ../0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
+    patch -p1 -i ../0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
   fi
 
   # add hardened patches
-  patch -Np1 -i "${srcdir}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch"
+  patch -Np1 -i ../linux-hardened-${_pkgver%-*}.${_hardenedver}.patch
 
   # add freedo as boot logo
   install -m644 -t drivers/video/logo \
-    "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
+    ..logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -163,12 +163,12 @@ prepare() {
   
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
-  patch -p1 -i "${srcdir}/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch"
+  patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
 
   # fix Atmel maXTouch touchscreen support
   # https://labs.parabola.nu/issues/877
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
-  patch -p1 -i "${srcdir}/0002-fix-Atmel-maXTouch-touchscreen-support.patch"
+  patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
   cat ../config.${CARCH} - >.config <<END
 CONFIG_LOCALVERSION="${_kernelname}"