[arch-commits] Commit in linux-lts/trunk (5 files)
Jan Steffens
heftig at archlinux.org
Fri Oct 25 15:03:16 UTC 2019
Date: Friday, October 25, 2019 @ 15:03:11
Author: heftig
Revision: 365595
4.19.80-2: gcc rebuild; sync with core/linux
Added:
linux-lts/trunk/linux.install
(from rev 365594, linux-lts/trunk/linux-lts.install)
linux-lts/trunk/linux.preset
(from rev 365594, linux-lts/trunk/linux-lts.preset)
Modified:
linux-lts/trunk/PKGBUILD
Deleted:
linux-lts/trunk/linux-lts.install
linux-lts/trunk/linux-lts.preset
-------------------+
PKGBUILD | 49 ++++++++++++++++++++++++++++++-------------------
linux-lts.install | 10 ----------
linux-lts.preset | 14 --------------
linux.install | 12 ++++++++++++
linux.preset | 14 ++++++++++++++
5 files changed, 56 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-25 15:01:10 UTC (rev 365594)
+++ PKGBUILD 2019-10-25 15:03:11 UTC (rev 365595)
@@ -1,25 +1,30 @@
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-pkgbase=linux-lts
+pkgbase=linux-lts # Build stock -lts kernel
+#pkgbase=linux-custom # Build kernel with a different name
pkgver=4.19.80
-pkgrel=1
-arch=('x86_64')
+pkgrel=2
+arch=(x86_64)
url="https://www.kernel.org/"
-license=('GPL2')
-makedepends=(xmlto kmod inetutils bc libelf python-sphinx python-sphinx_rtd_theme
- graphviz imagemagick)
+license=(GPL2)
+makedepends=(
+ xmlto kmod inetutils bc libelf python-sphinx python-sphinx_rtd_theme
+ graphviz imagemagick
+)
options=('!strip')
-_srcname=linux-${pkgver}
-source=(https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
- 'config' # the main kernel config file
- '60-linux.hook' # pacman hook for depmod
- '90-linux.hook' # pacman hook for initramfs regeneration
- 'linux-lts.preset' # standard config files for mkinitcpio ramdisk
- '0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch'
+_srcname=linux-$pkgver
+source=(
+ https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
+ config # the main kernel config file
+ 60-linux.hook # pacman hook for depmod
+ 90-linux.hook # pacman hook for initramfs regeneration
+ linux.preset # standard config files for mkinitcpio ramdisk
+ 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
)
-validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds at linux-foundation.org>
- '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg at kroah.com>
- )
+validpgpkeys=(
+ 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
+ '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
+)
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('80a9ba764e088aa7fddfef5a97c0236905e291468a37832243b6f3828d36e7ec'
'SKIP'
@@ -30,8 +35,12 @@
'a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2')
_kernelname=${pkgbase#linux}
-: ${_kernelname:=-lts}
+: ${_kernelname:=-ARCH}
+export KBUILD_BUILD_HOST=archlinux
+export KBUILD_BUILD_USER=$pkgbase
+export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}"
+
prepare() {
cd $_srcname
@@ -68,7 +77,7 @@
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices')
backup=("etc/mkinitcpio.d/$pkgbase.preset")
- install=linux-lts.install
+ install=linux.install
cd $_srcname
local kernver="$(<version)"
@@ -101,7 +110,7 @@
true && install=$install.pkg
# fill in mkinitcpio preset and pacman hooks
- sed "$subst" ../linux-lts.preset | install -Dm644 /dev/stdin \
+ sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \
"$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
sed "$subst" ../60-linux.hook | install -Dm644 /dev/stdin \
"$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook"
@@ -230,3 +239,5 @@
_package${_p#$pkgbase}
}"
done
+
+# vim:set ts=8 sts=2 sw=2 et:
Deleted: linux-lts.install
===================================================================
--- linux-lts.install 2019-10-25 15:01:10 UTC (rev 365594)
+++ linux-lts.install 2019-10-25 15:03:11 UTC (rev 365595)
@@ -1,10 +0,0 @@
-post_upgrade() {
- if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
- echo "WARNING: /boot appears to be a separate partition but is not mounted."
- fi
-}
-
-post_remove() {
- rm -f boot/initramfs-%PKGBASE%.img
- rm -f boot/initramfs-%PKGBASE%-fallback.img
-}
Deleted: linux-lts.preset
===================================================================
--- linux-lts.preset 2019-10-25 15:01:10 UTC (rev 365594)
+++ linux-lts.preset 2019-10-25 15:03:11 UTC (rev 365595)
@@ -1,14 +0,0 @@
-# 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"
Copied: linux-lts/trunk/linux.install (from rev 365594, linux-lts/trunk/linux-lts.install)
===================================================================
--- linux.install (rev 0)
+++ linux.install 2019-10-25 15:03:11 UTC (rev 365595)
@@ -0,0 +1,12 @@
+post_upgrade() {
+ if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
+ echo "WARNING: /boot appears to be a separate partition but is not mounted."
+ fi
+}
+
+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:
Copied: linux-lts/trunk/linux.preset (from rev 365594, linux-lts/trunk/linux-lts.preset)
===================================================================
--- linux.preset (rev 0)
+++ linux.preset 2019-10-25 15:03:11 UTC (rev 365595)
@@ -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"
More information about the arch-commits
mailing list