diff options
| -rw-r--r-- | libre-testing/linux-libre-lts/PKGBUILD | 26 | ||||
| -rw-r--r-- | libre-testing/linux-libre-lts/config.armv7h | 10 | ||||
| -rw-r--r-- | libre-testing/linux-libre-lts/config.i686 | 10 | ||||
| -rw-r--r-- | libre-testing/linux-libre-lts/linux.preset | 14 |
4 files changed, 45 insertions, 15 deletions
diff --git a/libre-testing/linux-libre-lts/PKGBUILD b/libre-testing/linux-libre-lts/PKGBUILD index 49161fd44..d4e2e3399 100644 --- a/libre-testing/linux-libre-lts/PKGBUILD +++ b/libre-testing/linux-libre-lts/PKGBUILD @@ -18,7 +18,7 @@ _srcbasever=4.19-gnu _srcver=4.19.81-gnu _srcname=linux-${_srcbasever%-*} pkgver=${_srcver//-/_} -pkgrel=1 +pkgrel=2 rcnver=4.19.72 rcnrel=armv7-x39 url='https://linux-libre.fsfla.org/' @@ -34,6 +34,7 @@ source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcver/patch-$_srcbasever-$_srcver.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.preset # standard config file for mkinitcpio ramdisk # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug @@ -80,9 +81,10 @@ sha512sums=('5bc800b3beff43a8c15bd5515f4e0babe2beb5fa600491b7b37110e22d9b739d293 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '32fddeab0ef9934fbbb2bbbfb416c40ae515b0bb3228655904edfd719e9a094044769938c33c8283c2f043a7b557737ce0a7910b2fd13fc6333d0c028a81f42b' + 'f96a654f5f3988cadad28f9849900fe1c6e76d52ffefc3cf71253468d5fca07ffd7ffa18fa5054e88787114026b8ae15f035fee7b39b1dc8534d5fff3ae25128' '78ce426957dfe14d3f0e58ad736489647b1930e8ad43eda27fbbae33bf53cda082295e3e33d6ddb9e58824a29fc069fcafeb8d9f8cd9aa32f3550e9e747f4a7d' - '309fead206abf03dd4832f720108974ecc935b376fab6fca0c1d9197aea44bf074348768ae469c82d30b388678b72017db5e4aebac0f2a85f8691bbf13fd00e7' + '861a83cb9746b6d981e07d18b0293298c0e7a5d10ad592bb8defbd235a0efac30ce6c2328f34a162943aa33fa05f2b4367adf394aa815875eda0103bdf4e172c' + '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' '5f196378d50dd737d727e424d8f31b7fa8a6b92ba88f0a1467ef79bc37a097160da1fc1fd5cfb4b8983f36f2afdf27eb229ec61b35a15ac2343d660eb416a230') @@ -126,7 +128,7 @@ prepare() { msg2 "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname + echo "${pkgbase#linux-libre}" > localversion.20-pkgname if [ "$CARCH" = "armv7h" ]; then local src_armv7h @@ -160,7 +162,7 @@ build() { cd $_srcname if [ "$CARCH" = "armv7h" ]; then make zImage modules htmldocs dtbs - elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then + else make bzImage modules htmldocs fi } @@ -192,6 +194,20 @@ _package() { msg2 "Installing modules..." make INSTALL_MOD_PATH="$pkgdir/usr" modules_install + # armv7h kernels presets only work with ALL_kver=$kernver + if [ "$CARCH" = "armv7h" ]; then + msg2 "Installing mkinitcpio preset..." + # sed expression for following substitutions + local subst=" + s|/boot/vmlinuz-%PKGBASE%|$kernver|g + s|%PKGBASE%|$pkgbase|g + " + + # fill in mkinitcpio preset + sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \ + "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" + fi + # remove build and source links rm "$modulesdir"/{source,build} diff --git a/libre-testing/linux-libre-lts/config.armv7h b/libre-testing/linux-libre-lts/config.armv7h index c1b27d000..c61d13362 100644 --- a/libre-testing/linux-libre-lts/config.armv7h +++ b/libre-testing/linux-libre-lts/config.armv7h @@ -1,13 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.59-gnu Kernel Configuration +# Linux/arm 4.19.81-gnu Kernel Configuration # # -# Compiler: gcc (GCC) 9.1.0 +# Compiler: gcc (GCC) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90100 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -18,8 +18,8 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-lts" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y diff --git a/libre-testing/linux-libre-lts/config.i686 b/libre-testing/linux-libre-lts/config.i686 index 1ac301877..a37846478 100644 --- a/libre-testing/linux-libre-lts/config.i686 +++ b/libre-testing/linux-libre-lts/config.i686 @@ -1,13 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.75-gnu Kernel Configuration +# Linux/x86 4.19.81-gnu Kernel Configuration # # -# Compiler: gcc (GCC) 9.1.0 +# Compiler: gcc (GCC) 9.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90100 +CONFIG_GCC_VERSION=90200 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -19,8 +19,8 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-lts" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/libre-testing/linux-libre-lts/linux.preset b/libre-testing/linux-libre-lts/linux.preset new file mode 100644 index 000000000..66709a8c1 --- /dev/null +++ b/libre-testing/linux-libre-lts/linux.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the '%PKGBASE%' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-%PKGBASE%" + +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" |