updpkg: libre/linux-libre-pck 5.18.14.pck1-1

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 69 insertions, 17 deletions

diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index ca9cb9896..51869b1f1 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -13,9 +13,13 @@ _replacesoldkernels=()
 _replacesoldmodules=()
 
 pkgbase=linux-libre-pck
-pkgver=5.17.8.pck1
+pkgver=5.18.14.pck1
 pkgrel=1
-pkgdesc='Linux-libre PCK'
+pkgdesc='Linux-libre PCK (Parabola community kernel)'
+zenver="${pkgver//pck/zen}"
+aufsver=20220620
+rcnver=5.18.12
+rcnrel=armv7-x8
 url='https://wiki.parabola.nu/PCK'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
@@ -24,33 +28,73 @@ makedepends=(
   xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra
 )
 options=('!strip')
-_srcname=linux-5.17
+_srcname=linux-5.18
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign}
-  "https://repo.parabola.nu/other/pck/patches/${pkgver%.*}-gnu/patch-${pkgver%.*}-gnu-${pkgver##*.}.patch"{,.sig}
+  "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
+  "https://framagit.org/Megver83/zen-patches/-/raw/main/patch-${zenver//.zen/-zen}.diff"
+  #"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-${_srcname##*-}.patch"
+  "https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/${_srcname##*-}/aufs-patches/0001-aufs-${aufsver}.patch"
   config.i686 config.x86_64 config.armv7h    # the main kernel config files
   linux-armv7h.preset                        # armv7h preset file for mkinitcpio ramdisk
+
+  # maintain the TTY over USB disconnects
+  # http://www.coreboot.org/EHCI_Gadget_Debug
+  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
+  0002-fix-Atmel-maXTouch-touchscreen-support.patch
 )
 source_i686=(
   # avoid using zstd compression in ultra mode (exhausts virtual memory)
   no-ultra-zstd.patch
 )
+source_armv7h=(
+  # RCN patch (CM3 firmware deblobbed and bloatware removed)
+  "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig}
+  # Arch Linux ARM patches
+  0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+  0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+  0003-fix-mvsdio-eMMC-timing.patch
+  0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+  0005-set-default-cubietruck-led-triggers.patch
+  0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+  0007-USB-Armory-MkII-support.patch
+)
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
-sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c'
+sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'
+            'SKIP'
+            '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34'
+            'SKIP'
+            '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
-            '71ba9ae3f75d72d2d86cc8cab1df463725e00088fb93b09553066a9b968d3a32abed77fac6011433377ac2970c8149a28e85ed25429da7dec56b47ba871cd4ae'
+            '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            'df322ff9c3fad418e875f8827cdd0a8f6a13a55c4656b87300f6a592ba56724e30c303ed94eb2d69eb95379c3c643ee5ff84771a03911efae7e212b8fa5d48bd'
+            '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
             'SKIP'
-            '50de63086aef1cd4278fc7088ae537ae6eb4994a4e8d09edbc957ff90e7232b85ce37928117589a1a619ded90eb584b770579e6efc5d5b2cc3e4f6c6cd96a71a'
-            'f18d743a28afde8af4701853dfb59bfe6f3789756f9ffa3658cb2c75a8af59cd30ae125b74882529ad81b2c399e42ea56fabdc1e4354d5ce2b84d8ac2d96a51f'
-            'e92981457f0747cf9b595557459740155188b80e3908eb5cd35579c647bcaddc5be8376a2b4c47b984f52009c1764789bc9a009fb9b18207d524c32e8ad644e0'
-            '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b')
+            'e86399efba97b385cb748e1f5e41dd777d9ce3c7a0affb33bfa6f3a3e7ca1c6d2b3a50b3341f1132cdd2be9590e817b82e73883698e50447e45ddc490c6b52a7'
+            'f47bcdd8d32b0b2ff1c58d552e2fe83047b6aa183ba03670dfd4e0f1f27eec6808eab53904847b316d8e31c85b4d63a7f365c6a91008a6d6cbcf89639073a880'
+            '1f247490ca428c372194838919ba049e61f357249419998692c3a20cc6728d509b079f39f3edcc0f76342c437a350d28eefafe8aa743477cecbfff1bb43ea8bb'
+            '88369e64e767fe490c22a221a55a5aa51377995897b7462320d53d64c9e83cb57fba3ea8ec591f15263905f86dc9f23cca0492cbb6a562aeb1a0fab0f8e447cf'
+            '5bb7e9ed49793941ad078a4a8e1f711af0e47f2707fa56da9c913a0069a913264b620858a5ceb36d4fa6cd9788e41be42ea81e1626762035ded5b28b0c299792'
+            '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'
+            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
+            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
 sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')
+sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9'
+                   'SKIP'
+                   '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3'
+                   '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78'
+                   '5d2f228151148358b07744a9c09cf6e2420c4284735d4ce7dc925a1deb3970298cc95dd766ee13e094e2853847b016c3ebc2d61bb423e370b4bc33938367ebda'
+                   'a206c3dc678839831d72eefee997cbe1bb877af7f6f90dfe5cab0bd7d9686a3b13a2aba74c8fbe5533872e12306ac9ea1b5eede18ef3cf10b8d01361afd67e9c'
+                   'a1072dd808c63592178cc01ea3c36de946f277fb451b13c34f51a5ac134cde4a8a4d57487132af1c6d7b5820842cdda9dc4edb3da85d33bd02bf87a032c3263a'
+                   '85b2e16a930b8066990c42f973d386dc3c6d62fdf3d1289bbb51df3df296c26f30051162fba49a42d38f71f05de926aa8c065097f14bd8e9f8e28a52949ead00'
+                   '2e99582d8b670b6c6b27add14b60e957cbcf9cd6aae40491bd9dea6ac455c0ade0bbee21e3bdfb5e06ce83ad27c5a788404b05bf7ac93831ca18d2e60a67017c')
 
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
 _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")
@@ -73,11 +117,20 @@ prepare() {
     patch -Np1 < "../patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu"
   fi
 
+  echo "Adding freedo as boot logo..."
+  install -m644 -t drivers/video/logo \
+    ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
+
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel
   echo "${pkgbase#linux-libre}" > localversion.20-pkgname
 
+  echo "Applying Zen Patch..."
+  sed -e "/^+EXTRAVERSION = -zen/s/zen/pck/" \
+      -e "/^[-+]EXTRAVERSION =/s/= */= -gnu/" \
+      "../patch-${zenver//.zen/-zen}.diff" | patch -Np1 -i -
+
   if [ "$CARCH" = "armv7h" ]; then
     local src_armv7h
     for src_armv7h in "${source_armv7h[@]}"; do
@@ -120,8 +173,7 @@ prepare() {
 
 build() {
   cd $_srcname
-  make all
-  make htmldocs
+  make htmldocs all
 }
 
 _package() {
@@ -130,7 +182,7 @@ _package() {
   optdepends=('wireless-regdb: to set the correct wireless channels of your country'
               'linux-libre-firmware: firmware images needed for some devices')
   provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE VHBA-MODULE)
-  provides+=("${_replacesarchkernel[@]/%/=${pkgver//pck/zen}}" "LINUX-ABI_VERSION=${pkgver%.*}")
+  provides+=("${_replacesarchkernel[@]/%/=$zenver}" "LINUX-ABI_VERSION=${pkgver%.*}")
   conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
@@ -168,7 +220,7 @@ _package() {
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
   depends=(pahole)
-  provides=("${_replacesarchkernel[@]/%/-headers=${pkgver//pck/zen}}")
+  provides=("${_replacesarchkernel[@]/%/-headers=$zenver}")
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
 
@@ -180,7 +232,7 @@ _package-headers() {
     localversion.* version vmlinux
   install -Dt "$builddir/kernel" -m644 kernel/Makefile
   install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile
-  if [[ $CARCH = i686 ]]; then
+  if [ "$CARCH" = "i686" ]; then
     install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu
   fi
   cp -t "$builddir" -a scripts
@@ -271,7 +323,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Documentation for the $pkgdesc kernel"
-  provides=("${_replacesarchkernel[@]/%/-docs=${pkgver//pck/zen}}")
+  provides=("${_replacesarchkernel[@]/%/-docs=$zenver}")
   conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
   replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")