From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 07 Jul 2021 16:31:38 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m18aQ-0001sp-7C for lore@lore.pengutronix.de; Wed, 07 Jul 2021 16:31:38 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m18aP-00077k-QD; Wed, 07 Jul 2021 16:31:37 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m18a4-000773-3D; Wed, 07 Jul 2021 16:31:16 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m18a3-0002Yv-Jr; Wed, 07 Jul 2021 16:31:15 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1m18a3-001YgN-Gi; Wed, 07 Jul 2021 16:31:15 +0200 Date: Wed, 7 Jul 2021 16:31:15 +0200 From: Michael Olbrich To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Message-ID: <20210707143115.GG4015839@pengutronix.de> Mail-Followup-To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , ptxdist@pengutronix.de References: <20210705074925.26542-1-u.kleine-koenig@pengutronix.de> <20210705074925.26542-2-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210705074925.26542-2-u.kleine-koenig@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-K=F6nig wrote: > --- > ...ke-unrecognized-option-a-fatal-error.patch | 25 ----------------- > patches/chrony-3.5/series | 4 --- > ...t-install-docs-to-not-need-additiona.patch | 21 +++++++++++++++ > ...vice-Make-this-a-non-forking-service.patch | 27 +++++++++++++++++++ > patches/chrony-4.1/series | 5 ++++ > rules/chrony.make | 4 +-- > 6 files changed, 55 insertions(+), 31 deletions(-) > delete mode 100644 patches/chrony-3.5/0001-configure-make-unrecognized-o= ption-a-fatal-error.patch > delete mode 100644 patches/chrony-3.5/series > create mode 100644 patches/chrony-4.1/0001-Makefile.in-Don-t-install-doc= s-to-not-need-additiona.patch > create mode 100644 patches/chrony-4.1/0002-chronyd.service-Make-this-a-n= on-forking-service.patch > create mode 100644 patches/chrony-4.1/series > = > diff --git a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a= -fatal-error.patch b/patches/chrony-3.5/0001-configure-make-unrecognized-op= tion-a-fatal-error.patch > deleted file mode 100644 > index 01f2136338b9..000000000000 > --- a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-= error.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From: Bruno Thomsen > -Date: Fri, 31 Jul 2020 09:07:49 +0000 > -Subject: [PATCH] configure: make unrecognized option a fatal error > - > -This helps catch cases where options has been removed > -and are no longer valid. Including additional cross-build > -options that cannot be used. > - > -Signed-off-by: Bruno Thomsen > ---- > - configure | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/configure b/configure > -index 323f5743cd57..080f7bce746d 100755 > ---- a/configure > -+++ b/configure > -@@ -388,6 +388,7 @@ do > - ;; > - * ) > - echo "Unrecognized option : " $option > -+ exit 1 > - esac > - done > - = > diff --git a/patches/chrony-3.5/series b/patches/chrony-3.5/series > deleted file mode 100644 > index 5019725586fd..000000000000 > --- a/patches/chrony-3.5/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-configure-make-unrecognized-option-a-fatal-error.patch > -# c182e03aeda3f8c148ae51d52f839a6a - git-ptx-patches magic > diff --git a/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-no= t-need-additiona.patch b/patches/chrony-4.1/0001-Makefile.in-Don-t-install-= docs-to-not-need-additiona.patch > new file mode 100644 > index 000000000000..13d3df8c7dcb > --- /dev/null > +++ b/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-= additiona.patch > @@ -0,0 +1,21 @@ > +From: =3D?UTF-8?q?Uwe=3D20Kleine-K=3DC3=3DB6nig?=3D > +Date: Mon, 19 Apr 2021 17:33:41 +0200 > +Subject: [PATCH] Makefile.in: Don't install docs to not need additional = build > + dependencies I don't think this is needed in general: The *.man.in files are shipped in the tarball, and then only 'sed' is needed. Maybe you worked with a git checkout in local_src/ when this happened? > + > +--- > + Makefile.in | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/Makefile.in b/Makefile.in > +index 9a51df20074a..758e1e87771d 100644 > +--- a/Makefile.in > ++++ b/Makefile.in > +@@ -95,7 +95,6 @@ install: chronyd chronyc > + chmod 755 $(DESTDIR)$(SBINDIR)/chronyd > + cp chronyc $(DESTDIR)$(BINDIR)/chronyc > + chmod 755 $(DESTDIR)$(BINDIR)/chronyc > +- $(MAKE) -C doc install > + = > + docs : > + $(MAKE) -C doc docs > diff --git a/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-fork= ing-service.patch b/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non= -forking-service.patch > new file mode 100644 > index 000000000000..39c1e0e79f16 > --- /dev/null > +++ b/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-ser= vice.patch > @@ -0,0 +1,27 @@ > +From: =3D?UTF-8?q?Uwe=3D20Kleine-K=3DC3=3DB6nig?=3D > +Date: Mon, 19 Apr 2021 17:34:34 +0200 > +Subject: [PATCH] chronyd.service: Make this a non-forking service > + > +This allows to add -d to $OPTIONS without systemd killing the daemon > +after a short uptime. > +--- > + examples/chronyd.service | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/examples/chronyd.service b/examples/chronyd.service > +index 289548cbab87..7a7c693d9e63 100644 > +--- a/examples/chronyd.service > ++++ b/examples/chronyd.service > +@@ -6,10 +6,10 @@ Conflicts=3Dntpd.service systemd-timesyncd.service > + ConditionCapability=3DCAP_SYS_TIME > + = > + [Service] > +-Type=3Dforking > ++Type=3Dexec > + PIDFile=3D/run/chrony/chronyd.pid > + EnvironmentFile=3D-/etc/sysconfig/chronyd > +-ExecStart=3D/usr/sbin/chronyd $OPTIONS > ++ExecStart=3D/usr/sbin/chronyd -d $OPTIONS Maybe use -n instead of -d to keep the logging as it was? Michael > + PrivateTmp=3Dyes > + ProtectHome=3Dyes > + ProtectSystem=3Dfull > diff --git a/patches/chrony-4.1/series b/patches/chrony-4.1/series > new file mode 100644 > index 000000000000..edccbe20d778 > --- /dev/null > +++ b/patches/chrony-4.1/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > +0002-chronyd.service-Make-this-a-non-forking-service.patch > +# 615ea3ced1c5eafb46beca36157cbc23 - git-ptx-patches magic > diff --git a/rules/chrony.make b/rules/chrony.make > index bdceb454c175..6ba7da89da28 100644 > --- a/rules/chrony.make > +++ b/rules/chrony.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) +=3D chrony > # > # Paths and names > # > -CHRONY_VERSION :=3D 3.5 > -CHRONY_MD5 :=3D 5f66338bc940a9b51eede8f391e7bed3 > +CHRONY_VERSION :=3D 4.1 > +CHRONY_MD5 :=3D 7133880806887b629678c36a48217806 > CHRONY :=3D chrony-$(CHRONY_VERSION) > CHRONY_SUFFIX :=3D tar.gz > CHRONY_URL :=3D http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_= SUFFIX) > -- = > 2.30.2 > = > = > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request= @pengutronix.de > = -- = Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@p= engutronix.de