Bump and various improvements to systemd
cover Bump and various improvements to systemd
Bump systemd to latest release, then fix various minor issues
J?r?my Rosen (3):
systemd: bump to v239
systemd: add support for PCRE2
systemd: fix nogroup
package/systemd/0001-fix-getty-unit.patch | 61 ++++-- .../0002-install-don-t-use-ln-relative.patch | 19 +- ...-include-libmount-h-in-a-header-file.patch | 75 ------- .../0005-basic-macros-rename-noreturn.patch | 201 ------------------ package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 12 +- 6 files changed, 72 insertions(+), 298 deletions(-) delete mode 100644 package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch delete mode 100644 package/systemd/0005-basic-macros-rename-noreturn.patch
Signature · 1 line
2.18.0
PATCH 1/3 systemd: bump to v239
* remove upstreamed patches
* refresh patch 0002 which didn't apply cleanly
* update patch 0001 to catch more uses of agetty
--- package/systemd/0001-fix-getty-unit.patch | 61 ++++-- .../0002-install-don-t-use-ln-relative.patch | 19 +- ...-include-libmount-h-in-a-header-file.patch | 75 ------- .../0005-basic-macros-rename-noreturn.patch | 201 ------------------ package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 6 files changed, 63 insertions(+), 297 deletions(-) delete mode 100644 package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch delete mode 100644 package/systemd/0005-basic-macros-rename-noreturn.patch
package/systemd/0001-fix-getty-unit.patch +49 -12
@@ -1,21 +1,58 @@ -From 7deb6387aeb07fa4300fa3cf9d6c039dabd120d7 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard <[email protected]> -Date: Mon, 31 Jul 2017 10:08:46 -0400 -Subject: [PATCH] fix-getty-unit - -Prefer getty to agetty in console setup systemd units +From 58dba37de7a2cd6e353f1ada97f1f3bc85ebf87b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <[email protected]> +Date: Fri, 22 Jun 2018 11:19:07 +0200 +Subject: [PATCH 1/3] Prefer getty to agetty in console setup systemd units +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Signed-off-by: Maxime Ripard <[email protected]> Signed-off-by: Eric Le Bihan <[email protected]> [aduskett at gmail.com: Update for systemd v237] Signed-off-by: Adam Duskett <[email protected]> +[jeremy.rosen at smile.fr: Update for systemd v238] +Signed-off-by: J?r?my Rosen <[email protected]> --- - units/getty at .service.m4 | 5 +---- - units/serial-getty at .service.m4 | 2 +- - 2 files changed, 2 insertions(+), 5 deletions(-) + units/console-getty.service.m4 | 5 +---- + units/container-getty at .service.m4 | 5 +---- + units/getty at .service.m4 | 5 +---- + units/serial-getty at .service.m4 | 2 +- + 4 files changed, 4 insertions(+), 13 deletions(-) +diff --git a/units/console-getty.service.m4 b/units/console-getty.service.m4 +index 3c553240a..4f8fdf668 100644 +--- a/units/console-getty.service.m4 ++++ b/units/console-getty.service.m4 +@@ -20,10 +20,7 @@ Before=getty.target + ConditionPathExists=/dev/console + + [Service] +-# The '-o' option value tells agetty to replace 'login' arguments with an +-# option to preserve environment (-p), followed by '--' for safety, and then +-# the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM ++ExecStart=-/sbin/getty -L %I 115200 vt100 + Type=idle + Restart=always + UtmpIdentifier=cons +diff --git a/units/container-getty at .service.m4 b/units/container-getty at .service.m4 +index 087ab7f9b..9d1b78cef 100644 +--- a/units/container-getty at .service.m4 ++++ b/units/container-getty at .service.m4 +@@ -25,10 +25,7 @@ Conflicts=rescue.service + Before=rescue.service + + [Service] +-# The '-o' option value tells agetty to replace 'login' arguments with an +-# option to preserve environment (-p), followed by '--' for safety, and then +-# the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM ++ExecStart=-/sbin/getty -L %I 115200 vt100 + Type=idle + Restart=always + RestartSec=0 diff --git a/units/getty at .service.m4 b/units/getty at .service.m4 -index 2a84061..7ad588f 100644 +index 80e793bb7..385758c61 100644 --- a/units/getty at .service.m4 +++ b/units/getty at .service.m4 @@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0
@@ -31,7 +68,7 @@ index 2a84061..7ad588f 100644 Restart=always RestartSec=0 diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4 -index b7caeaf..c663612 100644 +index 757b86ab2..3d60efdb6 100644 --- a/units/serial-getty at .service.m4 +++ b/units/serial-getty at .service.m4 @@ -33,7 +33,7 @@ Before=rescue.service
@@ -44,5 +81,5 @@ index b7caeaf..c663612 100644 Restart=always UtmpIdentifier=%I -- -2.13.3 +2.18.0
package/systemd/0002-install-don-t-use-ln-relative.patch +12 -7
@@ -1,7 +1,10 @@ -From 17560d52e9ec0afebbfe31e694870c6433b36f60 Mon Sep 17 00:00:00 2001 +From f8757e2d9c7c76c5ec0eaeab4a90b8bd663d6956 Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> Date: Sun, 31 Dec 2017 12:46:04 -0500 -Subject: [PATCH] install: don't use ln --relative +Subject: [PATCH 2/3] install: don't use ln --relative +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Oldish enterprise-class distributions have too old versions of coreutils, with ln not supporting --relative.
@@ -23,6 +26,8 @@ Signed-off-by: "Yann E. MORIN" <[email protected]> Signed-off-by: Adam Duskett <[email protected]> [tpiepho at impinj.com: Fix add-wants wrapper] Signed-off-by: Trent Piepho <[email protected]> +[jeremy.rosen at smile.fr: Update for systemd v239] +Signed-off-by: J?r?my Rosen <[email protected]> --- meson.build | 2 +- tools/meson-make-symlink.sh | 3 ++-
@@ -30,15 +35,15 @@ Signed-off-by: Trent Piepho <[email protected]> 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build -index d4af95a44..d75f2b34c 100644 +index 04331dd41..359042c04 100644 --- a/meson.build +++ b/meson.build -@@ -586,7 +586,7 @@ endforeach +@@ -559,7 +559,7 @@ endforeach conf.set_quoted('TELINIT', get_option('telinit-path')) if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative') -+ message('ln does not support --relative') +- error('ln does not support --relative (added in coreutils 8.16)') ++ message('ln does not support --relative (added in coreutils 8.16)') endif ############################################################
@@ -76,5 +81,5 @@ index 70f7172ae..bb8155075 100755 +dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')" +ln -vfs "$dds$unitpath" "$dir" -- -2.14.3 +2.18.0
package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch deleted +0 -75
75 lines not on this page · raw message
package/systemd/0005-basic-macros-rename-noreturn.patch deleted +0 -201
201 lines not on this page · raw message
package/systemd/systemd.hash +1 -1
@@ -1,5 +1,5 @@ # sha256 locally computed -sha256 c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c systemd-237.tar.gz +sha256 8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14 systemd-239.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 9c7709aa401a41c4c3f33ea75c34ae5d5354d62c310c3391c2a5958952d8aadd README
package/systemd/systemd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 237 +SYSTEMD_VERSION = 239 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
Signature · 1 line
2.18.0
PATCH 1/3 systemd: bump to v239
Hello J?r?my,
Le 30/06/2018 ? 00:25, J?r?my Rosen a ?crit?:
Quoted 3 lines
* remove upstreamed patches
* refresh patch 0002 which didn't apply cleanly
* update patch 0001 to catch more uses of agetty
I believe the patch 0003-fix-am-path-libgcrypt-no-found.patch is not needed anymore since systemd now use meson. It's not related to this patch though, it should have been removed while switching to meson build system.
Quoted 19 lines
Signed-off-by J?r?my Rosen <[email protected]>--- package/systemd/0001-fix-getty-unit.patch | 61 ++++-- .../0002-install-don-t-use-ln-relative.patch | 19 +- ...-include-libmount-h-in-a-header-file.patch | 75 ------- .../0005-basic-macros-rename-noreturn.patch | 201 ------------------ package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 6 files changed, 63 insertions(+), 297 deletions(-) delete mode 100644 package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch delete mode 100644 package/systemd/0005-basic-macros-rename-noreturn.patchpackage/systemd/0001-fix-getty-unit.patch +0
-0
package/systemd/0001-fix-getty-unit.patch line 2
Quoted 8 lines
package/systemd/0001-fix-getty-unit.patch +2
-6@@ -1,21 +1,58 @@ -From 7deb6387aeb07fa4300fa3cf9d6c039dabd120d7 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard <[email protected]> -Date: Mon, 31 Jul 2017 10:08:46 -0400 -Subject: [PATCH] fix-getty-unit - -Prefer getty to agetty in console setup systemd units +From 58dba37de7a2cd6e353f1ada97f1f3bc85ebf87b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <[email protected]>
Please, keep authorship of the patch even if you rebase it on a new systemd version.
package/systemd/0001-fix-getty-unit.patch line 4
Quoted 2 lines
package/systemd/0001-fix-getty-unit.patch +2
-0+Date: Fri, 22 Jun 2018 11:19:07 +0200 +Subject: [PATCH 1/3] Prefer getty to agetty in console setup systemd units
Use -N with git format-patch to omit patch numbers from the subject. Patches present in the systemd package directory can be removed/added separately.
Quoted 11 lines
package/systemd/0001-fix-getty-unit.patch +5
-0+MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Signed-off-by: Maxime Ripard <[email protected]> Signed-off-by: Eric Le Bihan <[email protected]> [aduskett at gmail.com: Update for systemd v237] Signed-off-by: Adam Duskett <[email protected]> +[jeremy.rosen at smile.fr: Update for systemd v238] +Signed-off-by: J?r?my Rosen <[email protected]> ---
[...]
package/systemd/0002-install-don-t-use-ln-relative.patch line 4
Quoted 11 lines
package/systemd/0002-install-don-t-use-ln-relative.patch +2
-2@@ -1,7 +1,10 @@ -From 17560d52e9ec0afebbfe31e694870c6433b36f60 Mon Sep 17 00:00:00 2001 +From f8757e2d9c7c76c5ec0eaeab4a90b8bd663d6956 Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> Date: Sun, 31 Dec 2017 12:46:04 -0500 -Subject: [PATCH] install: don't use ln --relative +Subject: [PATCH 2/3] install: don't use ln --relative
Use git format-patch -N
Quoted 13 lines
package/systemd/0002-install-don-t-use-ln-relative.patch +5
-0+MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Oldish enterprise-class distributions have too old versions of coreutils, with ln not supporting --relative.@@ -23,6 +26,8 @@ Signed-off-by: "Yann E. MORIN" <[email protected]> Signed-off-by: Adam Duskett <[email protected]> [tpiepho at impinj.com: Fix add-wants wrapper] Signed-off-by: Trent Piepho <[email protected]> +[jeremy.rosen at smile.fr: Update for systemd v239] +Signed-off-by: J?r?my Rosen <[email protected]> ---
[...]
package/systemd/systemd.mk line 8
Quoted 11 lines
package/systemd/systemd.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 237 +SYSTEMD_VERSION = 239 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
As you noticed, there is another systemd repository containing an "upstream maintained stable systemd version" for each release [1].
Do we want to keep the official systemd release + Buildroot patches or sync to the systemd stable branch when needed.
[1] https://github.com/systemd/systemd-stable
Best regards,
Romain
Quoted 3 lines
package/systemd/systemd.mk +0
-0SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
PATCH 1/3 systemd: bump to v239
In reply to Jérémy RosenHello,
Quoted 6 lines · J?r?my Rosen
* remove upstreamed patches
* refresh patch 0002 which didn't apply cleanly
* update patch 0001 to catch more uses of agettySigned-off-by J?r?my Rosen <[email protected]>
Quoted 10 lines
--- package/systemd/0001-fix-getty-unit.patch | 61 ++++-- .../0002-install-don-t-use-ln-relative.patch | 19 +- ...-include-libmount-h-in-a-header-file.patch | 75 ------- .../0005-basic-macros-rename-noreturn.patch | 201 ------------------ package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 6 files changed, 63 insertions(+), 297 deletions(-) delete mode 100644 package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch delete mode 100644 package/systemd/0005-basic-macros-rename-noreturn.patch
I've applied, after fixing the issues pointed out by Romain: do not re-assign the patches to yourself when you're just making some small adjustements, use "git format-patch -N".
Also, you forgot to update the hash of the README file, which has changed. That was breaking "make legal-info", so I fixed that.
Finally, I did a follow-up commit dropping the 0003 patch, which as noted by Romain Naour was no longer needed.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 systemd: bump to v239
Thanks a lot.
I was preparing a V2 with the same fixes, but you were too fast for me
:)
J?r?my
Quoted 32 lines · Thomas Petazzoni
Hello,
Quoted 14 lines · J?r?my Rosen
* remove upstreamed patches
* refresh patch 0002 which didn't apply cleanly
* update patch 0001 to catch more uses of agettySigned-off-by J?r?my Rosen <[email protected]>--- package/systemd/0001-fix-getty-unit.patch | 61 ++++-- .../0002-install-don-t-use-ln-relative.patch | 19 +- ...-include-libmount-h-in-a-header-file.patch | 75 ------- .../0005-basic-macros-rename-noreturn.patch | 201 ------------------ package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 6 files changed, 63 insertions(+), 297 deletions(-)Quoted 2 lines
delete mode 100644
package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patchdelete mode 100644package/systemd/0005-basic-macros-rename-noreturn.patchI've applied, after fixing the issues pointed out by Romain: do not re-assign the patches to yourself when you're just making some small adjustements, use "git format-patch -N".
Also, you forgot to update the hash of the README file, which has changed. That was breaking "make legal-info", so I fixed that.
Finally, I did a follow-up commit dropping the 0003 patch, which as noted by Romain Naour was no longer needed.
Thanks!
Thomas
Signature · 27 lines
SMILE <http://www.smile.eu/> 20 rue des Jardins 92600 Asni?res-sur-Seine *J?r?my ROSEN* Architecte technique Responsable de l'expertise Smile-ECS email jeremy.rosen at smile.fr <mailto:[email protected]> phone +33141402967 url http://www.smile.eu Twitter <https://twitter.com/GroupeSmile> Facebook <https://www.facebook.com/smileopensource> LinkedIn <https://www.linkedin.com/company/smile> Github <https://github.com/Smile-SA> D?couvrez l?univers Smile, rendez-vous sur smile.eu <http://smile.eu/?utm_source=signature&utm_medium=email&utm_campaign=signature> eco Pour la plan?te, n'imprimez ce mail que si c'est n?cessaire -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180703/cf05ba2a/attachment.html>
PATCH 2/3 systemd: add support for PCRE2
In reply to Jérémy Rosensystemd can use libpcre2 when available
add detection of that library
--- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/systemd/systemd.mk +7 -0
@@ -144,6 +144,13 @@ else SYSTEMD_CONF_OPTS += -Dgcrypt=false endif +ifeq ($(BR2_PACKAGE_PCRE2),y) +SYSTEMD_DEPENDENCIES += pcre2 +SYSTEMD_CONF_OPTS += -Dpcre2=true +else +SYSTEMD_CONF_OPTS += -Dpcre2=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) SYSTEMD_DEPENDENCIES += libmicrohttpd SYSTEMD_CONF_OPTS += -Dmicrohttpd=true
Signature · 1 line
2.18.0
Thomas Petazzoni
AppliedPATCH 2/3 systemd: add support for PCRE2
Hello,
Quoted 8 lines · J?r?my Rosen
systemd can use libpcre2 when available
add detection of that librarySigned-off-by J?r?my Rosen <[email protected]>--- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 systemd: fix nogroup
In reply to Jérémy RosenThe special 65534 group is named nogroup (not nobody) in buildroot tell systemd about that
--- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/systemd/systemd.mk +2 -1
@@ -43,7 +43,8 @@ SYSTEMD_CONF_OPTS += \ -Dkexec-path=/usr/sbin/kexec \ -Dsulogin-path=/usr/sbin/sulogin \ -Dmount-path=/usr/bin/mount \ - -Dumount-path=/usr/bin/umount + -Dumount-path=/usr/bin/umount \ + -Dnobody-group=nogroup # disable unsupported features for non-glibc toolchains ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
Signature · 1 line
2.18.0
PATCH 3/3 systemd: fix nogroup
On 2018-06-30 00:25 +0200, J?r?my Rosen spake thusly:
Quoted 13 lines
The special 65534 group is named nogroup (not nobody) in buildroot tell systemd about that
Signed-off-by J?r?my Rosen <[email protected]>--- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)package/systemd/systemd.mk +0
-0
package/systemd/systemd.mk SYSTEMD_CONF_OPTS += \ · line 47
Quoted 6 lines
package/systemd/systemd.mk +2
-1@@ -43,7 +43,8 @@ SYSTEMD_CONF_OPTS += \ -Dkexec-path=/usr/sbin/kexec \ -Dsulogin-path=/usr/sbin/sulogin \ -Dmount-path=/usr/bin/mount \ - -Dumount-path=/usr/bin/umount + -Dumount-path=/usr/bin/umount \ + -Dnobody-group=nogroup
Regards,
Yann E. MORIN.
Quoted 9 lines
package/systemd/systemd.mk +0
-0# disable unsupported features for non-glibc toolchains ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)Signature · 6 lines
2.18.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 3/3 systemd: fix nogroup
In reply to Jérémy RosenHello,
Quoted 7 lines · J?r?my Rosen
The special 65534 group is named nogroup (not nobody) in buildroot tell systemd about that
Signed-off-by J?r?my Rosen <[email protected]>--- package/systemd/systemd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 systemd: fix nogroup
In reply to Jérémy RosenQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?r?my" == J?r?my Rosen <[email protected]> writes:
The special 65534 group is named nogroup (not nobody) in buildroot tell systemd about that
Signed-off-by J?r?my Rosen <[email protected]>
Committed to 2018.02.x and 2018.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard