--- ...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-option-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-docs-to-not-need-additiona.patch create mode 100644 patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-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-option-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 <bruno.thom...@gmail.com> -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 <bruno.thom...@gmail.com> ---- - 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-not-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: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koe...@pengutronix.de> +Date: Mon, 19 Apr 2021 17:33:41 +0200 +Subject: [PATCH] Makefile.in: Don't install docs to not need additional build + dependencies + +--- + 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-forking-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-service.patch @@ -0,0 +1,27 @@ +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koe...@pengutronix.de> +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=ntpd.service systemd-timesyncd.service + ConditionCapability=CAP_SYS_TIME + + [Service] +-Type=forking ++Type=exec + PIDFile=/run/chrony/chronyd.pid + EnvironmentFile=-/etc/sysconfig/chronyd +-ExecStart=/usr/sbin/chronyd $OPTIONS ++ExecStart=/usr/sbin/chronyd -d $OPTIONS + PrivateTmp=yes + ProtectHome=yes + ProtectSystem=full 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) += chrony # # Paths and names # -CHRONY_VERSION := 3.5 -CHRONY_MD5 := 5f66338bc940a9b51eede8f391e7bed3 +CHRONY_VERSION := 4.1 +CHRONY_MD5 := 7133880806887b629678c36a48217806 CHRONY := chrony-$(CHRONY_VERSION) CHRONY_SUFFIX := tar.gz CHRONY_URL := 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-requ...@pengutronix.de
