diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index 3331afdc..bf5a21d2 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From 0eb84d049c77dceeb48724770f89f0fa01557c87 Mon Sep 17 00:00:00 2001 +From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -66,10 +66,10 @@ Fixes: #2121 2 files changed, 195 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 9dfa190751..b5dee9cbb1 100644 +index d0ac1b2660..cb453fa50d 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -428,6 +428,7 @@ int config_parse( +@@ -430,6 +430,7 @@ int config_parse( static int config_parse_many_files( const char* const* conf_files, @@ -77,7 +77,7 @@ index 9dfa190751..b5dee9cbb1 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -440,6 +441,12 @@ static int config_parse_many_files( +@@ -442,6 +443,12 @@ static int config_parse_many_files( char **fn; int r; @@ -90,7 +90,7 @@ index 9dfa190751..b5dee9cbb1 100644 /* First read the first found main config file. */ STRV_FOREACH(fn, (char**) conf_files) { r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); -@@ -462,6 +469,28 @@ static int config_parse_many_files( +@@ -464,6 +471,28 @@ static int config_parse_many_files( return 0; } @@ -119,7 +119,7 @@ index 9dfa190751..b5dee9cbb1 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -473,15 +502,19 @@ int config_parse_many_nulstr( +@@ -475,15 +504,19 @@ int config_parse_many_nulstr( void *userdata, usec_t *ret_mtime) { @@ -142,7 +142,7 @@ index 9dfa190751..b5dee9cbb1 100644 ret_mtime); } -@@ -497,8 +530,8 @@ int config_parse_many( +@@ -499,8 +532,8 @@ int config_parse_many( void *userdata, usec_t *ret_mtime) { @@ -152,7 +152,7 @@ index 9dfa190751..b5dee9cbb1 100644 const char *suffix; int r; -@@ -511,7 +544,12 @@ int config_parse_many( +@@ -513,7 +546,12 @@ int config_parse_many( if (r < 0) return r; diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch index dfc696e1..8cdd1ce8 100644 --- a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -1,7 +1,7 @@ -From f98af900e625b15862f9173a5c55662d4cee7356 Mon Sep 17 00:00:00 2001 +From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 29 Oct 2012 13:01:20 +0000 -Subject: [PATCH 01/12] restore /var/run and /var/lock bind mount if they +Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they aren't symlink --- @@ -13,10 +13,10 @@ Subject: [PATCH 01/12] restore /var/run and /var/lock bind mount if they create mode 100644 units/var-run.mount diff --git a/units/meson.build b/units/meson.build -index 275daad3f4..dadc9432ef 100644 +index 17e9ead9c1..7b926f9f91 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -150,6 +150,8 @@ units = [ +@@ -160,6 +160,8 @@ units = [ ['umount.target', ''], ['usb-gadget.target', ''], ['user.slice', ''], diff --git a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch index 1e278fda..47bb74af 100644 --- a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch +++ b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch @@ -1,7 +1,8 @@ -From 47563b617a371680d1ec3729fa4324310ebe3710 Mon Sep 17 00:00:00 2001 +From ddf3a821b51fbd3064914eb00a03bbecce9ee361 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Tue, 25 Mar 2014 13:08:56 +0000 -Subject: [PATCH 1/1] rc-local: fix ordering startup for /etc/init.d/boot.local +Subject: [PATCH 03/11] rc-local: fix ordering startup for + /etc/init.d/boot.local [tblume: fixes bnc#869142] --- @@ -9,13 +10,13 @@ Subject: [PATCH 1/1] rc-local: fix ordering startup for /etc/init.d/boot.local 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/rc-local.service.in b/units/rc-local.service.in -index d4aaaf09d4..5cd1571cc7 100644 +index 55e83dfe00..8b20f8d1af 100644 --- a/units/rc-local.service.in +++ b/units/rc-local.service.in @@ -13,7 +13,7 @@ - Description=@RC_LOCAL_PATH@ Compatibility + Description={{RC_LOCAL_PATH}} Compatibility Documentation=man:systemd-rc-local-generator(8) - ConditionFileIsExecutable=@RC_LOCAL_PATH@ + ConditionFileIsExecutable={{RC_LOCAL_PATH}} -After=network.target +After=basic.target diff --git a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch index 74e3790e..f7d958c4 100644 --- a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch +++ b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch @@ -1,7 +1,7 @@ -From 54366ae306ae19bdb2a5af7eb5158260cdc37e8f Mon Sep 17 00:00:00 2001 +From c6ed74889adade0287ee609150611544d8d5c6d2 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Tue, 28 May 2013 15:17:35 +0200 -Subject: [PATCH 1/1] strip the domain part from /etc/hostname when setting +Subject: [PATCH 04/11] strip the domain part from /etc/hostname when setting system host name [fbui: fixes bnc#820213] diff --git a/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch b/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch index b37a8acc..c8b7f70a 100644 --- a/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch +++ b/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch @@ -1,7 +1,7 @@ -From 8e95d5534e9a577529ac49aaec610e6ceefec0b9 Mon Sep 17 00:00:00 2001 +From ae4741127dc0ae575d13b8a7b201207da6167517 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Sat, 12 Jul 2014 14:20:36 +0200 -Subject: [PATCH 05/12] udev: create default symlinks for primary cd_dvd drive +Subject: [PATCH 05/11] udev: create default symlinks for primary cd_dvd drive Imported from SLE12-SP1, commit 4f8bacfbffd7049608b5076. diff --git a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch index fdf44437..11737094 100644 --- a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +++ b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch @@ -1,7 +1,7 @@ -From ac7bfed30245145ce68a037e7578da12ce2de009 Mon Sep 17 00:00:00 2001 +From 1bd48f23ea7750b354bfb94482f9f035bf8b7841 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 26 May 2016 08:59:41 +0200 -Subject: [PATCH 1/1] sysv-generator: add (back) support for SysV scripts for +Subject: [PATCH 06/11] sysv-generator: add (back) support for SysV scripts for the early boot For the record, the upstream support was removed by commit @@ -43,7 +43,7 @@ the same time as 'normal' services. 1 file changed, 23 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 8c7aef23c3..f88f9119fb 100644 +index bf23c48662..fa5355c964 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -31,6 +31,9 @@ static const struct { @@ -100,7 +100,7 @@ index 8c7aef23c3..f88f9119fb 100644 /* Strip ".sh" suffix from file name for comparison */ filename_no_sh = strdupa(filename); e = endswith(filename_no_sh, ".sh"); -@@ -674,6 +693,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { +@@ -651,6 +670,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { if (other->sysv_start_priority < 0) continue; @@ -110,7 +110,7 @@ index 8c7aef23c3..f88f9119fb 100644 /* If both units have modern headers we don't care * about the priorities */ if (s->has_lsb && other->has_lsb) -@@ -798,6 +820,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { +@@ -775,6 +797,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { .sysv_start_priority = -1, .name = TAKE_PTR(name), .path = TAKE_PTR(fpath), diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch index c4fd62e1..cb8f69a8 100644 --- a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +++ b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -1,7 +1,7 @@ -From 0adc3f402aeeadd73a0977ca6a1bc65d3d4201c1 Mon Sep 17 00:00:00 2001 +From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001 From: Pawel Wieczorkiewicz Date: Tue, 2 Jun 2015 13:33:24 +0000 -Subject: [PATCH 07/12] networkd: make network.service an alias of +Subject: [PATCH 07/11] networkd: make network.service an alias of systemd-networkd.service NetworkManager and wicked does this already. This is needed by yast2 @@ -13,10 +13,10 @@ and other parts of the system. 1 file changed, 1 insertion(+) diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index 2673146841..083a35b912 100644 +index ffa45ba049..6a5d0dea3c 100644 --- a/units/systemd-networkd.service.in +++ b/units/systemd-networkd.service.in -@@ -50,6 +50,7 @@ User=systemd-network +@@ -53,6 +53,7 @@ User=systemd-network [Install] WantedBy=multi-user.target diff --git a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch index d21fea50..55b44930 100644 --- a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +++ b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch @@ -1,7 +1,7 @@ -From a32292849ca2837f99d6801da26b8d8e401831c4 Mon Sep 17 00:00:00 2001 +From 7f59f7b1b506c1394712ad3d6bab81318052a14c Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Wed, 4 May 2016 17:40:04 +0200 -Subject: [PATCH 08/12] sysv-generator: translate "Required-Start" into a +Subject: [PATCH 08/11] sysv-generator: translate "Required-Start" into a "Wants" dependency [tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch] @@ -17,10 +17,10 @@ Subject: [PATCH 08/12] sysv-generator: translate "Required-Start" into a 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 1c01008967..7a58be9287 100644 +index fa5355c964..62755f3652 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c -@@ -258,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, +@@ -257,6 +257,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, "remote_fs", SPECIAL_REMOTE_FS_TARGET, "syslog", NULL, "time", SPECIAL_TIME_SYNC_TARGET, @@ -28,7 +28,7 @@ index 1c01008967..7a58be9287 100644 }; const char *filename; -@@ -272,6 +273,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, +@@ -271,6 +272,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, filename = basename(s->path); @@ -36,7 +36,7 @@ index 1c01008967..7a58be9287 100644 n = *name == '$' ? name + 1 : name; for (i = 0; i < ELEMENTSOF(table); i += 2) { -@@ -408,7 +410,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -407,7 +409,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text for (;;) { _cleanup_free_ char *word = NULL, *m = NULL; @@ -45,7 +45,7 @@ index 1c01008967..7a58be9287 100644 r = extract_first_word(&text, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RELAX); if (r < 0) -@@ -421,6 +423,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -420,6 +422,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text continue; is_before = startswith_no_case(full_text, "X-Start-Before:"); @@ -53,7 +53,7 @@ index 1c01008967..7a58be9287 100644 if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !is_before) { /* the network-online target is special, as it needs to be actively pulled in */ -@@ -429,8 +432,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -428,8 +431,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text return log_oom(); r = strv_extend(&s->wants, m); diff --git a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch index e4984478..6124095d 100644 --- a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch +++ b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch @@ -1,7 +1,7 @@ -From 7fc80ccccaa6f7b98af8bcd899a97d561777ff94 Mon Sep 17 00:00:00 2001 +From dedd52f920cf7ae718bb31ac7286d3f7314540c6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 10 Jun 2016 15:19:57 +0200 -Subject: [PATCH 09/12] pid1: handle console specificities/weirdness for s390 +Subject: [PATCH 09/11] pid1: handle console specificities/weirdness for s390 arch The 3270 console on S/390 can do color but not the 3215 console. @@ -30,10 +30,10 @@ whose $subject is "[PATCH] support conmode setting on command line". 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c -index 6cacde90ba..1a03902acc 100644 +index d769423d6e..1a65391146 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c -@@ -780,7 +780,20 @@ bool tty_is_vc_resolve(const char *tty) { +@@ -779,7 +779,20 @@ bool tty_is_vc_resolve(const char *tty) { } const char *default_term_for_tty(const char *tty) { diff --git a/0011-core-disable-session-keyring-per-system-sevice-entir.patch b/0011-core-disable-session-keyring-per-system-sevice-entir.patch index a3e1fac1..9d5bad80 100644 --- a/0011-core-disable-session-keyring-per-system-sevice-entir.patch +++ b/0011-core-disable-session-keyring-per-system-sevice-entir.patch @@ -1,7 +1,7 @@ -From e5b3d1d00bbdbcb168889699c462bf01b58062a5 Mon Sep 17 00:00:00 2001 +From 67f3fa5aa2781d42c809da9303f81b28544824d8 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 6 Jul 2017 15:48:10 +0200 -Subject: [PATCH 11/12] core: disable session keyring per system sevice +Subject: [PATCH 10/11] core: disable session keyring per system sevice entirely for now Until PAM module "pam_keyinit" is fully integrated in SUSE's PAM stack, this @@ -27,10 +27,10 @@ https://github.com/systemd/systemd/pull/6286 1 file changed, 3 insertions(+) diff --git a/src/core/execute.c b/src/core/execute.c -index 2a4840a3a9..aefd4eaff1 100644 +index 2a337b55a2..b5a1a3b6e5 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -2779,6 +2779,9 @@ static int setup_keyring( +@@ -3356,6 +3356,9 @@ static int setup_keyring( assert(context); assert(p); diff --git a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch index a687aaa0..510c4732 100644 --- a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -1,7 +1,7 @@ -From 90d84a96aca84b39f6aabda048703dc7c0e79ef4 Mon Sep 17 00:00:00 2001 +From 1aa6cfc7ff05929f013262c86ab7557e5394fb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH 12/12] resolved: create /etc/resolv.conf symlink at runtime +Subject: [PATCH 11/11] resolved: create /etc/resolv.conf symlink at runtime If the symlink doesn't exists, and we are being started, let's create it to provie name resolution. @@ -14,11 +14,11 @@ don't touch it in that case either. https://bugzilla.redhat.com/show_bug.cgi?id=1313085 --- src/resolve/resolved.c | 6 ++++++ - tmpfiles.d/etc.conf.m4 | 3 --- + tmpfiles.d/etc.conf.in | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index 16477f28d6..3922804039 100644 +index aabaa266e9..39277ea487 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -53,6 +53,12 @@ static int run(int argc, char *argv[]) { @@ -34,19 +34,19 @@ index 16477f28d6..3922804039 100644 /* As we're root, we can create the directory where resolv.conf will live */ r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid, MKDIR_WARN_MODE); if (r < 0) -diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index f82e0b82ce..66a777bdb2 100644 ---- a/tmpfiles.d/etc.conf.m4 -+++ b/tmpfiles.d/etc.conf.m4 +diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in +index 2323fd8cd8..ebdc699c26 100644 +--- a/tmpfiles.d/etc.conf.in ++++ b/tmpfiles.d/etc.conf.in @@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - m4_ifdef(`HAVE_SMACK_RUN_LABEL', + {% if HAVE_SMACK_RUN_LABEL %} t /etc/mtab - - - - security.SMACK64=_ - )m4_dnl --m4_ifdef(`ENABLE_RESOLVE', + {% endif %} +-{% if ENABLE_RESOLVE %} -L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --)m4_dnl +-{% endif %} C! /etc/nsswitch.conf - - - - - m4_ifdef(`HAVE_PAM', + {% if HAVE_PAM %} C! /etc/pam.d - - - - -- 2.26.2 diff --git a/systemd-mini.changes b/systemd-mini.changes index 25dbc3d6..a93d76e2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Sep 1 11:54:23 UTC 2021 - Franck Bui + +- Configure split-usr=true only when %usrmerged is not defined + +------------------------------------------------------------------- +Wed Sep 1 09:56:55 UTC 2021 - Franck Bui + +- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/7f23815a706cf2b2df3eac2eb2f8220736b8f427...40bda18e346ff45132ccd6f8f8e96de78dcf3470 + +------------------------------------------------------------------- +Mon Aug 23 15:12:10 UTC 2021 - Franck Bui + +- Rework the test (sub)package: + - it's been renamed into 'systemd-testsuite' + - it includes the extended tests too + - the relevant commits have been backported to SUSE/v249 so no SUSE + specific patch is needed to run the extended tests (see below) + - the deps needed by the extended tests have been added + +- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427 + + ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too + 088fbb71d0 test: adapt install_pam() for openSUSE + 4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE" + ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static" + 6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only + 278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set + 3bba2f876a test: add support for NO_BUILD=1 on openSUSE + d77cbc1b64 test: make busybox TEST-13-only dependency + +------------------------------------------------------------------- +Mon Aug 2 12:54:44 UTC 2021 - Franck Bui + +- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719) + + See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for + details. + + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + ------------------------------------------------------------------- Thu Jul 29 13:12:48 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 0f05b170..1112b547 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,8 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.45.g73e9e6fb84 +%define suse_version +suse.32.g40bda18e34 +%define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi %if 0%{?bootstrap} @@ -39,7 +40,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental -%bcond_with tests +%bcond_with testsuite %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -53,12 +54,12 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental -%bcond_without tests +%bcond_without testsuite %endif Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 248.6 +Version: 249.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -98,6 +99,7 @@ BuildRequires: libmount-devel >= 2.27.1 BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel +BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 @@ -487,22 +489,77 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif -%if %{with tests} -%package tests -Summary: Unit tests for systemd +%if %{with testsuite} +%package testsuite +Summary: Testsuite for systemd +# Unit tests dependencies License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama # Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) Recommends: dosfstools +# The following deps on libs are for test-dlopen-so whereas the +# pkgconfig ones are used by test-funtions to find the libs on the +# host and install them in the image, see install_missing_libraries() +# for details. +%if %{with resolved} +Requires: libidn2 pkgconfig(libidn2) +%endif +%if %{with experimental} +Requires: libpwquality1 pkgconfig(pwquality) +Requires: libqrencode4 pkgconfig(libqrencode) +%endif +Requires: %{name} = %{version}-%{release} +Requires: attr +Requires: busybox-static +Requires: cryptsetup +Requires: dhcp-client +Requires: dosfstools +Requires: libcap-progs +Requires: lz4 +Requires: net-tools-deprecated +Requires: qemu-kvm +Requires: quota +Requires: socat +Requires: squashfs +Requires: systemd-container +Requires: libfido2 pkgconfig(libfido2) +Requires: libtss2-esys0 pkgconfig(tss2-esys) +Requires: libtss2-mu0 pkgconfig(tss2-mu) +Requires: libtss2-rc0 pkgconfig(tss2-rc) +%if %{with coredump} +Requires: systemd-coredump +%endif +%if %{with experimental} +Requires: systemd-experimental +%endif +%if %{with journal_remote} +Requires: systemd-journal-remote +%endif +%if %{with portabled} +Requires: systemd-portable +%endif +Requires: xz -%description tests -This package contains the unit tests used to check various internal -functions used by systemd and all its components. +%description testsuite +This package contains the unit tests as well as the extended +testsuite. The unit tests are used to check various internal functions +used by systemd whereas the extended testsuite is used to test various +functionalities of systemd and all its components. -The python script /usr/lib/systemd/tests/run-unit-tests.py can be used -to run all unit tests at once. +Note that the extended testsuite only works with UID=0. + +Run the following python script to run all unit tests at once: +$ %{_testsuitedir}/run-unit-tests.py + +To run the full extended testsuite do the following: +$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh + +Or to run one specific integration test: +$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run + +For more details on the available options to run the extended +testsuite, please refer to %{_testsuitedir}/test/README.testsuite. %endif %if %{with experimental} @@ -558,7 +615,9 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ +%if !0%{?usrmerged} -Dsplit-usr=true \ +%endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ @@ -625,7 +684,7 @@ Have fun with these services at your own risk. -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif -%if %{with tests} +%if %{with testsuite} -Dtests=unsafe \ -Dinstall-tests=true \ %else @@ -837,6 +896,10 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket +%if %{with testsuite} +cp -a test %{buildroot}%{_testsuitedir}/ +%endif + %if ! 0%{?bootstrap} %find_lang systemd %endif @@ -1759,9 +1822,11 @@ fi %{_mandir}/man*/systemd-portabled* %endif -%if %{with tests} -%files tests -%{_prefix}/lib/systemd/tests +%if %{with testsuite} +%files testsuite +%defattr(-,root,root) +%{_testsuitedir} +%doc %{_testsuitedir}/test/README.testsuite %endif %if %{with experimental} diff --git a/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz b/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz deleted file mode 100644 index a72a623b..00000000 --- a/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3750afd054f03b6868463ffd663441ead475d31dcd83d429c36580e7c6f748a -size 7123304 diff --git a/systemd-v249.4+suse.32.g40bda18e34.tar.xz b/systemd-v249.4+suse.32.g40bda18e34.tar.xz new file mode 100644 index 00000000..d130d483 --- /dev/null +++ b/systemd-v249.4+suse.32.g40bda18e34.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fddc0b0846c692af8bae3673728a0d95bfdcc448846c218e850b6b93e5493c2a +size 7265384 diff --git a/systemd.changes b/systemd.changes index 25dbc3d6..a93d76e2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Sep 1 11:54:23 UTC 2021 - Franck Bui + +- Configure split-usr=true only when %usrmerged is not defined + +------------------------------------------------------------------- +Wed Sep 1 09:56:55 UTC 2021 - Franck Bui + +- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/7f23815a706cf2b2df3eac2eb2f8220736b8f427...40bda18e346ff45132ccd6f8f8e96de78dcf3470 + +------------------------------------------------------------------- +Mon Aug 23 15:12:10 UTC 2021 - Franck Bui + +- Rework the test (sub)package: + - it's been renamed into 'systemd-testsuite' + - it includes the extended tests too + - the relevant commits have been backported to SUSE/v249 so no SUSE + specific patch is needed to run the extended tests (see below) + - the deps needed by the extended tests have been added + +- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427 + + ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too + 088fbb71d0 test: adapt install_pam() for openSUSE + 4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE" + ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static" + 6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only + 278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set + 3bba2f876a test: add support for NO_BUILD=1 on openSUSE + d77cbc1b64 test: make busybox TEST-13-only dependency + +------------------------------------------------------------------- +Mon Aug 2 12:54:44 UTC 2021 - Franck Bui + +- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719) + + See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for + details. + + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + ------------------------------------------------------------------- Thu Jul 29 13:12:48 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f55e9088..af809ac7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,8 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.45.g73e9e6fb84 +%define suse_version +suse.32.g40bda18e34 +%define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi %if 0%{?bootstrap} @@ -37,7 +38,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental -%bcond_with tests +%bcond_with testsuite %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -51,12 +52,12 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental -%bcond_without tests +%bcond_without testsuite %endif Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 248.6 +Version: 249.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -96,6 +97,7 @@ BuildRequires: libmount-devel >= 2.27.1 BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel +BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 @@ -485,22 +487,77 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif -%if %{with tests} -%package tests -Summary: Unit tests for systemd +%if %{with testsuite} +%package testsuite +Summary: Testsuite for systemd +# Unit tests dependencies License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama # Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) Recommends: dosfstools +# The following deps on libs are for test-dlopen-so whereas the +# pkgconfig ones are used by test-funtions to find the libs on the +# host and install them in the image, see install_missing_libraries() +# for details. +%if %{with resolved} +Requires: libidn2 pkgconfig(libidn2) +%endif +%if %{with experimental} +Requires: libpwquality1 pkgconfig(pwquality) +Requires: libqrencode4 pkgconfig(libqrencode) +%endif +Requires: %{name} = %{version}-%{release} +Requires: attr +Requires: busybox-static +Requires: cryptsetup +Requires: dhcp-client +Requires: dosfstools +Requires: libcap-progs +Requires: lz4 +Requires: net-tools-deprecated +Requires: qemu-kvm +Requires: quota +Requires: socat +Requires: squashfs +Requires: systemd-container +Requires: libfido2 pkgconfig(libfido2) +Requires: libtss2-esys0 pkgconfig(tss2-esys) +Requires: libtss2-mu0 pkgconfig(tss2-mu) +Requires: libtss2-rc0 pkgconfig(tss2-rc) +%if %{with coredump} +Requires: systemd-coredump +%endif +%if %{with experimental} +Requires: systemd-experimental +%endif +%if %{with journal_remote} +Requires: systemd-journal-remote +%endif +%if %{with portabled} +Requires: systemd-portable +%endif +Requires: xz -%description tests -This package contains the unit tests used to check various internal -functions used by systemd and all its components. +%description testsuite +This package contains the unit tests as well as the extended +testsuite. The unit tests are used to check various internal functions +used by systemd whereas the extended testsuite is used to test various +functionalities of systemd and all its components. -The python script /usr/lib/systemd/tests/run-unit-tests.py can be used -to run all unit tests at once. +Note that the extended testsuite only works with UID=0. + +Run the following python script to run all unit tests at once: +$ %{_testsuitedir}/run-unit-tests.py + +To run the full extended testsuite do the following: +$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh + +Or to run one specific integration test: +$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run + +For more details on the available options to run the extended +testsuite, please refer to %{_testsuitedir}/test/README.testsuite. %endif %if %{with experimental} @@ -556,7 +613,9 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ +%if !0%{?usrmerged} -Dsplit-usr=true \ +%endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ @@ -623,7 +682,7 @@ Have fun with these services at your own risk. -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif -%if %{with tests} +%if %{with testsuite} -Dtests=unsafe \ -Dinstall-tests=true \ %else @@ -835,6 +894,10 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket +%if %{with testsuite} +cp -a test %{buildroot}%{_testsuitedir}/ +%endif + %if ! 0%{?bootstrap} %find_lang systemd %endif @@ -1757,9 +1820,11 @@ fi %{_mandir}/man*/systemd-portabled* %endif -%if %{with tests} -%files tests -%{_prefix}/lib/systemd/tests +%if %{with testsuite} +%files testsuite +%defattr(-,root,root) +%{_testsuitedir} +%doc %{_testsuitedir}/test/README.testsuite %endif %if %{with experimental}