From 92eed01493a5ffa83c8f9064e1ffaecbe6940b37 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 15 2023 17:26:36 +0000 Subject: Version 255~rc2 - See See https://raw.githubusercontent.com/systemd/systemd/v255-rc2/NEWS --- diff --git a/30247ea76e72ed89a5d86ec9b78ca8f89a989258.patch b/30247ea76e72ed89a5d86ec9b78ca8f89a989258.patch deleted file mode 100644 index e31a37a..0000000 --- a/30247ea76e72ed89a5d86ec9b78ca8f89a989258.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 30247ea76e72ed89a5d86ec9b78ca8f89a989258 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 7 Nov 2023 21:36:46 +0100 -Subject: [PATCH] man: many fixes systemd-vmspawn(1) - -- version information -- indentation and missing tags -- mkosi and qemu don't need root ---- - man/systemctl.xml | 8 +-- - man/systemd-vmspawn.xml | 118 +++++++++++++++++++++++----------------- - 2 files changed, 72 insertions(+), 54 deletions(-) - -diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml -index bf3aaf028eafe..4ca6f1a74fd2f 100644 ---- a/man/systemd-vmspawn.xml -+++ b/man/systemd-vmspawn.xml -@@ -44,59 +44,73 @@ - The following options are understood: - - -- Image Options -+ Image Options - -- -- -- -- -+ -+ -+ -+ - -- Root file system disk image (or device node) for the virtual machine. -- -- -+ Root file system disk image (or device node) for the virtual machine. -+ -+ -+ -+ -+ - - - -- Host Configuration -+ Host Configuration -+ -+ -+ -+ SMP -+ -+ Configures the number of CPUs to start the virtual machine with. -+ Defaults to 1. -+ -+ -+ -+ -+ -+ -+ MEM -+ -+ Configures the amount of memory to start the virtual machine with. -+ Defaults to 2G. - -- -- -- SMP -+ -+ -+ - -- Configures the number of CPUs to start the virtual machine with. -- Defaults to 1. -- -+ -+ - -- -- MEM -+ Configures whether to use KVM. If the option is not specified KVM support will be -+ detected automatically. If true, KVM is always used, and if false, KVM is never used. - -- Configures the amount of memory to start the virtual machine with. -- Defaults to 2G. -- -+ -+ - -- -- -+ -+ - -- Configure whether to use KVM. -- If the option is not specified KVM support will be detected automatically. -- If yes is specified KVM is always used, and vice versa if no is set KVM is never used. -- -+ Start QEMU in graphical mode. - -- -- -+ -+ - -- Start QEMU in graphical mode. -- -+ -+ - -- -- -+ Configures whether to search for firmware which supports secure boot. If the option -+ is not specified, the first firmware which is detected will be used. If true, then the first -+ firmware with secure boot support will be selected. If false, then the first firmware without -+ secure boot will be selected. - -- Configure whether to search for firmware which supports secure boot. -- If the option is not specified the first firmware which is detected will be used. -- If the option is set to yes then the first firmware with secure boot support will be selected. -- If no is specified then the first firmware without secure boot will be selected. -- -- -+ -+ -+ - - - -@@ -116,19 +130,21 @@ - use C-style escaping (i.e. \n to embed a newline, or \x00 to - embed a NUL byte). Note that the invoking shell might already apply unescaping - once, hence this might require double escaping!. -- -+ -+ - - - -- -- Other -+ -+ -+ Other - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - - -@@ -139,8 +155,10 @@ - - Run an Arch Linux VM image generated by mkosi - -- # mkosi -d arch -p systemd -p linux --autologin -o image.raw -f build -- # systemd-vmspawn --image=image.raw -+ -+$ mkosi -d arch -p systemd -p linux --autologin -o image.raw -f build -+$ systemd-vmspawn --image=image.raw -+ - - - -@@ -155,7 +173,7 @@ - See Also - - systemd1, -- mkosi1, -+ mkosi1 - - - diff --git a/6527d175cda8c2e1feceb26eb7e3ec111ddc6ae4.patch b/6527d175cda8c2e1feceb26eb7e3ec111ddc6ae4.patch deleted file mode 100644 index a204f81..0000000 --- a/6527d175cda8c2e1feceb26eb7e3ec111ddc6ae4.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6527d175cda8c2e1feceb26eb7e3ec111ddc6ae4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 7 Nov 2023 18:54:38 +0100 -Subject: [PATCH] vmspawn: shorted --help output to fit in 80 columns - -I think that "SB" is good enough here, the option name shows the unabbreviated -name. ---- - src/vmspawn/vmspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c -index ab137df0a7155..00166b2f7a40f 100644 ---- a/src/vmspawn/vmspawn.c -+++ b/src/vmspawn/vmspawn.c -@@ -68,7 +68,7 @@ static int help(void) { - " --qemu-mem=MEM Configure guest's RAM size\n" - " --qemu-kvm= Configure whether to use KVM or not\n" - " --qemu-gui Start QEMU in graphical mode\n" -- " --secure-boot= Configure whether to search for firmware which supports Secure Boot\n\n" -+ " --secure-boot= Configure searching for firmware with SB support\n\n" - "%3$sCredentials:%4$s\n" - " --set-credential=ID:VALUE\n" - " Pass a credential with literal value to container.\n" diff --git a/sources b/sources index fdd7cac..5e6bcd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-255-rc1.tar.gz) = 3a92f59af54e0f4988304daa9d1d186554cd07f5ebc95ab17d2d6c1cb37caf7b329e8eca67eb7349aed2f425341ef2b79e2469156a26b6e2436b900b2136f824 +SHA512 (systemd-255-rc2.tar.gz) = f33c6868efcbe05a7a4703136bb84243e5a6889c7740d77535eb9f19bb46c209e6f797533351fcf66d1c5d4b83e20ca436bfcb625e26b729bfadca795207ec56 diff --git a/systemd.spec b/systemd.spec index be8e4c9..7ccc47b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 255~rc1 +Version: 255~rc2 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -105,8 +105,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # Drop when dracut-060 is available. Patch0001: https://github.com/systemd/systemd/pull/26494.patch -Patch0002: https://github.com/systemd/systemd/pull/29913/commits/6527d175cda8c2e1feceb26eb7e3ec111ddc6ae4.patch -Patch0003: https://github.com/systemd/systemd/pull/29913/commits/30247ea76e72ed89a5d86ec9b78ca8f89a989258.patch # Those are downstream-only patches, but we don't want them in packit builds: # https://bugzilla.redhat.com/show_bug.cgi?id=1738828