diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | 90-linux.hook | 2 | ||||
| -rw-r--r-- | PKGBUILD | 24 | ||||
| -rw-r--r-- | config.armv7h | 4 | ||||
| -rw-r--r-- | config.i686 | 5 | ||||
| -rw-r--r-- | config.x86_64 | 5 | ||||
| -rw-r--r-- | linux.install | 2 |
7 files changed, 39 insertions, 33 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-libre - pkgver = 4.19.2_gnu + pkgver = 4.19.5_gnu pkgrel = 1 url = https://linux-libre.fsfla.org/ arch = i686 @@ -16,8 +16,8 @@ pkgbase = linux-libre options = !strip source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19-gnu/linux-libre-4.19-gnu.tar.xz source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19-gnu/linux-libre-4.19-gnu.tar.xz.sign - source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.2-gnu/patch-4.19-gnu-4.19.2-gnu.xz - source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.2-gnu/patch-4.19-gnu-4.19.2-gnu.xz.sign + source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.5-gnu/patch-4.19-gnu-4.19.5-gnu.xz + source = https://linux-libre.fsfla.org/pub/linux-libre/releases/4.19.5-gnu/patch-4.19-gnu-4.19.5-gnu.xz.sign source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm @@ -30,8 +30,8 @@ pkgbase = linux-libre source = 60-linux.hook source = 90-linux.hook source = linux.preset - source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.2/rcn-libre-4.19.2-armv7-x5.patch - source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.2/rcn-libre-4.19.2-armv7-x5.patch.sig + source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.5/rcn-libre-4.19.5-armv7-x9.patch + source = https://repo.parabola.nu/other/rcn-libre/patches/4.19.5/rcn-libre-4.19.5-armv7-x9.patch.sig source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch source = 0003-SMILE-Plug-device-tree-file.patch @@ -48,7 +48,7 @@ pkgbase = linux-libre validpgpkeys = 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 sha512sums = 5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293f1e38753ed681be289c51390e0e64b3e60ce0db0a3bfe1f94ee5c014579a3 sha512sums = SKIP - sha512sums = a624123e9d51d9251c9bbb4e498f503ad1f41a5af241173e02ff53974142c8155ebb2538aed0984756b6de04acf1d0c8778969ae47e3063a0d1c6b87d86c11ea + sha512sums = dbb9b21c9c89e199ea6e719287f3ef1b7c07dfbda55108216499dfd1f981d80777dde191132417502772a25615511e9ae58a3f7efcf2f023d6a41d734a3099a9 sha512sums = SKIP sha512sums = 13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3 sha512sums = SKIP @@ -56,13 +56,13 @@ pkgbase = linux-libre sha512sums = SKIP sha512sums = 7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78 sha512sums = SKIP - sha512sums = 28fb502df94cd2464956f0dbb804bc53dbb9b5a4a593295ac4438011ad8d1bc4fe31dd72805ebd4c385f8d98b19e3ffdaa086ea969222e27177c844247fa20b5 - sha512sums = 4ed343f0188cdeb920fa958f544b4dd5c580e86bc12a1c72d958d9914792ecdcdd28c2534192fa8ca6d2853bc1b6c3539a236bab5f20be69aecb0c8705542f2e - sha512sums = dbd2fedf4064630cb9f41105f81b55062ee06a20f77bbd3746c162f7f548342526b18d475b8c795f5b7058d3a828a555ad3614a81fcb82157e64b56010c5ea12 + sha512sums = c8551c0c8a54b36893a551e1d9a1cbfa1c65e95f4ff34ec705108120db71c01a329f81a0a79b8e6dc75f9dcb606d640402cd8972dfa7538e0dda8e05017e750a + sha512sums = 4688945b99d1c47766d485641c3a367d3485d0361b32d21d48dcd00d28a61ffd84a3120b7ff5f02aabb783dc74a919f6aabcc02dfb4a2eabc570facc2711aa0c + sha512sums = aa5f9c6f1738614e5de8b56ef5b87f9e0070bf450b83b0fd6e3b627623d6d55575598e7cc26e7a218648dc16c939a8c1ab6d242024b49d1adf9f33e5971c5338 sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a - sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44 + sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf - sha512sums = e29ed94922d26f99ef62b8e93357e1a5e76a0a6038aaebb1ce78f36f8b43fdb8414010da874fcef9f2440359168a420c76471bffcb0fa60620b69b9cdecffe01 + sha512sums = fa32060ea7a44b94ce8ddc0c204a2ef1ec58551dfa20f94cd0237218c605e23783ff5aa0d2f802c40e58cef1502f0a770e34ac3302c40b5fba46d71ea9f75529 sha512sums = SKIP sha512sums = 60aa432465eb3ac10f565799d3dfecea21aaf08e83909c1161d9359e932626edbd1353e712d616c3d785c65a0f699e9c45df35bd9e86365c25399c6b2d45b9e4 sha512sums = 86809feb5ae2759b449ec0cb7a6b3fb457874ed82a72dfda00607e8819c804a0714b5d6a17cbbba44996a36872224af42d1b85f1b3932f43bccb419041d25dc7 @@ -85,21 +85,21 @@ pkgname = linux-libre depends = kmod depends = mkinitcpio optdepends = crda: to set the correct wireless channels of your country - provides = linux=4.19.2 - provides = LINUX-ABI_VERSION=4.19.2 + provides = linux=4.19.5 + provides = LINUX-ABI_VERSION=4.19.5 conflicts = linux replaces = linux backup = etc/mkinitcpio.d/linux-libre.preset pkgname = linux-libre-headers pkgdesc = Header files and scripts for building modules for Linux-libre kernel - provides = linux-headers=4.19.2 + provides = linux-headers=4.19.5 conflicts = linux-headers replaces = linux-headers pkgname = linux-libre-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel - provides = linux-docs=4.19.2 + provides = linux-docs=4.19.5 conflicts = linux-docs replaces = linux-docs diff --git a/90-linux.hook b/90-linux.hook index be0d886539f4..fca45abe1a62 100644 --- a/90-linux.hook +++ b/90-linux.hook @@ -2,7 +2,7 @@ Type = File Operation = Install Operation = Upgrade -Target = boot/vmlinuz-%PKGBASE% +Target = usr/lib/modules/%KERNVER%/vmlinuz Target = usr/lib/initcpio/* [Action] @@ -13,7 +13,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _srcbasever=4.19-gnu -_srcver=4.19.2-gnu +_srcver=4.19.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -23,7 +23,7 @@ _srcname=linux-${_srcbasever%-*} _archpkgver=${_srcver%-*} pkgver=${_srcver//-/_} pkgrel=1 -rcnrel=armv7-x5 +rcnrel=armv7-x9 arch=(i686 x86_64 armv7h) url="https://linux-libre.fsfla.org/" license=(GPL2) @@ -63,7 +63,7 @@ validpgpkeys=( ) sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293f1e38753ed681be289c51390e0e64b3e60ce0db0a3bfe1f94ee5c014579a3' 'SKIP' - 'a624123e9d51d9251c9bbb4e498f503ad1f41a5af241173e02ff53974142c8155ebb2538aed0984756b6de04acf1d0c8778969ae47e3063a0d1c6b87d86c11ea' + 'dbb9b21c9c89e199ea6e719287f3ef1b7c07dfbda55108216499dfd1f981d80777dde191132417502772a25615511e9ae58a3f7efcf2f023d6a41d734a3099a9' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -71,13 +71,13 @@ sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293 'SKIP' '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' 'SKIP' - '28fb502df94cd2464956f0dbb804bc53dbb9b5a4a593295ac4438011ad8d1bc4fe31dd72805ebd4c385f8d98b19e3ffdaa086ea969222e27177c844247fa20b5' - '4ed343f0188cdeb920fa958f544b4dd5c580e86bc12a1c72d958d9914792ecdcdd28c2534192fa8ca6d2853bc1b6c3539a236bab5f20be69aecb0c8705542f2e' - 'dbd2fedf4064630cb9f41105f81b55062ee06a20f77bbd3746c162f7f548342526b18d475b8c795f5b7058d3a828a555ad3614a81fcb82157e64b56010c5ea12' + 'c8551c0c8a54b36893a551e1d9a1cbfa1c65e95f4ff34ec705108120db71c01a329f81a0a79b8e6dc75f9dcb606d640402cd8972dfa7538e0dda8e05017e750a' + '4688945b99d1c47766d485641c3a367d3485d0361b32d21d48dcd00d28a61ffd84a3120b7ff5f02aabb783dc74a919f6aabcc02dfb4a2eabc570facc2711aa0c' + 'aa5f9c6f1738614e5de8b56ef5b87f9e0070bf450b83b0fd6e3b627623d6d55575598e7cc26e7a218648dc16c939a8c1ab6d242024b49d1adf9f33e5971c5338' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' - '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' + '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - 'e29ed94922d26f99ef62b8e93357e1a5e76a0a6038aaebb1ce78f36f8b43fdb8414010da874fcef9f2440359168a420c76471bffcb0fa60620b69b9cdecffe01' + 'fa32060ea7a44b94ce8ddc0c204a2ef1ec58551dfa20f94cd0237218c605e23783ff5aa0d2f802c40e58cef1502f0a770e34ac3302c40b5fba46d71ea9f75529' 'SKIP' '60aa432465eb3ac10f565799d3dfecea21aaf08e83909c1161d9359e932626edbd1353e712d616c3d785c65a0f699e9c45df35bd9e86365c25399c6b2d45b9e4' '86809feb5ae2759b449ec0cb7a6b3fb457874ed82a72dfda00607e8819c804a0714b5d6a17cbbba44996a36872224af42d1b85f1b3932f43bccb419041d25dc7' @@ -179,6 +179,7 @@ _package() { install=linux.install local kernver="$(<version)" + local modulesdir="$pkgdir/usr/lib/modules/$kernver" cd $_srcname @@ -186,11 +187,12 @@ _package() { if [ "$CARCH" = "armv7h" ]; then make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install fi - install -Dm644 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase" + # systemd expects to find the kernel here to allow hibernation + # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 + install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" + install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase" msg2 "Installing modules..." - local modulesdir="$pkgdir/usr/lib/modules/$kernver" - mkdir -p "$modulesdir" make INSTALL_MOD_PATH="$pkgdir/usr" modules_install # a place for external modules, diff --git a/config.armv7h b/config.armv7h index 5d363257e1bf..b32aa53911f4 100644 --- a/config.armv7h +++ b/config.armv7h @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.2-gnu Kernel Configuration +# Linux/arm 4.19.5-gnu Kernel Configuration # # @@ -5386,7 +5386,6 @@ CONFIG_DRM_SCHED=m # # I2C encoder or helper chips # -# CONFIG_DRM_I2C_ADIHDMI is not set CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m @@ -7536,6 +7535,7 @@ CONFIG_NAU7802=m CONFIG_PALMAS_GPADC=m CONFIG_ROCKCHIP_SARADC=m CONFIG_SD_ADC_MODULATOR=m +CONFIG_STMPE_ADC=m CONFIG_SUN4I_GPADC=m CONFIG_TI_ADC081C=m CONFIG_TI_ADC0832=m diff --git a/config.i686 b/config.i686 index 8257177355b1..a86f91029fc0 100644 --- a/config.i686 +++ b/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.2-gnu Kernel Configuration +# Linux/x86 4.19.5-gnu Kernel Configuration # # @@ -1560,6 +1560,7 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_GARP=m CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y @@ -1576,7 +1577,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m diff --git a/config.x86_64 b/config.x86_64 index a14982506a6d..2b4683cf6d32 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.2-gnu Kernel Configuration +# Linux/x86 4.19.5-gnu Kernel Configuration # # @@ -1602,6 +1602,7 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_GARP=m CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y @@ -1618,7 +1619,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m diff --git a/linux.install b/linux.install index f1f033b4e9ef..19a43a52438a 100644 --- a/linux.install +++ b/linux.install @@ -10,3 +10,5 @@ post_remove() { rm -f boot/initramfs-%PKGBASE%.img rm -f boot/initramfs-%PKGBASE%-fallback.img } + +# vim:set ft=sh ts=8 sts=2 sw=2 et: |