updpkg: libre/linux-libre-lts 4.19.91-1

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

2 files changed, 22 insertions, 82 deletions

diff --git a/libre/linux-libre-lts/0009-usb-dwc2-disable-power_down-on-rockchip-devices.patch b/libre/linux-libre-lts/0009-usb-dwc2-disable-power_down-on-rockchip-devices.patch
deleted file mode 100644
index a91facd17..000000000
--- a/libre/linux-libre-lts/0009-usb-dwc2-disable-power_down-on-rockchip-devices.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3379ffad8f5b3db47578cc4eadc3c0f22f7547f1 Mon Sep 17 00:00:00 2001
-From: Hal Emmerich <hal@halemmerich.com>
-Date: Thu, 19 Jul 2018 21:48:08 -0500
-Subject: [PATCH 9/9] usb: dwc2: disable power_down on rockchip devices
-
- The bug would let the usb controller enter partial power down,
- which was formally known as hibernate, upon boot if nothing was plugged
- in to the port. Partial power down couldn't be exited properly, so any
- usb devices plugged in after boot would not be usable.
-
- Before the name change, params.hibernation was false by default, so
- _dwc2_hcd_suspend() would skip entering hibernation. With the
- rename, _dwc2_hcd_suspend() was changed to use  params.power_down
- to decide whether or not to enter partial power down.
-
- Since params.power_down is non-zero by default, it needs to be set
- to 0 for rockchip devices to restore functionality.
-
- This bug was reported in the linux-usb thread:
- REGRESSION: usb: dwc2: USB device not seen after boot
-
- The commit that caused this regression is:
- 6d23ee9caa6790aea047f9aca7f3c03cb8d96eb6
-
-Signed-off-by: Hal Emmerich <hal@halemmerich.com>
----
- drivers/usb/dwc2/params.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
-index bf7052e037d6..09292dc977e4 100644
---- a/drivers/usb/dwc2/params.c
-+++ b/drivers/usb/dwc2/params.c
-@@ -81,6 +81,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
- 	p->host_perio_tx_fifo_size = 256;
- 	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
- 		GAHBCFG_HBSTLEN_SHIFT;
-+	p->power_down = 0;
- }
- 
- static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
--- 
-2.19.0
-
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index e1bebf070..202b4f5a4 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -14,23 +14,23 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre-lts
-pkgver=4.19.86_gnu
+pkgver=4.19.91
 pkgrel=1
 pkgdesc='LTS Linux-libre'
-rcnver=4.19.72
-rcnrel=armv7-x40
+rcnver=4.19.91
+rcnrel=armv7-x41
 url='https://linux-libre.fsfla.org/'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
 makedepends=(
-  xmlto kmod inetutils bc libelf
-  python-sphinx python-sphinx_rtd_theme graphviz imagemagick
+  bc kmod libelf
+  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
 )
 options=('!strip')
 _srcname=linux-4.19
 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//_/-}/patch-${_srcname##*-}-gnu-${pkgver//_/-}.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/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
   config.i686 config.x86_64 config.armv7h    # the main kernel config files
   linux-armv7h.preset                        # armv7h preset file for mkinitcpio ramdisk
@@ -43,18 +43,12 @@ source=(
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
   0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
-  # Arch's custom linux patches
+  # linux-lts patches
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 )
 source_armv7h=(
-  # armv7h patches, put in the source_armv7h variable just for a more comfortable loop patching
-
-  # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
-  # 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.
+  # 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
@@ -64,7 +58,6 @@ source_armv7h=(
   0006-set-default-cubietruck-led-triggers.patch
   0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
   0008-ARM-dove-enable-ethernet-on-D3Plug.patch
-  0009-usb-dwc2-disable-power_down-on-rockchip-devices.patch
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -72,7 +65,7 @@ validpgpkeys=(
 )
 sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293f1e38753ed681be289c51390e0e64b3e60ce0db0a3bfe1f94ee5c014579a3'
             'SKIP'
-            '794f00793a790b596adffa1e1423d62d62cc13d61551b99b544c3da2d2871ac91acb8b3d19f4e1078c4f486df07286a4d0485942cc2901a5e2d6c5a93b2e674d'
+            '95965d14ea55ee7c2ff345c31099466dee4e49972df2394a9b6a287d7635a295f033e66ad652b9f45cf6039136653621ac8ae6af67f85fc71b610bd78ff10659'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -87,7 +80,7 @@ sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
             '5f196378d50dd737d727e424d8f31b7fa8a6b92ba88f0a1467ef79bc37a097160da1fc1fd5cfb4b8983f36f2afdf27eb229ec61b35a15ac2343d660eb416a230')
-sha512sums_armv7h=('326ba9a9275bb76deb5d8a4fc129d048e8a0f62bb526da58a084d3413ce79f17ba107f64b84664d73919dd67c4e1cbf01388ab71dae9cee5a36728f17fe77323'
+sha512sums_armv7h=('eff5105aeb504c9faa6fc6564ff5e8d6ab58332316fb6ef68d4e34893d0203c578ba46d4178daf1dae94729de0d8d70b38562bbf228497b37716983ce4149e73'
                    'SKIP'
                    '60aa432465eb3ac10f565799d3dfecea21aaf08e83909c1161d9359e932626edbd1353e712d616c3d785c65a0f699e9c45df35bd9e86365c25399c6b2d45b9e4'
                    '86809feb5ae2759b449ec0cb7a6b3fb457874ed82a72dfda00607e8819c804a0714b5d6a17cbbba44996a36872224af42d1b85f1b3932f43bccb419041d25dc7'
@@ -96,8 +89,7 @@ sha512sums_armv7h=('326ba9a9275bb76deb5d8a4fc129d048e8a0f62bb526da58a084d3413ce7
                    '054e98a2d1ea83cece1fe55ae087b282f25593022f252c74612d4aeb2a547f84ea626e3d982098ca798271af55f3b733ac2aea2fc0d9cad031802d2901dfe4ca'
                    '4433f9e780a72347313916c8a9cbcbce3a8c40e1b299e887dc748d257879fb5fab8f1683936339f73a4d4b4ef668b1ed6cc0d9a19ed4bd99039a1613ac08610e'
                    'd1361d23ae79599e3fa94cba206bd40764f9eee0c584e639af13828dabb7f0dfa361792c098b5afae0bb350407b2dc47a1d67580daeade7a4f3e3e55e42c8470'
-                   'c1653f91067d31801a23450175e47968add147477caf20aec6092831739641312f4ad995af43c7e55545007279016b5f62a0720d31e4591b4421a65b8bd5b398'
-                   'a123747792417d3760ca40d7f913c2cdd194da2ea5778352eedebc80097b7b8dce4428a8fe8bd75cab92972f599c25bcf18a740856fc2990351234b0d7ebf9f5')
+                   'c1653f91067d31801a23450175e47968add147477caf20aec6092831739641312f4ad995af43c7e55545007279016b5f62a0720d31e4591b4421a65b8bd5b398')
 
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
 _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")
@@ -115,9 +107,9 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 prepare() {
   cd $_srcname
 
-  if [ "${_srcname##*-}-gnu" != "${pkgver//_/-}" ]; then
+  if [ "${_srcname##*-}" != "$pkgver" ]; then
     msg2 "Applying upstream patch..."
-    patch -p1 -i ../patch-${_srcname##*-}-gnu-${pkgver//_/-}
+    patch -Np1 -i ../patch-${_srcname##*-}-gnu-$pkgver-gnu
   fi
 
   msg2 "Adding freedo as boot logo..."
@@ -171,7 +163,7 @@ _package() {
   depends=(coreutils kmod initramfs)
   optdepends=('crda: to set the correct wireless channels of your country'
               'linux-libre-firmware: firmware images needed for some devices')
-  provides=("${_replacesarchkernel[@]/%/=${pkgver%%_*}}" "LINUX-ABI_VERSION=${pkgver%%_*}")
+  provides=("${_replacesarchkernel[@]/%/=$pkgver}" "LINUX-ABI_VERSION=$pkgver")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
@@ -210,8 +202,8 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for $pkgdesc kernel"
-  provides=("${_replacesarchkernel[@]/%/-headers=${pkgver%%_*}}")
+  pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+  provides=("${_replacesarchkernel[@]/%/-headers=$pkgver}")
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
 
@@ -315,8 +307,8 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hacker's manual for the $pkgdesc kernel"
-  provides=("${_replacesarchkernel[@]/%/-docs=${pkgver%%_*}}")
+  pkgdesc="Documentation for the $pkgdesc kernel"
+  provides=("${_replacesarchkernel[@]/%/-docs=$pkgver}")
   conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
   replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
 
@@ -324,20 +316,12 @@ _package-docs() {
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
 
   msg2 "Installing documentation..."
-  mkdir -p "$builddir"
-  cp -t "$builddir" -a Documentation
-
-  msg2 "Removing unneeded files..."
-  rm -rv "$builddir"/Documentation/{,output/}.[^.]*
-
-  msg2 "Moving HTML docs..."
   local src dst
   while read -rd '' src; do
-    dst="$builddir/Documentation/${src#$builddir/Documentation/output/}"
-    mkdir -p "${dst%/*}"
-    mv "$src" "$dst"
-    rmdir -p --ignore-fail-on-non-empty "${src%/*}"
-  done < <(find "$builddir/Documentation/output" -type f -print0)
+    dst="${src#Documentation/}"
+    dst="$builddir/Documentation/${dst#output/}"
+    install -Dm644 "$src" "$dst"
+  done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
 
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/share/doc"