From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91709C433EF for ; Tue, 19 Jul 2022 16:21:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DB63C4157C; Tue, 19 Jul 2022 16:21:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DB63C4157C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DGe5vkRN7SFY; Tue, 19 Jul 2022 16:21:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 7C1A74151E; Tue, 19 Jul 2022 16:21:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7C1A74151E Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0109E1BF417 for ; Tue, 19 Jul 2022 16:21:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CED22408A2 for ; Tue, 19 Jul 2022 16:21:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CED22408A2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dtLSXB9vUNuy for ; Tue, 19 Jul 2022 16:21:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 33A89415B6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by smtp4.osuosl.org (Postfix) with ESMTPS id 33A89415B6 for ; Tue, 19 Jul 2022 16:21:44 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b51:cb00:5d47:1bcb:9db:ce0f]) (Authenticated sender: yann.morin.1998@free.fr) by smtp3-g21.free.fr (Postfix) with ESMTPSA id 3390413F92C; Tue, 19 Jul 2022 18:21:39 +0200 (CEST) Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Tue, 19 Jul 2022 18:21:38 +0200 Date: Tue, 19 Jul 2022 18:21:38 +0200 From: "Yann E. MORIN" To: Norbert Lange Message-ID: <20220719162138.GL2249625@scaer> References: <20220719130449.334694-1-nolange79@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220719130449.334694-1-nolange79@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1658247701; bh=jr9yr7QbjkBy9qf1/Ve0tLkHSC4uUkVNkc1JrzkazsE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZBRBFMF1K1p+C7PqTUml4m+TcUUvKXkfgwmp3qFTwnnJ536isQ+3WIj//gqCYrkCX 1NM+maxEklUGoHVeQjpsRAEHX2oGlVeqGFUWl5eFk6+7+QGelfaDNEkRRXuvYMaJP1 RklFX99xWpmkQOUCqzgkYFmg1AAkzG+irQ+6nbfUqXxFSyPYlQeDepd1rLDbZV5LfE 9m64uCTHPFXpPvQQ5gT21HqATyOxHPxPFl2NfU5Ck6D7OPsP5PrTcc7WIU5bNPXgLv +DdfV1PU2GzsELkLds8Ivo01Ldu68a+JtF1vo5T+Ahx1G5mDCBtrWiTZf9aL8pdffI 5mBbX2/nkT3Qg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=ZBRBFMF1 Subject: Re: [Buildroot] [PATCH 1/1] package/systemd: bump to version 251.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Norbert, All, On 2022-07-19 15:04 +0200, Norbert Lange spake thusly: > Add config option for the new sysupdate feature. Honestly, with a package so complex and critical like systemd, I would prefer that new features not be added during the bump, but as followup patches. The bump should add a force-disable of new features (when known), or just leave them as auto-detected or upstream-decided defaults. > Remove upstreamed patch. > > Update options, manually setdefault options, remove option Sorry, I don't immediately see what "manually setdefault" means... Is there a missing space, and this should be "manually set default" ? Or is "setdefault" and actual systemd concept? (genuinely asking) > not available anymore. > > Set default-user-shell based on wether a couple packages > are enabled. > > Set default-locale to C, this seems the only safe default, How does that play with BR2_ENABLE_LOCALE_WHITELIST? I think that we would want to use the first word of BR2_ENABLE_LOCALE_WHITELIST is it is set, falling back to just 'C' otherwise. Furthermore, that is not a novelty with v251; v250 already had that option, so that should be a separate, preliminary patch. > users can override this in `/etc/locale.conf`. > Signed-off-by: Norbert Lange > --- [--SNIP--] > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index 3572b25965..838ed13fd5 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz > +sha256 11c9c3fcc13d689615dd2ea79161d1b992087cf1e2a23856d7d7ade0efbddc54 systemd-251.3.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > @@ -11,4 +11,4 @@ sha256 790ac93fb2859097bdda4cf08b5a4feb5e479d0cb2c74f403248241bc3e7c216 LICENS > sha256 b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0 LICENSES/MIT.txt > sha256 2a98749f6bec00dfaed86fa9c1edea871aaae4f11ee4d100b671aaf4ce353a73 LICENSES/murmurhash2-public-domain.txt > sha256 1a7adaa2c86cedfd6c7f5c0c7c72fd6d3e02cd0c9593f21fdb53c89bb2b130ec LICENSES/OFL-1.1.txt > -sha256 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md > +sha256 177ff657698bc940f9888b7f69e5d734b0933c2859ea264fde8de1700cec40dd LICENSES/README.md What has changed in that license file? How does it impact (or not) the licensing info we carry? We have hashes for license files, so that we know they licensing terms change when a package is updated. Silently changing the hash kind of defeats the purpose for those hashes... > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 46a4e8de2c..b6fffc553f 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk [--SNIP--] > @@ -472,6 +474,20 @@ else > SYSTEMD_CONF_OPTS += -Dsysext=false > endif > > +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) > +SYSTEMD_CONF_OPTS += -Dsysupdate=true > +else > +SYSTEMD_CONF_OPTS += -Dsysupdate=false > +endif > + > +ifeq ($(BR2_PACKAGE_BASH),y) > +SYSTEMD_CONF_OPTS += -Ddefault-user-shell=/bin/bash > +else ifeq ($(BR2_PACKAGE_ZSH),y) > +SYSTEMD_CONF_OPTS += -Ddefault-user-shell=/bin/zsh > +else > +SYSTEMD_CONF_OPTS += -Ddefault-user-shell=/bin/sh > +endif We already have BR2_SYSTEM_BIN_SH which defines what /bin/sh is, and so I think we should use exactly /bin/sh as the default shell: ifneq ($(BR2_SYSTEM_BIN_SH_NONE),y) SYSTEMD_CONF_OPTS += -Ddefault-user-shell=/bin/sh endif If there is not default shell for the system, then there is none for users as well. Systemd-defined users that want a specific shell will have to explicitly request it: if they have a requirement for a specific shell, they can't rely on whatever the default is, so usng /bin/sh is exactly what we want. If BR2_SYSTEM_BIN_SH is empty, it is perfectly possible that there is no shell available at all (no standalone shell, no shell in busybox), so we don't want to set any default either. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot