diff options
| -rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 28 | ||||
| -rw-r--r-- | libre/linux-libre-lts/linux-armv7h.preset | 6 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fb31d091d..36bf92dc4 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -14,11 +14,11 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-lts -pkgver=5.4.21 +pkgver=5.4.23 pkgrel=1 pkgdesc='LTS Linux-libre' -rcnver=5.4.19 -rcnrel=armv7-x18 +rcnver=5.4.23 +rcnrel=armv7-x19 url='https://linux-libre.fsfla.org/' arch=(i686 x86_64 armv7h) license=(GPL2) @@ -63,7 +63,7 @@ validpgpkeys=( ) sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc701cd50af49c403ef0325adfcb07e354d5e46c1be3dcdd719a7a55c963f37' 'SKIP' - 'fcdde1c9ef55a373dc277d4e21858e5884f855a71c338259208eb0444b7e7a65d3c8ca0a1690600acec3e28c63a91e798679d616c1a078574f772753ddbd3a7b' + '1913d3aae6b5eecf1a6240661eb2d201c4ced3ffb3b93758e642251a576e225be450e90deb7ce739fdeb63ec1e1276dd7bb4026dc75b7872ca743f19447b272a' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -74,10 +74,10 @@ sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc '37f775d44c15aca1ed62cfff0c99bfb7e0c53b8bfcb6b848934a929278f8f0330298e434d05f2305c4625a96b06438c8e656c8806cd2b1e5c46b60a9d50ac078' '944ce7474a2a969d09764d3259986afed8522cf9301d99d0273184f9e21d4441aa7df475bf35a04aa7b1726e110f4c106a1f835f33a086b9f3b59a3506065560' '2b69e711072c1ec1d7a8e243aa2aea65ea30def29be737ccdf34f4b3354eb04a0c1dbca57977988b930e6be035caf8442025443ba206bae4464013aa57be6ca7' - 'f01e7925b262d2874a8a991b1f27d057356a2a384d2012b61be5a631d4e4d7cf87461c8fb9e7f183831f5a829ad204897f1f0545a52df6288a0e04a5c2e31b96' + 'aca591b5a2e838754e3c5fd2c0e50098ad54c2d0f990de5bf9cff8608e881daf0e37132294ed1a0e0a7b9e1c194c0b89f95da001d94febdb25a01c409060e3ac' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') -sha512sums_armv7h=('bb40950c417d2ef7fe5e3ed69d3ba013aadd67cf55b0c40a26e3e3b46c1bdd32ee496c64d9f7d8540d2e4ca2e7dba387fa2e72fe04e32db5d41c81317f309900' +sha512sums_armv7h=('944ac95a7f49c253effc4bd0ce560180b5fe0c06ef71573d82691fceda69985612145138b8ec28c629cc78715df9894e1aba8c572065c56c4a0c1e9af68bbc2e' 'SKIP' 'b576a9c40ba59485c350f71b9234d9e71f245e25b26382bd2f67019f3309c3b5705a6020eae0a9dfccacc763fb2056a5937c0a8ff4e64f99ba1d60f0b2acb03f' '85a13a274d4cbaca3ddbe8eaf883f1a1184765f8d09d6d40bb32defbe0876cb0153513e8db8671d7fc053e383ced793b74245ff29364a760e1a52bb36ebc8e85' @@ -149,11 +149,8 @@ prepare() { build() { cd $_srcname - if [ "$CARCH" = "armv7h" ]; then - make zImage modules htmldocs dtbs - else - make bzImage modules htmldocs - fi + make all + make htmldocs } _package() { @@ -170,9 +167,6 @@ _package() { local modulesdir="$pkgdir/usr/lib/modules/$kernver" echo "Installing boot image..." - if [ "$CARCH" = "armv7h" ]; then - make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install - fi # 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" @@ -183,10 +177,12 @@ _package() { echo "Installing modules..." make INSTALL_MOD_PATH="$pkgdir/usr" modules_install - # armv7h presets only work with ALL_kver=$kernver if [ "$CARCH" = "armv7h" ]; then - backup=("etc/mkinitcpio.d/$pkgbase.preset") + echo "Installing device tree binaries..." + make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install + # armv7h presets only work with ALL_kver=$kernver + backup=("etc/mkinitcpio.d/$pkgbase.preset") echo "Installing mkinitcpio preset..." sed "s|%PKGBASE%|$pkgbase|g;s|%KERNVER%|$kernver|g" ../linux-armv7h.preset \ | install -Dm644 /dev/stdin "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" diff --git a/libre/linux-libre-lts/linux-armv7h.preset b/libre/linux-libre-lts/linux-armv7h.preset index ca3832faa..3cec18ca9 100644 --- a/libre/linux-libre-lts/linux-armv7h.preset +++ b/libre/linux-libre-lts/linux-armv7h.preset @@ -3,8 +3,12 @@ ALL_config="/etc/mkinitcpio.conf" ALL_kver="%KERNVER%" -PRESETS=('default') +PRESETS=('default' 'fallback') #default_config="/etc/mkinitcpio.conf" default_image="/boot/initramfs-%PKGBASE%.img" #default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-%PKGBASE%-fallback.img" +fallback_options="-S autodetect" |