5.10.46-1

5 files changed, 117 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2abec543d6e8..226795a800c6 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.10.45
+	pkgver = 5.10.46
 	pkgrel = 1
 	url = https://github.com/guest-kernel/qemu
 	install = archpkg.install
@@ -19,11 +19,15 @@ 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.10.45
-	source = config.x86
+	source = stable-linux::git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git?signed#tag=v5.10.46
+	source = filesystem.config
+	source = systemd.config
+	source = arch_x86.config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = SKIP
-	sha256sums = 98a6c9a50221685ff9bd510c1a413caeddcbb6ecc4b2855bc82d3b5ea3979311
+	sha256sums = 050c5d02668544d3b07fbd65a5cddb00fe203d07a95b7f924f9de191e55e151f
+	sha256sums = 910b7965db9777794b923ba36c83b682593c55775a7cc0a91fe28c2b7a43ade1
+	sha256sums = 145a82106497e007df1b17612f2215c2ae0edd8918762a636aad48e7c83cf20f
 
 pkgname = qemu-guest-kernel
diff --git a/PKGBUILD b/PKGBUILD
index 5e3f2a44ec25..7114d0634e9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Cyano Hao <c@cyano.cn>
 
 pkgname=qemu-guest-kernel
-pkgver=5.10.45
+pkgver=5.10.46
 pkgrel=1
 pkgdesc="Linux kernels for QEMU/KVM guests (direct kernel boot)"
 url="https://github.com/guest-kernel/qemu"
@@ -18,20 +18,25 @@ install=archpkg.install
 _srcname=stable-linux
 source=(
 	$_srcname::"git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git?signed#tag=v$pkgver"
-	config.x86
+	{filesystem,systemd}.config
+	arch_x86.config
 )
 validpgpkeys=(
 	"ABAF11C65A2970B130ABE3C479BE3E4300411886"  # Linus Torvalds
 	"647F28654894E3BD457199BE38DBBDC86092693E"  # Greg Kroah-Hartman
 )
 sha256sums=('SKIP'
-            '98a6c9a50221685ff9bd510c1a413caeddcbb6ecc4b2855bc82d3b5ea3979311')
+            '050c5d02668544d3b07fbd65a5cddb00fe203d07a95b7f924f9de191e55e151f'
+            '910b7965db9777794b923ba36c83b682593c55775a7cc0a91fe28c2b7a43ade1'
+            '145a82106497e007df1b17612f2215c2ae0edd8918762a636aad48e7c83cf20f')
 
 prepare() {
 	cd "$srcdir/$_srcname"
+	cp "$srcdir/"{filesystem,systemd}.config kernel/configs/
+
 	for _arch in x86
 	do
-		cp "$srcdir/config.$_arch" arch/$_arch/configs/qemu_extra.config
+		cp "$srcdir/arch_$_arch.config" arch/$_arch/configs/arch_specific.config
 	done
 }
 
@@ -47,7 +52,9 @@ _build() {
 
 	make ${_def_prefix}defconfig
 	make kvm_guest.config
-	make qemu_extra.config
+	make filesystem.config
+	make systemd.config
+	make arch_specific.config
 
 	make
 	cp $(make -s image_name) "$srcdir/vmlinuz.$_carch"
@@ -62,7 +69,9 @@ _native_build() {
 
 	make defconfig
 	make kvm_guest.config
-	make qemu_extra.config
+	make filesystem.config
+	make systemd.config
+	make arch_specific.config
 
 	make
 	cp $(make -s image_name) "$srcdir/vmlinuz.$CARCH"
diff --git a/arch_x86.config b/arch_x86.config
new file mode 100644
index 000000000000..4e7c17f113b9
--- /dev/null
+++ b/arch_x86.config
@@ -0,0 +1,36 @@
+# CONFIG_MODULES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_XZ=y
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
+CONFIG_SECURITY_APPARMOR=y
+
+CONFIG_USER_NS=y
+
+CONFIG_X86_X32=y
+
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_LZ4HC=y
+CONFIG_CRYPTO_ZSTD=y
+
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_BOCHS=y
+CONFIG_SND_INTEL8X0=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_8139CP=y
+CONFIG_TUN=y
+
+# CONFIG_DRM_I915 is not set
+
+# CONFIG_WLAN is not set
+# CONFIG_WIRELESS is not set
diff --git a/config.x86 b/filesystem.config
index 04e3b2cabca5..77d748562827 100644
--- a/config.x86
+++ b/filesystem.config
@@ -1,40 +1,10 @@
-# CONFIG_MODULES is not set
-# CONFIG_BLK_DEV_INITRD is not set
-
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_XZ=y
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-
-CONFIG_SECURITY_APPARMOR=y
-
-CONFIG_USER_NS=y
-
-CONFIG_X86_X32=y
-
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_ZSTD=y
-
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_HW_RANDOM_VIRTIO=y
-CONFIG_DRM_QXL=y
-CONFIG_DRM_BOCHS=y
-CONFIG_SND_INTEL8X0=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_8139CP=y
-CONFIG_TUN=y
-
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_LDM_PARTITION=y
+CONFIG_EFI_PARTITION=y
 
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@@ -79,6 +49,9 @@ CONFIG_EXFAT_FS=y
 CONFIG_NTFS_FS=y
 CONFIG_NTFS_RW=y
 
+CONFIG_TMPFS_XATTR=y
+CONFIG_TMPFS_POSIX_ACL=y
+
 CONFIG_HFS_FS=y
 CONFIG_HFSPLUS_FS=y
 CONFIG_SQUASHFS=y
@@ -142,8 +115,3 @@ CONFIG_NLS_MAC_ROMANIAN=y
 CONFIG_NLS_MAC_TURKISH=y
 CONFIG_NLS_UTF8=y
 CONFIG_UNICODE=y
-
-# CONFIG_DRM_I915 is not set
-
-# CONFIG_WLAN is not set
-# CONFIG_WIRELESS is not set
diff --git a/systemd.config b/systemd.config
new file mode 100644
index 000000000000..3a79eef20423
--- /dev/null
+++ b/systemd.config
@@ -0,0 +1,53 @@
+CONFIG_DEVTMPFS=y
+CONFIG_CGROUPS=y
+CONFIG_INOTIFY_USER=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EPOLL=y
+CONFIG_UNIX=y
+CONFIG_SYSFS=y
+CONFIG_PROC_FS=y
+CONFIG_FHANDLE=y
+
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_SHA256=y
+
+CONFIG_SYSFS_DEPRECATED=n
+
+CONFIG_UEVENT_HELPER_PATH=""
+
+CONFIG_FW_LOADER_USER_HELPER=n
+
+CONFIG_DMIID=y
+
+CONFIG_BLK_DEV_BSG=y
+
+CONFIG_NET_NS=y
+
+CONFIG_USER_NS=y
+
+CONFIG_IPV6=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_CHECKPOINT_RESTORE=y
+
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+
+CONFIG_BPF=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_CGROUP_BPF=y
+
+CONFIG_EFIVAR_FS=y
+CONFIG_EFI_PARTITION=y
+
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+
+CONFIG_RT_GROUP_SCHED=n
+
+CONFIG_PSI=y