summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyano Hao2022-02-13 21:31:43 +0800
committerCyano Hao2022-02-13 21:31:43 +0800
commit720824529218e08db5bbbe28f2ed5e3be1aafe20 (patch)
treefe2c4f180eb8be5f47d73a4ba11c59e89eb0490a
parent6748ec084174f82ef4041b5f1a8cbf988ec87187 (diff)
downloadaur-720824529218e08db5bbbe28f2ed5e3be1aafe20.tar.gz
5.15.23
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD32
-rw-r--r--arch_x86.config1
3 files changed, 7 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96de9a51f38a..5352e8b2bd54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qemu-guest-kernel
pkgdesc = Linux kernels for QEMU/KVM guests (direct kernel boot)
- pkgver = 5.15.12
+ pkgver = 5.15.23
pkgrel = 1
url = https://github.com/guest-kernel/qemu
install = archpkg.install
@@ -19,7 +19,7 @@ pkgbase = qemu-guest-kernel
makedepends = lld
makedepends = llvm
options = !strip
- source = stable-linux::git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git?signed#tag=v5.15.12
+ source = stable-linux::git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git?signed#tag=v5.15.23
source = filesystem.config
source = systemd.config
source = arch_x86.config
@@ -30,6 +30,6 @@ pkgbase = qemu-guest-kernel
sha256sums = SKIP
sha256sums = 9a917bb710be091e5b1d05185f009b6eb67b4b668389da185e56909da2b10d06
sha256sums = 0ccbd0d29149c3752303aea276eea713cd1cb0687ea0239bdbaa20732b31e868
- sha256sums = c40d2fd202aea75c78a4b39c365ccc687bf0f5a4df3bf2ee31fd4e162ef635d3
+ sha256sums = ea4fec562448292a233148e1685d731c5e1811d4c6a1826ebdc4a29feb69028d
pkgname = qemu-guest-kernel
diff --git a/PKGBUILD b/PKGBUILD
index 53d703b80b58..7d74c9b242f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Cyano Hao <c@cyano.cn>
pkgname=qemu-guest-kernel
-pkgver=5.15.12
+pkgver=5.15.23
pkgrel=1
pkgdesc="Linux kernels for QEMU/KVM guests (direct kernel boot)"
url="https://github.com/guest-kernel/qemu"
@@ -30,7 +30,7 @@ validpgpkeys=(
sha256sums=('SKIP'
'9a917bb710be091e5b1d05185f009b6eb67b4b668389da185e56909da2b10d06'
'0ccbd0d29149c3752303aea276eea713cd1cb0687ea0239bdbaa20732b31e868'
- 'c40d2fd202aea75c78a4b39c365ccc687bf0f5a4df3bf2ee31fd4e162ef635d3')
+ 'ea4fec562448292a233148e1685d731c5e1811d4c6a1826ebdc4a29feb69028d')
prepare() {
cd "$srcdir/$_srcname"
@@ -62,35 +62,9 @@ _build() {
cp $(make -s image_name) "$srcdir/vmlinuz.$_carch"
}
-_native_build() {
- cd "$srcdir/$_srcname"
- make mrproper
-
- unset LLVM
- unset CROSS_COMPILE
-
- make defconfig
- make kvm_guest.config
- make filesystem.config
- make systemd.config
- make arch_specific.config
-
- make
- cp $(make -s image_name) "$srcdir/vmlinuz.$CARCH"
-}
-
build() {
ARCH="x86" _carch="i686" _def_prefix="i386_" _build
-
- if [[ $CARCH == "x86_64" ]]
- then
- # prefer native GNU toolchain for x32 ABI support
- _native_build
- else
- # and remove the config if not available to avoid confusion
- sed -i '/CONFIG_X86_X32/d' "$srcdir"/$_srcname/arch/x86/configs/qemu_extra.config
- ARCH="x86" _carch="x86_64" _def_prefix="x86_64_" _build
- fi
+ ARCH="x86" _carch="x86_64" _def_prefix="x86_64_" _build
}
package() {
diff --git a/arch_x86.config b/arch_x86.config
index aedd80d5fa6d..e3e732db8afc 100644
--- a/arch_x86.config
+++ b/arch_x86.config
@@ -26,6 +26,7 @@ CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_DRM_QXL=y
CONFIG_DRM_BOCHS=y
CONFIG_DRM_CIRRUS_QEMU=y
+CONFIG_FB=y
CONFIG_SND_INTEL8X0=y
CONFIG_SND_HDA_GENERIC=y
CONFIG_8139CP=y