mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] chrony: unify location of config files
@ 2021-07-05  7:49 Uwe Kleine-König
  2021-07-05  7:49 ` [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1 Uwe Kleine-König
  2021-07-07 14:15 ` [ptxdist] [PATCH 1/2] chrony: unify location of config files Michael Olbrich
  0 siblings, 2 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2021-07-05  7:49 UTC (permalink / raw)
  To: ptxdist

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2143 bytes --]

The upstream default location of the config file is directly in /etc
instead of /etc/chrony/ and also the systemd unit uses /etc. So switch
the init script and ptxdist rules accordingly.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 projectroot/etc/init.d/chrony | 4 ++--
 rules/chrony.make             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony
index d112927f825e..1602eec6dcb9 100644
--- a/projectroot/etc/init.d/chrony
+++ b/projectroot/etc/init.d/chrony
@@ -9,14 +9,14 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 BINARY="/usr/sbin/chronyd"
-CONFIG="/etc/chrony/chrony.conf"
+CONFIG="/etc/chrony.conf"
 PREFIX="chrony: "
 # This system doesn´t have full rtc ioctl support for
 # chrony statistic functions
 RTC_IOCTL="incomplete"
 
 # some chronyc commands need prior autentication: extract keys from config
-KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' /etc/chrony/chrony.conf)
+KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' "$CONFIG")
 PASSWORD=`awk '$1 ~ /^'$KEY'$/ {print $2; exit}' /etc/chrony/chrony.keys`
 
 # convenience functions
diff --git a/rules/chrony.make b/rules/chrony.make
index cbdf9314b52b..bdceb454c175 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -100,14 +100,14 @@ endif
 
 # generic one
 ifdef PTXCONF_CHRONY_INSTALL_CONFIG
-	@$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony/chrony.conf)
-	@$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony/chrony.keys)
+	@$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony.conf)
+	@$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony.keys)
 
 # modify placeholders with data from configuration
-	@$(call install_replace, chrony, /etc/chrony/chrony.conf, \
+	@$(call install_replace, chrony, /etc/chrony.conf, \
 		@UNCONFIGURED_CHRONY_SERVER_IP@, $(PTXCONF_CHRONY_DEFAULT_NTP_SERVER))
 
-	@$(call install_replace, chrony, /etc/chrony/chrony.keys, \
+	@$(call install_replace, chrony, /etc/chrony.keys, \
 		@UNCONFIGURED_CHRONY_ACCESS_KEY@, $(PTXCONF_CHRONY_DEFAULT_ACCESS_KEY))
 endif
 
-- 
2.30.2



[-- Attachment #2: Type: text/plain, Size: 181 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
  2021-07-05  7:49 [ptxdist] [PATCH 1/2] chrony: unify location of config files Uwe Kleine-König
@ 2021-07-05  7:49 ` Uwe Kleine-König
  2021-07-07 14:31   ` Michael Olbrich
  2021-07-07 14:15 ` [ptxdist] [PATCH 1/2] chrony: unify location of config files Michael Olbrich
  1 sibling, 1 reply; 6+ messages in thread
From: Uwe Kleine-König @ 2021-07-05  7:49 UTC (permalink / raw)
  To: ptxdist

---
 ...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.thomsen@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.thomsen@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-koenig@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-koenig@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-request@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] chrony: unify location of config files
  2021-07-05  7:49 [ptxdist] [PATCH 1/2] chrony: unify location of config files Uwe Kleine-König
  2021-07-05  7:49 ` [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1 Uwe Kleine-König
@ 2021-07-07 14:15 ` Michael Olbrich
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-07-07 14:15 UTC (permalink / raw)
  To: Uwe Kleine-König; +Cc: ptxdist

On Mon, Jul 05, 2021 at 09:49:24AM +0200, Uwe Kleine-König wrote:
> The upstream default location of the config file is directly in /etc
> instead of /etc/chrony/ and also the systemd unit uses /etc. So switch
> the init script and ptxdist rules accordingly.

We have

projectroot/etc/chrony/chrony.conf
projectroot/etc/chrony/chrony.keys

in PTXdist. Those should be moved, right?

Michael

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  projectroot/etc/init.d/chrony | 4 ++--
>  rules/chrony.make             | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony
> index d112927f825e..1602eec6dcb9 100644
> --- a/projectroot/etc/init.d/chrony
> +++ b/projectroot/etc/init.d/chrony
> @@ -9,14 +9,14 @@
>  
>  PATH=/sbin:/bin:/usr/bin:/usr/sbin
>  BINARY="/usr/sbin/chronyd"
> -CONFIG="/etc/chrony/chrony.conf"
> +CONFIG="/etc/chrony.conf"
>  PREFIX="chrony: "
>  # This system doesn?t have full rtc ioctl support for
>  # chrony statistic functions
>  RTC_IOCTL="incomplete"
>  
>  # some chronyc commands need prior autentication: extract keys from config
> -KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' /etc/chrony/chrony.conf)
> +KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' "$CONFIG")
>  PASSWORD=`awk '$1 ~ /^'$KEY'$/ {print $2; exit}' /etc/chrony/chrony.keys`
>  
>  # convenience functions
> diff --git a/rules/chrony.make b/rules/chrony.make
> index cbdf9314b52b..bdceb454c175 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -100,14 +100,14 @@ endif
>  
>  # generic one
>  ifdef PTXCONF_CHRONY_INSTALL_CONFIG
> -	@$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony/chrony.conf)
> -	@$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony/chrony.keys)
> +	@$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony.conf)
> +	@$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony.keys)
>  
>  # modify placeholders with data from configuration
> -	@$(call install_replace, chrony, /etc/chrony/chrony.conf, \
> +	@$(call install_replace, chrony, /etc/chrony.conf, \
>  		@UNCONFIGURED_CHRONY_SERVER_IP@, $(PTXCONF_CHRONY_DEFAULT_NTP_SERVER))
>  
> -	@$(call install_replace, chrony, /etc/chrony/chrony.keys, \
> +	@$(call install_replace, chrony, /etc/chrony.keys, \
>  		@UNCONFIGURED_CHRONY_ACCESS_KEY@, $(PTXCONF_CHRONY_DEFAULT_ACCESS_KEY))
>  endif
>  
> -- 
> 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@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
  2021-07-05  7:49 ` [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1 Uwe Kleine-König
@ 2021-07-07 14:31   ` Michael Olbrich
  2021-07-07 14:52     ` Bruno Thomsen
  0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2021-07-07 14:31 UTC (permalink / raw)
  To: Uwe Kleine-König; +Cc: ptxdist

On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-König 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-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.thomsen@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.thomsen@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-koenig@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

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-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-koenig@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

Maybe use -n instead of -d to keep the logging as it was?

Michael

> + 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-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@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
  2021-07-07 14:31   ` Michael Olbrich
@ 2021-07-07 14:52     ` Bruno Thomsen
  2021-07-07 16:42       ` Uwe Kleine-König
  0 siblings, 1 reply; 6+ messages in thread
From: Bruno Thomsen @ 2021-07-07 14:52 UTC (permalink / raw)
  To: ptxdist, Uwe Kleine-König

Den ons. 7. jul. 2021 kl. 16.31 skrev Michael Olbrich
<m.olbrich@pengutronix.de>:
>
> On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-König 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-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.thomsen@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.thomsen@gmail.com>

Hi,

This patch was added last year to ptxdist, so it's possible to detect
unrecognized options in new chrony versions as they use a custom
hand crafted configure script. So unless that situation has changed
this patch should be kept.

/Bruno

> > ----
> > - 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-koenig@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
>
> 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-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-koenig@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
>
> Maybe use -n instead of -d to keep the logging as it was?
>
> Michael
>
> > + 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-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@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
  2021-07-07 14:52     ` Bruno Thomsen
@ 2021-07-07 16:42       ` Uwe Kleine-König
  0 siblings, 0 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2021-07-07 16:42 UTC (permalink / raw)
  To: ptxdist


[-- Attachment #1.1: Type: text/plain, Size: 2648 bytes --]

On Wed, Jul 07, 2021 at 04:52:23PM +0200, Bruno Thomsen wrote:
> Den ons. 7. jul. 2021 kl. 16.31 skrev Michael Olbrich
> <m.olbrich@pengutronix.de>:
> >
> > On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-König 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-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.thomsen@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.thomsen@gmail.com>
> 
> Hi,
> 
> This patch was added last year to ptxdist, so it's possible to detect
> unrecognized options in new chrony versions as they use a custom
> hand crafted configure script. So unless that situation has changed
> this patch should be kept.

I dropped it because it is only important when you do a version bump. As
you usually go through all of the configure flags anyhow I didn't
consider it useful enough to keep it.

However I don't feel strong here, so if you do, I can keep it.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 181 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-07-07 16:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-05  7:49 [ptxdist] [PATCH 1/2] chrony: unify location of config files Uwe Kleine-König
2021-07-05  7:49 ` [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1 Uwe Kleine-König
2021-07-07 14:31   ` Michael Olbrich
2021-07-07 14:52     ` Bruno Thomsen
2021-07-07 16:42       ` Uwe Kleine-König
2021-07-07 14:15 ` [ptxdist] [PATCH 1/2] chrony: unify location of config files Michael Olbrich

mailarchive of the ptxdist mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.ptxdist.org/ptxdist/0 ptxdist/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ptxdist ptxdist/ https://lore.ptxdist.org/ptxdist \
		ptxdist@pengutronix.de
	public-inbox-index ptxdist

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git