[ptxdist] [PATCH] kmscube: switch to https URL

[ptxdist] [PATCH] kmscube: switch to https URL

[Matthias Schiffer]

From: Markus Niebel <Markus.Niebel@tq-group.com>

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 rules/kmscube.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/kmscube.make b/rules/kmscube.make
index a6d5d0150..94a2f31fa 100644
--- a/rules/kmscube.make
+++ b/rules/kmscube.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
 KMSCUBE_VERSION	:= 2017-03-13-g803bac5
 KMSCUBE		:= kmscube-$(KMSCUBE_VERSION)
 KMSCUBE_MD5	:= 781a59ab2d1d245e99a49df7c3dc1876
-KMSCUBE_URL	:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
+KMSCUBE_URL	:= https://gitlab.freedesktop.org/mesa/kmscube.git;tag=$(KMSCUBE_VERSION)
 KMSCUBE_SUFFIX	:= tar.gz
 KMSCUBE_SOURCE	:= $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
 KMSCUBE_DIR	:= $(BUILDDIR)/$(KMSCUBE)
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] parted: update to 3.3

[Matthias Schiffer]

Fixes build against recent glibc.

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 rules/parted.in   | 13 ++++++++-----
 rules/parted.make | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/rules/parted.in b/rules/parted.in
index 2e9f54a31..10371dd73 100644
--- a/rules/parted.in
+++ b/rules/parted.in
@@ -1,18 +1,21 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
+## SECTION=shell_and_console
 config PARTED
 	tristate
 	prompt "parted"
+	select HOST_GETTEXT
 	select GETTEXT
 	select READLINE
+	select ICONV
+	select UTIL_LINUX_NG
+	select UTIL_LINUX_NG_LIBUUID
 	select E2FSPROGS
 	select NCURSES
+	depends on !BUSYBOX_PARTPROBE || ALLYES
 	help
 	  The GNU Parted program allows you to create, destroy, resize, move,
 	  and copy hard disk partitions. Parted can be used for creating space
 	  for new operating systems, reorganizing disk usage, and copying data
 	  to new hard disks.
 
-	  STAGING: remove in ptxdist-2020.06.0
-	  Old version that need to be updated. Fails to build with glibc-2.28.
+comment "busybox' partprobe is selected!"
+	depends on BUSYBOX_PARTPROBE
diff --git a/rules/parted.make b/rules/parted.make
index 6b994f372..eca3f9eee 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
 #
 # Paths and names
 #
-PARTED_VERSION	:= 2.3
-PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
+PARTED_VERSION	:= 3.3
+PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
 PARTED		:= parted-$(PARTED_VERSION)
-PARTED_SUFFIX	:= tar.gz
+PARTED_SUFFIX	:= tar.xz
 PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
 PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
 PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
@@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
 PARTED_CONF_TOOL := autoconf
 PARTED_CONF_OPT  := \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-device-mapper \
-	--disable-Werror
+	--without-readline \
+	--disable-device-mapper
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] parted: update to 3.3

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:04PM +0100, Matthias Schiffer wrote:
> Fixes build against recent glibc.
> 
> Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
>  rules/parted.in   | 13 ++++++++-----
>  rules/parted.make | 10 +++++-----
>  2 files changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/rules/parted.in b/rules/parted.in
> index 2e9f54a31..10371dd73 100644
> --- a/rules/parted.in
> +++ b/rules/parted.in
> @@ -1,18 +1,21 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=shell_and_console
> +## SECTION=shell_and_console
>  config PARTED
>  	tristate
>  	prompt "parted"
> +	select HOST_GETTEXT
>  	select GETTEXT
>  	select READLINE
> +	select ICONV

I don't think, this is necessary. ICONV is provided by the libc these days
and this switch is only there for packages with optional iconv support.

> +	select UTIL_LINUX_NG
> +	select UTIL_LINUX_NG_LIBUUID

use

	select LIBUUID

instead.

Michael

>  	select E2FSPROGS
>  	select NCURSES
> +	depends on !BUSYBOX_PARTPROBE || ALLYES
>  	help
>  	  The GNU Parted program allows you to create, destroy, resize, move,
>  	  and copy hard disk partitions. Parted can be used for creating space
>  	  for new operating systems, reorganizing disk usage, and copying data
>  	  to new hard disks.
>  
> -	  STAGING: remove in ptxdist-2020.06.0
> -	  Old version that need to be updated. Fails to build with glibc-2.28.
> +comment "busybox' partprobe is selected!"
> +	depends on BUSYBOX_PARTPROBE
> diff --git a/rules/parted.make b/rules/parted.make
> index 6b994f372..eca3f9eee 100644
> --- a/rules/parted.make
> +++ b/rules/parted.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
>  #
>  # Paths and names
>  #
> -PARTED_VERSION	:= 2.3
> -PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
> +PARTED_VERSION	:= 3.3
> +PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
>  PARTED		:= parted-$(PARTED_VERSION)
> -PARTED_SUFFIX	:= tar.gz
> +PARTED_SUFFIX	:= tar.xz
>  PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
>  PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
>  PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
> @@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
>  PARTED_CONF_TOOL := autoconf
>  PARTED_CONF_OPT  := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--disable-device-mapper \
> -	--disable-Werror
> +	--without-readline \
> +	--disable-device-mapper
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH v2] parted: update to 3.3

[Matthias Schiffer]

Fixes build against recent glibc.

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 rules/parted.in   | 11 ++++++-----
 rules/parted.make | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rules/parted.in b/rules/parted.in
index 2e9f54a31..75756fa7c 100644
--- a/rules/parted.in
+++ b/rules/parted.in
@@ -1,18 +1,19 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
+## SECTION=shell_and_console
 config PARTED
 	tristate
 	prompt "parted"
+	select HOST_GETTEXT
 	select GETTEXT
 	select READLINE
+	select LIBUUID
 	select E2FSPROGS
 	select NCURSES
+	depends on !BUSYBOX_PARTPROBE || ALLYES
 	help
 	  The GNU Parted program allows you to create, destroy, resize, move,
 	  and copy hard disk partitions. Parted can be used for creating space
 	  for new operating systems, reorganizing disk usage, and copying data
 	  to new hard disks.
 
-	  STAGING: remove in ptxdist-2020.06.0
-	  Old version that need to be updated. Fails to build with glibc-2.28.
+comment "busybox' partprobe is selected!"
+	depends on BUSYBOX_PARTPROBE
diff --git a/rules/parted.make b/rules/parted.make
index 6b994f372..eca3f9eee 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
 #
 # Paths and names
 #
-PARTED_VERSION	:= 2.3
-PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
+PARTED_VERSION	:= 3.3
+PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
 PARTED		:= parted-$(PARTED_VERSION)
-PARTED_SUFFIX	:= tar.gz
+PARTED_SUFFIX	:= tar.xz
 PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
 PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
 PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
@@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
 PARTED_CONF_TOOL := autoconf
 PARTED_CONF_OPT  := \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-device-mapper \
-	--disable-Werror
+	--without-readline \
+	--disable-device-mapper
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3] parted: update to 3.3

[Matthias Schiffer]

Fixes build against recent glibc.

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 rules/parted.in   | 12 ++++++------
 rules/parted.make | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rules/parted.in b/rules/parted.in
index 2e9f54a31..dbaef4b0a 100644
--- a/rules/parted.in
+++ b/rules/parted.in
@@ -1,18 +1,18 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
+## SECTION=shell_and_console
 config PARTED
 	tristate
 	prompt "parted"
-	select GETTEXT
+	select HOST_GETTEXT
 	select READLINE
+	select LIBUUID
 	select E2FSPROGS
 	select NCURSES
+	depends on !BUSYBOX_PARTPROBE || ALLYES
 	help
 	  The GNU Parted program allows you to create, destroy, resize, move,
 	  and copy hard disk partitions. Parted can be used for creating space
 	  for new operating systems, reorganizing disk usage, and copying data
 	  to new hard disks.
 
-	  STAGING: remove in ptxdist-2020.06.0
-	  Old version that need to be updated. Fails to build with glibc-2.28.
+comment "busybox' partprobe is selected!"
+	depends on BUSYBOX_PARTPROBE
diff --git a/rules/parted.make b/rules/parted.make
index 6b994f372..eca3f9eee 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
 #
 # Paths and names
 #
-PARTED_VERSION	:= 2.3
-PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
+PARTED_VERSION	:= 3.3
+PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
 PARTED		:= parted-$(PARTED_VERSION)
-PARTED_SUFFIX	:= tar.gz
+PARTED_SUFFIX	:= tar.xz
 PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
 PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
 PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
@@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
 PARTED_CONF_TOOL := autoconf
 PARTED_CONF_OPT  := \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-device-mapper \
-	--disable-Werror
+	--without-readline \
+	--disable-device-mapper
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3] parted: update to 3.3

[Michael Olbrich]

On Fri, Feb 14, 2020 at 11:38:54AM +0100, Matthias Schiffer wrote:
> Fixes build against recent glibc.
> 
> Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>

Please remove the patches for the old version.

Michael

> ---
>  rules/parted.in   | 12 ++++++------
>  rules/parted.make | 10 +++++-----
>  2 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/rules/parted.in b/rules/parted.in
> index 2e9f54a31..dbaef4b0a 100644
> --- a/rules/parted.in
> +++ b/rules/parted.in
> @@ -1,18 +1,18 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=shell_and_console
> +## SECTION=shell_and_console
>  config PARTED
>  	tristate
>  	prompt "parted"
> -	select GETTEXT
> +	select HOST_GETTEXT
>  	select READLINE
> +	select LIBUUID
>  	select E2FSPROGS
>  	select NCURSES
> +	depends on !BUSYBOX_PARTPROBE || ALLYES
>  	help
>  	  The GNU Parted program allows you to create, destroy, resize, move,
>  	  and copy hard disk partitions. Parted can be used for creating space
>  	  for new operating systems, reorganizing disk usage, and copying data
>  	  to new hard disks.
>  
> -	  STAGING: remove in ptxdist-2020.06.0
> -	  Old version that need to be updated. Fails to build with glibc-2.28.
> +comment "busybox' partprobe is selected!"
> +	depends on BUSYBOX_PARTPROBE
> diff --git a/rules/parted.make b/rules/parted.make
> index 6b994f372..eca3f9eee 100644
> --- a/rules/parted.make
> +++ b/rules/parted.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
>  #
>  # Paths and names
>  #
> -PARTED_VERSION	:= 2.3
> -PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
> +PARTED_VERSION	:= 3.3
> +PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
>  PARTED		:= parted-$(PARTED_VERSION)
> -PARTED_SUFFIX	:= tar.gz
> +PARTED_SUFFIX	:= tar.xz
>  PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
>  PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
>  PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
> @@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
>  PARTED_CONF_TOOL := autoconf
>  PARTED_CONF_OPT  := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--disable-device-mapper \
> -	--disable-Werror
> +	--without-readline \
> +	--disable-device-mapper
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH v4] parted: update to 3.3

[Matthias Schiffer]

Fixes build against recent glibc.

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 ...gets-is-defined-before-undefining-it.patch | 26 -------------------
 patches/parted-2.3/series                     |  4 ---
 rules/parted.in                               | 12 ++++-----
 rules/parted.make                             | 10 +++----
 4 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch
 delete mode 100644 patches/parted-2.3/series

diff --git a/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch b/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch
deleted file mode 100644
index b2be0f21c..000000000
--- a/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Dec 2012 11:47:58 +0100
-Subject: [PATCH] make sure 'gets' is defined before undefining it
-
-glibc 2.16 has removed gets completely
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- lib/stdio.in.h |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index 79dda5f..e3ede74 100644
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -142,8 +142,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/patches/parted-2.3/series b/patches/parted-2.3/series
deleted file mode 100644
index 3aed33f27..000000000
--- a/patches/parted-2.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-sure-gets-is-defined-before-undefining-it.patch
-# 193fb47748b8a510e34ff1672ac111fc  - git-ptx-patches magic
diff --git a/rules/parted.in b/rules/parted.in
index 2e9f54a31..dbaef4b0a 100644
--- a/rules/parted.in
+++ b/rules/parted.in
@@ -1,18 +1,18 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
+## SECTION=shell_and_console
 config PARTED
 	tristate
 	prompt "parted"
-	select GETTEXT
+	select HOST_GETTEXT
 	select READLINE
+	select LIBUUID
 	select E2FSPROGS
 	select NCURSES
+	depends on !BUSYBOX_PARTPROBE || ALLYES
 	help
 	  The GNU Parted program allows you to create, destroy, resize, move,
 	  and copy hard disk partitions. Parted can be used for creating space
 	  for new operating systems, reorganizing disk usage, and copying data
 	  to new hard disks.
 
-	  STAGING: remove in ptxdist-2020.06.0
-	  Old version that need to be updated. Fails to build with glibc-2.28.
+comment "busybox' partprobe is selected!"
+	depends on BUSYBOX_PARTPROBE
diff --git a/rules/parted.make b/rules/parted.make
index 6b994f372..eca3f9eee 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
 #
 # Paths and names
 #
-PARTED_VERSION	:= 2.3
-PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
+PARTED_VERSION	:= 3.3
+PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
 PARTED		:= parted-$(PARTED_VERSION)
-PARTED_SUFFIX	:= tar.gz
+PARTED_SUFFIX	:= tar.xz
 PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
 PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
 PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
@@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
 PARTED_CONF_TOOL := autoconf
 PARTED_CONF_OPT  := \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-device-mapper \
-	--disable-Werror
+	--without-readline \
+	--disable-device-mapper
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] gettext: deterministically build with included libraries

[Matthias Schiffer]

gettext's configure will automatically used the libraries it finds, and
fall back to included versions otherwise. Avoid this non-deterministic
behaviour by explicitly choosing the included libraries.

In particular, this issue can break parallel builds with --force after
config changes due to a race condition:

1. gettext configure finds libraries from a previous build in sysroot,
   decides not to use the included libraries
2. Installed libraries gets cleaned from sysroot due to --force
3. gettext build fails, as it attemps to use the now removed libraries

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 rules/gettext.make | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rules/gettext.make b/rules/gettext.make
index dd1d22ffb..199616c87 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \
 	--disable-acl \
 	--disable-openmp \
 	--disable-curses \
+	--with-included-gettext \
+	--with-included-glib \
+	--with-included-libcroco \
+	--with-included-libunistring \
+	--with-included-libxml \
 	--without-emacs \
 	--without-bzip2 \
 	--without-xz
 
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] gettext: deterministically build with included libraries

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote:
> gettext's configure will automatically used the libraries it finds, and
> fall back to included versions otherwise. Avoid this non-deterministic
> behaviour by explicitly choosing the included libraries.
> 
> In particular, this issue can break parallel builds with --force after
> config changes due to a race condition:
> 
> 1. gettext configure finds libraries from a previous build in sysroot,
>    decides not to use the included libraries
> 2. Installed libraries gets cleaned from sysroot due to --force
> 3. gettext build fails, as it attemps to use the now removed libraries

I'd prefer to select glib and libxml instead. Or are there any reasons not
to do this?

The only current user is parted. Do you know why it needs that on the
target anyways? Most packages only need gettext at runtime.

Michael

> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
>  rules/gettext.make | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/rules/gettext.make b/rules/gettext.make
> index dd1d22ffb..199616c87 100644
> --- a/rules/gettext.make
> +++ b/rules/gettext.make
> @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \
>  	--disable-acl \
>  	--disable-openmp \
>  	--disable-curses \
> +	--with-included-gettext \
> +	--with-included-glib \
> +	--with-included-libcroco \
> +	--with-included-libunistring \
> +	--with-included-libxml \
>  	--without-emacs \
>  	--without-bzip2 \
>  	--without-xz
>  
> +
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

Re: [ptxdist] (EXT) Re: [PATCH] gettext: deterministically build with included libraries

[Matthias Schiffer]

On Fri, 2020-02-14 at 10:12 +0100, Michael Olbrich wrote:
> On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote:
> > gettext's configure will automatically used the libraries it finds,
> > and
> > fall back to included versions otherwise. Avoid this non-
> > deterministic
> > behaviour by explicitly choosing the included libraries.
> > 
> > In particular, this issue can break parallel builds with --force
> > after
> > config changes due to a race condition:
> > 
> > 1. gettext configure finds libraries from a previous build in
> > sysroot,
> >    decides not to use the included libraries
> > 2. Installed libraries gets cleaned from sysroot due to --force
> > 3. gettext build fails, as it attemps to use the now removed
> > libraries
> 
> I'd prefer to select glib and libxml instead. Or are there any
> reasons not
> to do this?

Fine with me.

> 
> The only current user is parted. Do you know why it needs that on the
> target anyways? Most packages only need gettext at runtime.

Hmm, this was added with the original parted rules in 2010, and I don't
see any issues without it - in fact, configure will choose gettext
functions from libc even when full gettext is available. I'll send a v3
of the parted patch.


> 
> Michael
> 
> > Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com
> > >
> > ---
> >  rules/gettext.make | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/rules/gettext.make b/rules/gettext.make
> > index dd1d22ffb..199616c87 100644
> > --- a/rules/gettext.make
> > +++ b/rules/gettext.make
> > @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \
> >  	--disable-acl \
> >  	--disable-openmp \
> >  	--disable-curses \
> > +	--with-included-gettext \
> > +	--with-included-glib \
> > +	--with-included-libcroco \
> > +	--with-included-libunistring \
> > +	--with-included-libxml \
> >  	--without-emacs \
> >  	--without-bzip2 \
> >  	--without-xz
> >  
> > +
> >  # ----------------------------------------------------------------
> > ------------
> >  # Target-Install
> >  # ----------------------------------------------------------------
> > ------------
> > -- 
> > 2.17.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > 
> 
> 


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] (EXT) Re: [PATCH] gettext: deterministically build with included libraries

[Matthias Schiffer]

On Fri, 2020-02-14 at 10:48 +0100, Matthias Schiffer wrote:
> On Fri, 2020-02-14 at 10:12 +0100, Michael Olbrich wrote:
> > On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote:
> > > gettext's configure will automatically used the libraries it
> > > finds,
> > > and
> > > fall back to included versions otherwise. Avoid this non-
> > > deterministic
> > > behaviour by explicitly choosing the included libraries.
> > > 
> > > In particular, this issue can break parallel builds with --force
> > > after
> > > config changes due to a race condition:
> > > 
> > > 1. gettext configure finds libraries from a previous build in
> > > sysroot,
> > >    decides not to use the included libraries
> > > 2. Installed libraries gets cleaned from sysroot due to --force
> > > 3. gettext build fails, as it attemps to use the now removed
> > > libraries
> > 
> > I'd prefer to select glib and libxml instead. Or are there any
> > reasons not
> > to do this?
> 
> Fine with me.

Right now I can't reproduce gettext picking up the sysroot libraries at
all - there seem to be other factors involved, making it difficult to
get the configuration deterministic.

In addition, adding GLIB and LIBXML2 as dependencies significantly
increases the number of dependencies, pulling in host-meson, host-ninja 
and libprce.

Given that parted doesn't require gettext after all, I'm fine with
either solution, but I currently can't put much more time into fixing
this package - feel free to drop this patch if it is not acceptable in
its current form.

Matthias


> 
> > 
> > The only current user is parted. Do you know why it needs that on
> > the
> > target anyways? Most packages only need gettext at runtime.
> 
> Hmm, this was added with the original parted rules in 2010, and I
> don't
> see any issues without it - in fact, configure will choose gettext
> functions from libc even when full gettext is available. I'll send a
> v3
> of the parted patch.
> 
> 
> > 
> > Michael
> > 
> > > Signed-off-by: Matthias Schiffer <
> > > matthias.schiffer@ew.tq-group.com
> > > > 
> > > 
> > > ---
> > >  rules/gettext.make | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > > 
> > > diff --git a/rules/gettext.make b/rules/gettext.make
> > > index dd1d22ffb..199616c87 100644
> > > --- a/rules/gettext.make
> > > +++ b/rules/gettext.make
> > > @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \
> > >  	--disable-acl \
> > >  	--disable-openmp \
> > >  	--disable-curses \
> > > +	--with-included-gettext \
> > > +	--with-included-glib \
> > > +	--with-included-libcroco \
> > > +	--with-included-libunistring \
> > > +	--with-included-libxml \
> > >  	--without-emacs \
> > >  	--without-bzip2 \
> > >  	--without-xz
> > >  
> > > +
> > >  # --------------------------------------------------------------
> > > --
> > > ------------
> > >  # Target-Install
> > >  # --------------------------------------------------------------
> > > --
> > > ------------
> > > -- 
> > > 2.17.1
> > > 
> > > 
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > > 
> > 
> > 


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] (EXT) Re: [PATCH] gettext: deterministically build with included libraries

[Michael Olbrich]

On Fri, Feb 14, 2020 at 11:38:29AM +0100, Matthias Schiffer wrote:
> On Fri, 2020-02-14 at 10:48 +0100, Matthias Schiffer wrote:
> > On Fri, 2020-02-14 at 10:12 +0100, Michael Olbrich wrote:
> > > On Thu, Feb 13, 2020 at 06:22:05PM +0100, Matthias Schiffer wrote:
> > > > gettext's configure will automatically used the libraries it
> > > > finds,
> > > > and
> > > > fall back to included versions otherwise. Avoid this non-
> > > > deterministic
> > > > behaviour by explicitly choosing the included libraries.
> > > > 
> > > > In particular, this issue can break parallel builds with --force
> > > > after
> > > > config changes due to a race condition:
> > > > 
> > > > 1. gettext configure finds libraries from a previous build in
> > > > sysroot,
> > > >    decides not to use the included libraries
> > > > 2. Installed libraries gets cleaned from sysroot due to --force
> > > > 3. gettext build fails, as it attemps to use the now removed
> > > > libraries
> > > 
> > > I'd prefer to select glib and libxml instead. Or are there any
> > > reasons not
> > > to do this?
> > 
> > Fine with me.
> 
> Right now I can't reproduce gettext picking up the sysroot libraries at
> all - there seem to be other factors involved, making it difficult to
> get the configuration deterministic.
> 
> In addition, adding GLIB and LIBXML2 as dependencies significantly
> increases the number of dependencies, pulling in host-meson, host-ninja 
> and libprce.
> 
> Given that parted doesn't require gettext after all, I'm fine with
> either solution, but I currently can't put much more time into fixing
> this package - feel free to drop this patch if it is not acceptable in
> its current form.

There is no used for the gettext package left. So lets not waste any time
on it. I'll probably just dump it into staging.

Michael

> 
> > 
> > > 
> > > The only current user is parted. Do you know why it needs that on
> > > the
> > > target anyways? Most packages only need gettext at runtime.
> > 
> > Hmm, this was added with the original parted rules in 2010, and I
> > don't
> > see any issues without it - in fact, configure will choose gettext
> > functions from libc even when full gettext is available. I'll send a
> > v3
> > of the parted patch.
> > 
> > 
> > > 
> > > Michael
> > > 
> > > > Signed-off-by: Matthias Schiffer <
> > > > matthias.schiffer@ew.tq-group.com
> > > > > 
> > > > 
> > > > ---
> > > >  rules/gettext.make | 6 ++++++
> > > >  1 file changed, 6 insertions(+)
> > > > 
> > > > diff --git a/rules/gettext.make b/rules/gettext.make
> > > > index dd1d22ffb..199616c87 100644
> > > > --- a/rules/gettext.make
> > > > +++ b/rules/gettext.make
> > > > @@ -54,10 +54,16 @@ GETTEXT_AUTOCONF := \
> > > >  	--disable-acl \
> > > >  	--disable-openmp \
> > > >  	--disable-curses \
> > > > +	--with-included-gettext \
> > > > +	--with-included-glib \
> > > > +	--with-included-libcroco \
> > > > +	--with-included-libunistring \
> > > > +	--with-included-libxml \
> > > >  	--without-emacs \
> > > >  	--without-bzip2 \
> > > >  	--without-xz
> > > >  
> > > > +
> > > >  # --------------------------------------------------------------
> > > > --
> > > > ------------
> > > >  # Target-Install
> > > >  # --------------------------------------------------------------
> > > > --
> > > > ------------
> > > > -- 
> > > > 2.17.1
> > > > 
> > > > 
> > > > _______________________________________________
> > > > ptxdist mailing list
> > > > ptxdist@pengutronix.de
> > > > 
> > > 
> > > 
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH] gst-plugins-good1: qmlglsink: fix build on EGL platform without X11 headers

[Matthias Schiffer]

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---

Considering who authored the upstream patch, I'm surprised this is not
in PTXdist yet - it seems it was forgotten?


 ...ild-on-EGL-platform-without-X11-head.patch | 29 +++++++++++++++++++
 patches/gst-plugins-good-1.16.2/series        |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
 create mode 100644 patches/gst-plugins-good-1.16.2/series

diff --git a/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
new file mode 100644
index 000000000..fdf6ec413
--- /dev/null
+++ b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
@@ -0,0 +1,29 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Tue, 3 Dec 2019 11:36:07 +0100
+Subject: [PATCH] qmlglsink: fix build on EGL platform without X11 headers
+
+If Mesa is built without X11 headers, building against Mesa EGL headers
+requires a dependency on egl.pc, to define MESA_EGL_NO_X11_HEADERS.
+This fixes a build error when compiling ext/qt/gstqtglutility.cc:
+
+  In file included from /usr/include/EGL/egl.h:39,
+                   from /usr/include/gstreamer-1.0/gst/gl/egl/gstegl.h:44,
+                   from ../gst-plugins-good-1.16.1/ext/qt/gstqtglutility.cc:43:
+  /usr/include/EGL/eglplatform.h:124:10: fatal error: X11/Xlib.h: No such file or directory
+---
+ ext/qt/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/qt/meson.build b/ext/qt/meson.build
+index 5f040c844174..43ddc6092b21 100644
+--- a/ext/qt/meson.build
++++ b/ext/qt/meson.build
+@@ -89,6 +89,8 @@ if have_cxx and build_gstgl
+     if gst_gl_have_platform_egl
+       # Embedded linux (e.g. i.MX6) with or without windowing support
+       qt_defines += ['-DHAVE_QT_EGLFS']
++      egl_dep = dependency('egl', required : false)
++      optional_deps += egl_dep
+       have_qt_windowing = true
+       if have_qpa_include
+         # Wayland windowing
diff --git a/patches/gst-plugins-good-1.16.2/series b/patches/gst-plugins-good-1.16.2/series
new file mode 100644
index 000000000..4a1386d15
--- /dev/null
+++ b/patches/gst-plugins-good-1.16.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
+# 272968855eb57a1460afb6469b245e5d  - git-ptx-patches magic
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] gst-plugins-good1: qmlglsink: fix build on EGL platform without X11 headers

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:06PM +0100, Matthias Schiffer wrote:
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
> 
> Considering who authored the upstream patch, I'm surprised this is not
> in PTXdist yet - it seems it was forgotten?

It probably got lost. We usually have more gst-plugins-good patches in the
BSP anyways (for v4l2 and others), so we don't notice this.

But it's a good idea to have this patch, so I'll apply this.

Michael

>  ...ild-on-EGL-platform-without-X11-head.patch | 29 +++++++++++++++++++
>  patches/gst-plugins-good-1.16.2/series        |  4 +++
>  2 files changed, 33 insertions(+)
>  create mode 100644 patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
>  create mode 100644 patches/gst-plugins-good-1.16.2/series
> 
> diff --git a/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> new file mode 100644
> index 000000000..fdf6ec413
> --- /dev/null
> +++ b/patches/gst-plugins-good-1.16.2/0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> @@ -0,0 +1,29 @@
> +From: Philipp Zabel <p.zabel@pengutronix.de>
> +Date: Tue, 3 Dec 2019 11:36:07 +0100
> +Subject: [PATCH] qmlglsink: fix build on EGL platform without X11 headers
> +
> +If Mesa is built without X11 headers, building against Mesa EGL headers
> +requires a dependency on egl.pc, to define MESA_EGL_NO_X11_HEADERS.
> +This fixes a build error when compiling ext/qt/gstqtglutility.cc:
> +
> +  In file included from /usr/include/EGL/egl.h:39,
> +                   from /usr/include/gstreamer-1.0/gst/gl/egl/gstegl.h:44,
> +                   from ../gst-plugins-good-1.16.1/ext/qt/gstqtglutility.cc:43:
> +  /usr/include/EGL/eglplatform.h:124:10: fatal error: X11/Xlib.h: No such file or directory
> +---
> + ext/qt/meson.build | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/ext/qt/meson.build b/ext/qt/meson.build
> +index 5f040c844174..43ddc6092b21 100644
> +--- a/ext/qt/meson.build
> ++++ b/ext/qt/meson.build
> +@@ -89,6 +89,8 @@ if have_cxx and build_gstgl
> +     if gst_gl_have_platform_egl
> +       # Embedded linux (e.g. i.MX6) with or without windowing support
> +       qt_defines += ['-DHAVE_QT_EGLFS']
> ++      egl_dep = dependency('egl', required : false)
> ++      optional_deps += egl_dep
> +       have_qt_windowing = true
> +       if have_qpa_include
> +         # Wayland windowing
> diff --git a/patches/gst-plugins-good-1.16.2/series b/patches/gst-plugins-good-1.16.2/series
> new file mode 100644
> index 000000000..4a1386d15
> --- /dev/null
> +++ b/patches/gst-plugins-good-1.16.2/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-qmlglsink-fix-build-on-EGL-platform-without-X11-head.patch
> +# 272968855eb57a1460afb6469b245e5d  - git-ptx-patches magic
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH] varoverlayfs: support kernels without metacopy

[Matthias Schiffer]

metacopy=on is supported on Linux 4.19+. Add fallback for older kernels.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 projectroot/usr/lib/systemd/system/var.mount | 1 -
 projectroot/usr/sbin/mount.varoverlayfs      | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projectroot/usr/lib/systemd/system/var.mount b/projectroot/usr/lib/systemd/system/var.mount
index bd6350237..3b686a260 100644
--- a/projectroot/usr/lib/systemd/system/var.mount
+++ b/projectroot/usr/lib/systemd/system/var.mount
@@ -8,4 +8,3 @@ Where=/var
 # note: this is a dummy filesystem only to trigger the corresponding mount helper
 What=varoverlayfs
 Type=varoverlayfs
-Options=metacopy=on
diff --git a/projectroot/usr/sbin/mount.varoverlayfs b/projectroot/usr/sbin/mount.varoverlayfs
index 913004d15..efab16aef 100644
--- a/projectroot/usr/sbin/mount.varoverlayfs
+++ b/projectroot/usr/sbin/mount.varoverlayfs
@@ -8,6 +8,8 @@ set -e
 systemctl start run-varoverlayfs.mount
 mkdir -p /run/varoverlayfs/upper
 mkdir -p /run/varoverlayfs/work
-mount -t overlay -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work "${@}"
+# metacopy=on is supported on Linux 4.19+, fall back on older kernels
+mount -t overlay -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work,metacopy=on "${@}" ||
+	mount -t overlay -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work "${@}"
 systemctl stop run-varoverlayfs.mount
 rmdir /run/varoverlayfs
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] varoverlayfs: support kernels without metacopy

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:07PM +0100, Matthias Schiffer wrote:
> metacopy=on is supported on Linux 4.19+. Add fallback for older kernels.

I think we should just drop the option. It's just a nice-to-have feature
and in most cases, it does not make a any difference. The lower filesystem
is usually empty, except for directories and maybe very small files.

Michael

> 
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
>  projectroot/usr/lib/systemd/system/var.mount | 1 -
>  projectroot/usr/sbin/mount.varoverlayfs      | 4 +++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/projectroot/usr/lib/systemd/system/var.mount b/projectroot/usr/lib/systemd/system/var.mount
> index bd6350237..3b686a260 100644
> --- a/projectroot/usr/lib/systemd/system/var.mount
> +++ b/projectroot/usr/lib/systemd/system/var.mount
> @@ -8,4 +8,3 @@ Where=/var
>  # note: this is a dummy filesystem only to trigger the corresponding mount helper
>  What=varoverlayfs
>  Type=varoverlayfs
> -Options=metacopy=on
> diff --git a/projectroot/usr/sbin/mount.varoverlayfs b/projectroot/usr/sbin/mount.varoverlayfs
> index 913004d15..efab16aef 100644
> --- a/projectroot/usr/sbin/mount.varoverlayfs
> +++ b/projectroot/usr/sbin/mount.varoverlayfs
> @@ -8,6 +8,8 @@ set -e
>  systemctl start run-varoverlayfs.mount
>  mkdir -p /run/varoverlayfs/upper
>  mkdir -p /run/varoverlayfs/work
> -mount -t overlay -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work "${@}"
> +# metacopy=on is supported on Linux 4.19+, fall back on older kernels
> +mount -t overlay -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work,metacopy=on "${@}" ||
> +	mount -t overlay -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work "${@}"
>  systemctl stop run-varoverlayfs.mount
>  rmdir /run/varoverlayfs
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH v2] varoverlayfs: support kernels without metacopy

[Matthias Schiffer]

metacopy=on is supported on Linux 4.19+ only. As metacopy is unlikely to
have a significant effect on the /var overlay anyways, simply remove the
option.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 projectroot/usr/lib/systemd/system/var.mount | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projectroot/usr/lib/systemd/system/var.mount b/projectroot/usr/lib/systemd/system/var.mount
index bd6350237..3b686a260 100644
--- a/projectroot/usr/lib/systemd/system/var.mount
+++ b/projectroot/usr/lib/systemd/system/var.mount
@@ -8,4 +8,3 @@ Where=/var
 # note: this is a dummy filesystem only to trigger the corresponding mount helper
 What=varoverlayfs
 Type=varoverlayfs
-Options=metacopy=on
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] syslogng: update to 3.25.1

[Matthias Schiffer]

Update and move out of staging. The new version adds compatiblity with
OpenSSL 1.1.x and switches to Python 3.

The AMQP and MongoDB destinations are removed, they were never buildable
without additional packages not available in plain PTXdist.

A simple replacement for the old systemd unit is added, as the new version
only provides an instanced unit which cannot be linked as syslog.service
(which is necessary to use syslog-ng as the default system logger by
enabling ForwardToSyslog in journald.conf).

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 projectroot/etc/syslog-ng.conf                |  6 +++--
 .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++++++++++++++
 rules/syslogng.in                             | 22 ++-----------------
 rules/syslogng.make                           | 18 +++++++++------
 4 files changed, 37 insertions(+), 29 deletions(-)
 create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service

diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
index 254aecfd2..0235b9857 100644
--- a/projectroot/etc/syslog-ng.conf
+++ b/projectroot/etc/syslog-ng.conf
@@ -1,13 +1,15 @@
 #
-# syslog-ng configuration 
+# syslog-ng configuration
 #
 
+@version: 3.25
+
 #
 # Options
 #
 
 # sync every 0 lines
-options { long_hostnames(off); sync(0); };
+options { chain_hostnames(off); flush_lines(0); };
 
 #
 # Sources
diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service
new file mode 100644
index 000000000..6bf591efd
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=System Logger Daemon
+Documentation=man:syslog-ng(8)
+Conflicts=emergency.service emergency.target
+Requires=syslog.socket
+Wants=network.target network-online.target
+After=network.target network-online.target
+
+[Service]
+Type=notify
+ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
+ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
+ExecReload=/bin/kill -HUP $MAINPID
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+
+[Install]
+Alias=syslog.service
+WantedBy=multi-user.target
diff --git a/rules/syslogng.in b/rules/syslogng.in
index 3b1af844b..29d26e72a 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
+## SECTION=networking
 # syslog-ng configuration
 
 menuconfig SYSLOGNG
@@ -9,7 +7,7 @@ menuconfig SYSLOGNG
 	select EVENTLOG
 	select GLIB
 	select OPENSSL
-	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
+	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
 	select LIBC_NSL
 	select LIBC_RT
 	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
@@ -19,10 +17,6 @@ menuconfig SYSLOGNG
 	help
 	  The next generation syslog daemon.
 
-	  STAGING: remove in ptxdist-2020.01.0
-	  Fails to build with OpenSSL 1.1.x. Update to a new version is
-	  needed.
-
 if SYSLOGNG
 
 config SYSLOGNG_TCP_WRAPPER
@@ -46,18 +40,6 @@ config SYSLOGNG_SPOOF_SOURCE
 	  destinations though the original message can be
 	  received by TCP as well.
 
-config SYSLOGNG_AMQP_DESTINATION
-	bool
-	prompt "support the AMQP destination"
-	help
-	  Enables the ability to publish AMQP messages.
-
-config SYSLOGNG_MONGODB_DESTINATION
-	bool
-	prompt "support the MongoDB destination"
-	help
-	  Enables the ability to send messages to a MongoDB database.
-
 config SYSLOGNG_PYTHON_DESTINATION
 	bool
 	prompt "support the python destination"
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 114f72cef..4025fc0fa 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
 #
 # Paths and names
 #
-SYSLOGNG_VERSION	:= 3.7.3
-SYSLOG_LIBVERSION	:= 3.7
-SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
+SYSLOGNG_VERSION	:= 3.25.1
+SYSLOG_LIBVERSION	:= 3.25
+SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
 SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
 SYSLOGNG_SUFFIX		:= tar.gz
 SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
@@ -32,7 +32,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
 
 SYSLOGNG_ENV 	= \
 	$(CROSS_ENV) \
-	ac_cv_path_PYTHON=$(CROSS_PYTHON)
+	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
 
 #
 # autoconf
@@ -43,8 +43,10 @@ SYSLOGNG_AUTOCONF = \
 	--enable-dynamic-linking \
 	--disable-debug \
 	--disable-sun-streams \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
+	--disable-java \
+	--disable-redis \
+	--disable-amqp \
+	--disable-mongodb \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
@@ -54,7 +56,7 @@ SYSLOGNG_AUTOCONF = \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system \
 	--localstatedir=/var/run \
 	--with-libnet=$(SYSROOT)/usr/bin \
-	--with-python=$(PYTHON_MAJORMINOR)
+	--with-python=$(PYTHON3_MAJORMINOR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -73,6 +75,8 @@ $(STATEDIR)/syslogng.targetinstall:
 	@$(call install_copy, syslogng, 0, 0, 0755, -, \
 		/usr/sbin/syslog-ng)
 	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
+	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
+	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
 	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
 
 #	# config
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] syslogng: update to 3.25.1

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:08PM +0100, Matthias Schiffer wrote:
> Update and move out of staging. The new version adds compatiblity with
> OpenSSL 1.1.x and switches to Python 3.
> 
> The AMQP and MongoDB destinations are removed, they were never buildable
> without additional packages not available in plain PTXdist.
> 
> A simple replacement for the old systemd unit is added, as the new version
> only provides an instanced unit which cannot be linked as syslog.service
> (which is necessary to use syslog-ng as the default system logger by
> enabling ForwardToSyslog in journald.conf).
> 
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
>  projectroot/etc/syslog-ng.conf                |  6 +++--
>  .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++++++++++++++
>  rules/syslogng.in                             | 22 ++-----------------
>  rules/syslogng.make                           | 18 +++++++++------
>  4 files changed, 37 insertions(+), 29 deletions(-)
>  create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service
> 
> diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
> index 254aecfd2..0235b9857 100644
> --- a/projectroot/etc/syslog-ng.conf
> +++ b/projectroot/etc/syslog-ng.conf
> @@ -1,13 +1,15 @@
>  #
> -# syslog-ng configuration 
> +# syslog-ng configuration
>  #
>  
> +@version: 3.25
> +
>  #
>  # Options
>  #
>  
>  # sync every 0 lines
> -options { long_hostnames(off); sync(0); };
> +options { chain_hostnames(off); flush_lines(0); };
>  
>  #
>  # Sources
> diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service
> new file mode 100644
> index 000000000..6bf591efd
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
> @@ -0,0 +1,20 @@
> +[Unit]
> +Description=System Logger Daemon
> +Documentation=man:syslog-ng(8)
> +Conflicts=emergency.service emergency.target
> +Requires=syslog.socket
> +Wants=network.target network-online.target
> +After=network.target network-online.target
> +
> +[Service]
> +Type=notify
> +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
> +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
> +ExecReload=/bin/kill -HUP $MAINPID
> +StandardOutput=journal
> +StandardError=journal
> +Restart=on-failure
> +
> +[Install]
> +Alias=syslog.service
> +WantedBy=multi-user.target
> diff --git a/rules/syslogng.in b/rules/syslogng.in
> index 3b1af844b..29d26e72a 100644
> --- a/rules/syslogng.in
> +++ b/rules/syslogng.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
>  # syslog-ng configuration
>  
>  menuconfig SYSLOGNG
> @@ -9,7 +7,7 @@ menuconfig SYSLOGNG
>  	select EVENTLOG
>  	select GLIB
>  	select OPENSSL
> -	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
> +	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
>  	select LIBC_NSL
>  	select LIBC_RT
>  	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
> @@ -19,10 +17,6 @@ menuconfig SYSLOGNG
>  	help
>  	  The next generation syslog daemon.
>  
> -	  STAGING: remove in ptxdist-2020.01.0
> -	  Fails to build with OpenSSL 1.1.x. Update to a new version is
> -	  needed.
> -
>  if SYSLOGNG
>  
>  config SYSLOGNG_TCP_WRAPPER
> @@ -46,18 +40,6 @@ config SYSLOGNG_SPOOF_SOURCE
>  	  destinations though the original message can be
>  	  received by TCP as well.
>  
> -config SYSLOGNG_AMQP_DESTINATION
> -	bool
> -	prompt "support the AMQP destination"
> -	help
> -	  Enables the ability to publish AMQP messages.
> -
> -config SYSLOGNG_MONGODB_DESTINATION
> -	bool
> -	prompt "support the MongoDB destination"
> -	help
> -	  Enables the ability to send messages to a MongoDB database.
> -
>  config SYSLOGNG_PYTHON_DESTINATION
>  	bool
>  	prompt "support the python destination"
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 114f72cef..4025fc0fa 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
>  #
>  # Paths and names
>  #
> -SYSLOGNG_VERSION	:= 3.7.3
> -SYSLOG_LIBVERSION	:= 3.7
> -SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
> +SYSLOGNG_VERSION	:= 3.25.1
> +SYSLOG_LIBVERSION	:= 3.25
> +SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
>  SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
>  SYSLOGNG_SUFFIX		:= tar.gz
>  SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
> @@ -32,7 +32,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
>  
>  SYSLOGNG_ENV 	= \
>  	$(CROSS_ENV) \
> -	ac_cv_path_PYTHON=$(CROSS_PYTHON)
> +	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
>  
>  #
>  # autoconf
> @@ -43,8 +43,10 @@ SYSLOGNG_AUTOCONF = \
>  	--enable-dynamic-linking \
>  	--disable-debug \
>  	--disable-sun-streams \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
> +	--disable-java \
> +	--disable-redis \
> +	--disable-amqp \
> +	--disable-mongodb \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
> @@ -54,7 +56,7 @@ SYSLOGNG_AUTOCONF = \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
>  	--localstatedir=/var/run \
>  	--with-libnet=$(SYSROOT)/usr/bin \
> -	--with-python=$(PYTHON_MAJORMINOR)
> +	--with-python=$(PYTHON3_MAJORMINOR)


Please use configure_helper.py[1] do clean up the options.
Also, I'm seeing an implicit dependency on libcurl in my test build. That
should not happen. Probably a missing '--without-libcurl' or something like
that.

[1] https://www.ptxdist.org/doc/contributing.html#configure-helper-py

>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -73,6 +75,8 @@ $(STATEDIR)/syslogng.targetinstall:
>  	@$(call install_copy, syslogng, 0, 0, 0755, -, \
>  		/usr/sbin/syslog-ng)
>  	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
> +	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
> +	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
>  	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)

I checker complains about missing libloggen_plugin-3.25.so.0 and
libloggen_helper-3.25.so.0. I'm guessing, that the glob is incorrect here,
or some install_lib's are missing.

Michael

>  
>  #	# config
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

Re: [ptxdist] [PATCH] syslogng: update to 3.25.1

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:08PM +0100, Matthias Schiffer wrote:
> Update and move out of staging. The new version adds compatiblity with
> OpenSSL 1.1.x and switches to Python 3.
> 
> The AMQP and MongoDB destinations are removed, they were never buildable
> without additional packages not available in plain PTXdist.
> 
> A simple replacement for the old systemd unit is added, as the new version
> only provides an instanced unit which cannot be linked as syslog.service
> (which is necessary to use syslog-ng as the default system logger by
> enabling ForwardToSyslog in journald.conf).
> 
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>

And it seems to build its own version of libjson-c.so.3 that is never
installed. Maybe --with-jsonc=system and a dependency? Or disable it
entirely.

Michael

> ---
>  projectroot/etc/syslog-ng.conf                |  6 +++--
>  .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++++++++++++++
>  rules/syslogng.in                             | 22 ++-----------------
>  rules/syslogng.make                           | 18 +++++++++------
>  4 files changed, 37 insertions(+), 29 deletions(-)
>  create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service
> 
> diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
> index 254aecfd2..0235b9857 100644
> --- a/projectroot/etc/syslog-ng.conf
> +++ b/projectroot/etc/syslog-ng.conf
> @@ -1,13 +1,15 @@
>  #
> -# syslog-ng configuration 
> +# syslog-ng configuration
>  #
>  
> +@version: 3.25
> +
>  #
>  # Options
>  #
>  
>  # sync every 0 lines
> -options { long_hostnames(off); sync(0); };
> +options { chain_hostnames(off); flush_lines(0); };
>  
>  #
>  # Sources
> diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service
> new file mode 100644
> index 000000000..6bf591efd
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
> @@ -0,0 +1,20 @@
> +[Unit]
> +Description=System Logger Daemon
> +Documentation=man:syslog-ng(8)
> +Conflicts=emergency.service emergency.target
> +Requires=syslog.socket
> +Wants=network.target network-online.target
> +After=network.target network-online.target
> +
> +[Service]
> +Type=notify
> +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
> +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
> +ExecReload=/bin/kill -HUP $MAINPID
> +StandardOutput=journal
> +StandardError=journal
> +Restart=on-failure
> +
> +[Install]
> +Alias=syslog.service
> +WantedBy=multi-user.target
> diff --git a/rules/syslogng.in b/rules/syslogng.in
> index 3b1af844b..29d26e72a 100644
> --- a/rules/syslogng.in
> +++ b/rules/syslogng.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
>  # syslog-ng configuration
>  
>  menuconfig SYSLOGNG
> @@ -9,7 +7,7 @@ menuconfig SYSLOGNG
>  	select EVENTLOG
>  	select GLIB
>  	select OPENSSL
> -	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
> +	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
>  	select LIBC_NSL
>  	select LIBC_RT
>  	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
> @@ -19,10 +17,6 @@ menuconfig SYSLOGNG
>  	help
>  	  The next generation syslog daemon.
>  
> -	  STAGING: remove in ptxdist-2020.01.0
> -	  Fails to build with OpenSSL 1.1.x. Update to a new version is
> -	  needed.
> -
>  if SYSLOGNG
>  
>  config SYSLOGNG_TCP_WRAPPER
> @@ -46,18 +40,6 @@ config SYSLOGNG_SPOOF_SOURCE
>  	  destinations though the original message can be
>  	  received by TCP as well.
>  
> -config SYSLOGNG_AMQP_DESTINATION
> -	bool
> -	prompt "support the AMQP destination"
> -	help
> -	  Enables the ability to publish AMQP messages.
> -
> -config SYSLOGNG_MONGODB_DESTINATION
> -	bool
> -	prompt "support the MongoDB destination"
> -	help
> -	  Enables the ability to send messages to a MongoDB database.
> -
>  config SYSLOGNG_PYTHON_DESTINATION
>  	bool
>  	prompt "support the python destination"
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 114f72cef..4025fc0fa 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
>  #
>  # Paths and names
>  #
> -SYSLOGNG_VERSION	:= 3.7.3
> -SYSLOG_LIBVERSION	:= 3.7
> -SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
> +SYSLOGNG_VERSION	:= 3.25.1
> +SYSLOG_LIBVERSION	:= 3.25
> +SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
>  SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
>  SYSLOGNG_SUFFIX		:= tar.gz
>  SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
> @@ -32,7 +32,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
>  
>  SYSLOGNG_ENV 	= \
>  	$(CROSS_ENV) \
> -	ac_cv_path_PYTHON=$(CROSS_PYTHON)
> +	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
>  
>  #
>  # autoconf
> @@ -43,8 +43,10 @@ SYSLOGNG_AUTOCONF = \
>  	--enable-dynamic-linking \
>  	--disable-debug \
>  	--disable-sun-streams \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
> +	--disable-java \
> +	--disable-redis \
> +	--disable-amqp \
> +	--disable-mongodb \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
> @@ -54,7 +56,7 @@ SYSLOGNG_AUTOCONF = \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
>  	--localstatedir=/var/run \
>  	--with-libnet=$(SYSROOT)/usr/bin \
> -	--with-python=$(PYTHON_MAJORMINOR)
> +	--with-python=$(PYTHON3_MAJORMINOR)
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -73,6 +75,8 @@ $(STATEDIR)/syslogng.targetinstall:
>  	@$(call install_copy, syslogng, 0, 0, 0755, -, \
>  		/usr/sbin/syslog-ng)
>  	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
> +	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
> +	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
>  	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
>  
>  #	# config
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH v2] syslogng: update to 3.25.1

[Matthias Schiffer]

Update and move out of staging. The new version adds compatiblity with
OpenSSL 1.1.x and switches to Python 3.

The AMQP and MongoDB destinations are removed, they were never buildable
without additional packages not available in plain PTXdist. Various
other modules are disabled explicitly to avoid the build
nondeterministically picking up undeclared dependencies.

A simple replacement for the old systemd unit is added, as the new version
only provides an instanced unit which cannot be linked as syslog.service
(which is necessary to use syslog-ng as the default system logger by
enabling ForwardToSyslog in journald.conf).

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 projectroot/etc/syslog-ng.conf                |  6 ++-
 .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++++++
 rules/syslogng.in                             | 30 ++++++-------
 rules/syslogng.make                           | 45 ++++++++++++++++---
 4 files changed, 76 insertions(+), 25 deletions(-)
 create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service

diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
index 254aecfd2..0235b9857 100644
--- a/projectroot/etc/syslog-ng.conf
+++ b/projectroot/etc/syslog-ng.conf
@@ -1,13 +1,15 @@
 #
-# syslog-ng configuration 
+# syslog-ng configuration
 #
 
+@version: 3.25
+
 #
 # Options
 #
 
 # sync every 0 lines
-options { long_hostnames(off); sync(0); };
+options { chain_hostnames(off); flush_lines(0); };
 
 #
 # Sources
diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service
new file mode 100644
index 000000000..6bf591efd
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=System Logger Daemon
+Documentation=man:syslog-ng(8)
+Conflicts=emergency.service emergency.target
+Requires=syslog.socket
+Wants=network.target network-online.target
+After=network.target network-online.target
+
+[Service]
+Type=notify
+ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
+ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
+ExecReload=/bin/kill -HUP $MAINPID
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+
+[Install]
+Alias=syslog.service
+WantedBy=multi-user.target
diff --git a/rules/syslogng.in b/rules/syslogng.in
index 3b1af844b..7707c8c32 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
+## SECTION=networking
 # syslog-ng configuration
 
 menuconfig SYSLOGNG
@@ -9,7 +7,9 @@ menuconfig SYSLOGNG
 	select EVENTLOG
 	select GLIB
 	select OPENSSL
-	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
+	select LIBCURL		if SYSLOGNG_HTTP
+	select JSON_C		if SYSLOGNG_JSON
+	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
 	select LIBC_NSL
 	select LIBC_RT
 	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
@@ -19,10 +19,6 @@ menuconfig SYSLOGNG
 	help
 	  The next generation syslog daemon.
 
-	  STAGING: remove in ptxdist-2020.01.0
-	  Fails to build with OpenSSL 1.1.x. Update to a new version is
-	  needed.
-
 if SYSLOGNG
 
 config SYSLOGNG_TCP_WRAPPER
@@ -46,28 +42,30 @@ config SYSLOGNG_SPOOF_SOURCE
 	  destinations though the original message can be
 	  received by TCP as well.
 
-config SYSLOGNG_AMQP_DESTINATION
+config SYSLOGNG_HTTP
 	bool
-	prompt "support the AMQP destination"
+	prompt "Enable HTTP support"
 	help
-	  Enables the ability to publish AMQP messages.
+	  Enable support for the http() destination that is based
+	  on libcurl.
 
-config SYSLOGNG_MONGODB_DESTINATION
+config SYSLOGNG_JSON
 	bool
-	prompt "support the MongoDB destination"
+	prompt "Enable JSON support"
 	help
-	  Enables the ability to send messages to a MongoDB database.
+	  JSON support is required for json-parser, and the format-cim
+	  and format-json template functions.
 
 config SYSLOGNG_PYTHON_DESTINATION
 	bool
-	prompt "support the python destination"
+	prompt "Support the python destination"
 	help
 	  Enables the ability to use inline python in the
 	  syslog-ng configuration file.
 
 config SYSLOGNG_STOMP_DESTINATION
 	bool
-	prompt "support the STOMP destination"
+	prompt "Support the STOMP destination"
 	help
 	  Enables the ability to send STOMP messages to message brokers.
 
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 114f72cef..6175a9e31 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
 #
 # Paths and names
 #
-SYSLOGNG_VERSION	:= 3.7.3
-SYSLOG_LIBVERSION	:= 3.7
-SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
+SYSLOGNG_VERSION	:= 3.25.1
+SYSLOG_LIBVERSION	:= 3.25
+SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
 SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
 SYSLOGNG_SUFFIX		:= tar.gz
 SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
@@ -32,7 +32,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
 
 SYSLOGNG_ENV 	= \
 	$(CROSS_ENV) \
-	ac_cv_path_PYTHON=$(CROSS_PYTHON)
+	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
 
 #
 # autoconf
@@ -41,10 +41,21 @@ SYSLOGNG_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_IPV6_OPTION) \
 	--enable-dynamic-linking \
+	--disable-amqp \
 	--disable-debug \
+	--disable-geoip2 \
+	--disable-java \
+	--disable-java-modules \
+	--disable-kafka \
+	--disable-mongodb \
+	--disable-redis \
+	--disable-riemann \
+	--disable-smtp \
+	--disable-snmp-dest \
+	--disable-sql \
 	--disable-sun-streams \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_HTTP)-http \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_JSON)-json \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
@@ -53,8 +64,26 @@ SYSLOGNG_AUTOCONF = \
 	--with-systemd-journal=$(call ptx/ifdef, PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system \
 	--localstatedir=/var/run \
+	--with-ivykis=internal \
+	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
 	--with-libnet=$(SYSROOT)/usr/bin \
-	--with-python=$(PYTHON_MAJORMINOR)
+	--with-python=$(PYTHON3_MAJORMINOR)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/syslogng.install:
+	@$(call targetinfo)
+
+	@$(call world/install, SYSLOGNG)
+
+	@rm "$(SYSLOGNG_PKGDIR)/usr/bin/loggen"
+	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/libloggen_"*
+	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen"
+
+	@$(call touch)
+
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -73,6 +102,8 @@ $(STATEDIR)/syslogng.targetinstall:
 	@$(call install_copy, syslogng, 0, 0, 0755, -, \
 		/usr/sbin/syslog-ng)
 	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
+	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
+	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
 	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
 
 #	# config
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] syslogng: update to 3.25.1

[Michael Olbrich]

On Thu, Feb 20, 2020 at 09:39:47AM +0100, Matthias Schiffer wrote:
> Update and move out of staging. The new version adds compatiblity with
> OpenSSL 1.1.x and switches to Python 3.
> 
> The AMQP and MongoDB destinations are removed, they were never buildable
> without additional packages not available in plain PTXdist. Various
> other modules are disabled explicitly to avoid the build
> nondeterministically picking up undeclared dependencies.
> 
> A simple replacement for the old systemd unit is added, as the new version
> only provides an instanced unit which cannot be linked as syslog.service
> (which is necessary to use syslog-ng as the default system logger by
> enabling ForwardToSyslog in journald.conf).
> 
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
>  projectroot/etc/syslog-ng.conf                |  6 ++-
>  .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++++++
>  rules/syslogng.in                             | 30 ++++++-------
>  rules/syslogng.make                           | 45 ++++++++++++++++---
>  4 files changed, 76 insertions(+), 25 deletions(-)
>  create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service
> 
> diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
> index 254aecfd2..0235b9857 100644
> --- a/projectroot/etc/syslog-ng.conf
> +++ b/projectroot/etc/syslog-ng.conf
> @@ -1,13 +1,15 @@
>  #
> -# syslog-ng configuration 
> +# syslog-ng configuration
>  #
>  
> +@version: 3.25
> +
>  #
>  # Options
>  #
>  
>  # sync every 0 lines
> -options { long_hostnames(off); sync(0); };
> +options { chain_hostnames(off); flush_lines(0); };
>  
>  #
>  # Sources
> diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service b/projectroot/usr/lib/systemd/system/syslog-ng.service
> new file mode 100644
> index 000000000..6bf591efd
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
> @@ -0,0 +1,20 @@
> +[Unit]
> +Description=System Logger Daemon
> +Documentation=man:syslog-ng(8)
> +Conflicts=emergency.service emergency.target
> +Requires=syslog.socket
> +Wants=network.target network-online.target
> +After=network.target network-online.target
> +
> +[Service]
> +Type=notify
> +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
> +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
> +ExecReload=/bin/kill -HUP $MAINPID
> +StandardOutput=journal
> +StandardError=journal
> +Restart=on-failure
> +
> +[Install]
> +Alias=syslog.service
> +WantedBy=multi-user.target
> diff --git a/rules/syslogng.in b/rules/syslogng.in
> index 3b1af844b..7707c8c32 100644
> --- a/rules/syslogng.in
> +++ b/rules/syslogng.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
>  # syslog-ng configuration
>  
>  menuconfig SYSLOGNG
> @@ -9,7 +7,9 @@ menuconfig SYSLOGNG
>  	select EVENTLOG
>  	select GLIB
>  	select OPENSSL
> -	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
> +	select LIBCURL		if SYSLOGNG_HTTP
> +	select JSON_C		if SYSLOGNG_JSON
> +	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
>  	select LIBC_NSL
>  	select LIBC_RT
>  	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
> @@ -19,10 +19,6 @@ menuconfig SYSLOGNG
>  	help
>  	  The next generation syslog daemon.
>  
> -	  STAGING: remove in ptxdist-2020.01.0
> -	  Fails to build with OpenSSL 1.1.x. Update to a new version is
> -	  needed.
> -
>  if SYSLOGNG
>  
>  config SYSLOGNG_TCP_WRAPPER
> @@ -46,28 +42,30 @@ config SYSLOGNG_SPOOF_SOURCE
>  	  destinations though the original message can be
>  	  received by TCP as well.
>  
> -config SYSLOGNG_AMQP_DESTINATION
> +config SYSLOGNG_HTTP
>  	bool
> -	prompt "support the AMQP destination"
> +	prompt "Enable HTTP support"
>  	help
> -	  Enables the ability to publish AMQP messages.
> +	  Enable support for the http() destination that is based
> +	  on libcurl.
>  
> -config SYSLOGNG_MONGODB_DESTINATION
> +config SYSLOGNG_JSON
>  	bool
> -	prompt "support the MongoDB destination"
> +	prompt "Enable JSON support"
>  	help
> -	  Enables the ability to send messages to a MongoDB database.
> +	  JSON support is required for json-parser, and the format-cim
> +	  and format-json template functions.
>  
>  config SYSLOGNG_PYTHON_DESTINATION
>  	bool
> -	prompt "support the python destination"
> +	prompt "Support the python destination"
>  	help
>  	  Enables the ability to use inline python in the
>  	  syslog-ng configuration file.
>  
>  config SYSLOGNG_STOMP_DESTINATION
>  	bool
> -	prompt "support the STOMP destination"
> +	prompt "Support the STOMP destination"
>  	help
>  	  Enables the ability to send STOMP messages to message brokers.
>  
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 114f72cef..6175a9e31 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
>  #
>  # Paths and names
>  #
> -SYSLOGNG_VERSION	:= 3.7.3
> -SYSLOG_LIBVERSION	:= 3.7
> -SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
> +SYSLOGNG_VERSION	:= 3.25.1
> +SYSLOG_LIBVERSION	:= 3.25
> +SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
>  SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
>  SYSLOGNG_SUFFIX		:= tar.gz
>  SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
> @@ -32,7 +32,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
>  
>  SYSLOGNG_ENV 	= \
>  	$(CROSS_ENV) \
> -	ac_cv_path_PYTHON=$(CROSS_PYTHON)
> +	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
>  
>  #
>  # autoconf
> @@ -41,10 +41,21 @@ SYSLOGNG_AUTOCONF = \
>  	$(CROSS_AUTOCONF_USR) \
>  	$(GLOBAL_IPV6_OPTION) \
>  	--enable-dynamic-linking \
> +	--disable-amqp \
>  	--disable-debug \
> +	--disable-geoip2 \
> +	--disable-java \
> +	--disable-java-modules \
> +	--disable-kafka \
> +	--disable-mongodb \
> +	--disable-redis \
> +	--disable-riemann \
> +	--disable-smtp \
> +	--disable-snmp-dest \
> +	--disable-sql \
>  	--disable-sun-streams \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
> +	--$(call ptx/endis, PTXCONF_SYSLOGNG_HTTP)-http \
> +	--$(call ptx/endis, PTXCONF_SYSLOGNG_JSON)-json \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
> @@ -53,8 +64,26 @@ SYSLOGNG_AUTOCONF = \
>  	--with-systemd-journal=$(call ptx/ifdef, PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
>  	--localstatedir=/var/run \
> +	--with-ivykis=internal \
> +	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
>  	--with-libnet=$(SYSROOT)/usr/bin \
> -	--with-python=$(PYTHON_MAJORMINOR)
> +	--with-python=$(PYTHON3_MAJORMINOR)

As I noted in my last review, please use configure_helper.py to check and
improve the options.
- GLOBAL_LARGE_FILE_OPTION should be used
- the sorting should be corrected
- there are several enable/disable and with/without options that are
  missing and may pick up dependencies automatically.

Ignore the --with-python output: configure_helper.py currently cannot
handle two options with the same name --enable-python and --with-python in
this case. The two options are merged so the output for this is wrong.

> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/syslogng.install:
> +	@$(call targetinfo)
> +
> +	@$(call world/install, SYSLOGNG)
> +
> +	@rm "$(SYSLOGNG_PKGDIR)/usr/bin/loggen"
> +	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/libloggen_"*
> +	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen"

Why are these removed? This deserves a comment above.

Michael

> +	@$(call touch)
> +
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -73,6 +102,8 @@ $(STATEDIR)/syslogng.targetinstall:
>  	@$(call install_copy, syslogng, 0, 0, 0755, -, \
>  		/usr/sbin/syslog-ng)
>  	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
> +	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
> +	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
>  	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
>  
>  #	# config
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

Re: [ptxdist] (EXT) Re: [PATCH v2] syslogng: update to 3.25.1

[Matthias Schiffer]

On Fri, 2020-02-21 at 08:47 +0100, Michael Olbrich wrote:
> On Thu, Feb 20, 2020 at 09:39:47AM +0100, Matthias Schiffer wrote:
> > Update and move out of staging. The new version adds compatiblity
> > with
> > OpenSSL 1.1.x and switches to Python 3.
> > 
> > The AMQP and MongoDB destinations are removed, they were never
> > buildable
> > without additional packages not available in plain PTXdist. Various
> > other modules are disabled explicitly to avoid the build
> > nondeterministically picking up undeclared dependencies.
> > 
> > A simple replacement for the old systemd unit is added, as the new
> > version
> > only provides an instanced unit which cannot be linked as
> > syslog.service
> > (which is necessary to use syslog-ng as the default system logger
> > by
> > enabling ForwardToSyslog in journald.conf).
> > 
> > Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com
> > >
> > ---
> >  projectroot/etc/syslog-ng.conf                |  6 ++-
> >  .../usr/lib/systemd/system/syslog-ng.service  | 20 +++++++++
> >  rules/syslogng.in                             | 30 ++++++-------
> >  rules/syslogng.make                           | 45
> > ++++++++++++++++---
> >  4 files changed, 76 insertions(+), 25 deletions(-)
> >  create mode 100644 projectroot/usr/lib/systemd/system/syslog-
> > ng.service
> > 
> > diff --git a/projectroot/etc/syslog-ng.conf
> > b/projectroot/etc/syslog-ng.conf
> > index 254aecfd2..0235b9857 100644
> > --- a/projectroot/etc/syslog-ng.conf
> > +++ b/projectroot/etc/syslog-ng.conf
> > @@ -1,13 +1,15 @@
> >  #
> > -# syslog-ng configuration 
> > +# syslog-ng configuration
> >  #
> >  
> > +@version: 3.25
> > +
> >  #
> >  # Options
> >  #
> >  
> >  # sync every 0 lines
> > -options { long_hostnames(off); sync(0); };
> > +options { chain_hostnames(off); flush_lines(0); };
> >  
> >  #
> >  # Sources
> > diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service
> > b/projectroot/usr/lib/systemd/system/syslog-ng.service
> > new file mode 100644
> > index 000000000..6bf591efd
> > --- /dev/null
> > +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
> > @@ -0,0 +1,20 @@
> > +[Unit]
> > +Description=System Logger Daemon
> > +Documentation=man:syslog-ng(8)
> > +Conflicts=emergency.service emergency.target
> > +Requires=syslog.socket
> > +Wants=network.target network-online.target
> > +After=network.target network-online.target
> > +
> > +[Service]
> > +Type=notify
> > +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
> > +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile
> > /etc/syslog-ng.conf --control /var/run/syslog-ng.ctl --persist-file 
> > /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-
> > ng.pid
> > +ExecReload=/bin/kill -HUP $MAINPID
> > +StandardOutput=journal
> > +StandardError=journal
> > +Restart=on-failure
> > +
> > +[Install]
> > +Alias=syslog.service
> > +WantedBy=multi-user.target
> > diff --git a/rules/syslogng.in b/rules/syslogng.in
> > index 3b1af844b..7707c8c32 100644
> > --- a/rules/syslogng.in
> > +++ b/rules/syslogng.in
> > @@ -1,6 +1,4 @@
> > -## SECTION=staging
> > -## old section:
> > -### SECTION=networking
> > +## SECTION=networking
> >  # syslog-ng configuration
> >  
> >  menuconfig SYSLOGNG
> > @@ -9,7 +7,9 @@ menuconfig SYSLOGNG
> >  	select EVENTLOG
> >  	select GLIB
> >  	select OPENSSL
> > -	select PYTHON		if SYSLOGNG_PYTHON_DESTINATION
> > +	select LIBCURL		if SYSLOGNG_HTTP
> > +	select JSON_C		if SYSLOGNG_JSON
> > +	select PYTHON3		if SYSLOGNG_PYTHON_DESTINATION
> >  	select LIBC_NSL
> >  	select LIBC_RT
> >  	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
> > @@ -19,10 +19,6 @@ menuconfig SYSLOGNG
> >  	help
> >  	  The next generation syslog daemon.
> >  
> > -	  STAGING: remove in ptxdist-2020.01.0
> > -	  Fails to build with OpenSSL 1.1.x. Update to a new version is
> > -	  needed.
> > -
> >  if SYSLOGNG
> >  
> >  config SYSLOGNG_TCP_WRAPPER
> > @@ -46,28 +42,30 @@ config SYSLOGNG_SPOOF_SOURCE
> >  	  destinations though the original message can be
> >  	  received by TCP as well.
> >  
> > -config SYSLOGNG_AMQP_DESTINATION
> > +config SYSLOGNG_HTTP
> >  	bool
> > -	prompt "support the AMQP destination"
> > +	prompt "Enable HTTP support"
> >  	help
> > -	  Enables the ability to publish AMQP messages.
> > +	  Enable support for the http() destination that is based
> > +	  on libcurl.
> >  
> > -config SYSLOGNG_MONGODB_DESTINATION
> > +config SYSLOGNG_JSON
> >  	bool
> > -	prompt "support the MongoDB destination"
> > +	prompt "Enable JSON support"
> >  	help
> > -	  Enables the ability to send messages to a MongoDB database.
> > +	  JSON support is required for json-parser, and the format-cim
> > +	  and format-json template functions.
> >  
> >  config SYSLOGNG_PYTHON_DESTINATION
> >  	bool
> > -	prompt "support the python destination"
> > +	prompt "Support the python destination"
> >  	help
> >  	  Enables the ability to use inline python in the
> >  	  syslog-ng configuration file.
> >  
> >  config SYSLOGNG_STOMP_DESTINATION
> >  	bool
> > -	prompt "support the STOMP destination"
> > +	prompt "Support the STOMP destination"
> >  	help
> >  	  Enables the ability to send STOMP messages to message
> > brokers.
> >  
> > diff --git a/rules/syslogng.make b/rules/syslogng.make
> > index 114f72cef..6175a9e31 100644
> > --- a/rules/syslogng.make
> > +++ b/rules/syslogng.make
> > @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
> >  #
> >  # Paths and names
> >  #
> > -SYSLOGNG_VERSION	:= 3.7.3
> > -SYSLOG_LIBVERSION	:= 3.7
> > -SYSLOGNG_MD5		:= 803d61a713d6d41a973942d417fec999
> > +SYSLOGNG_VERSION	:= 3.25.1
> > +SYSLOG_LIBVERSION	:= 3.25
> > +SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
> >  SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
> >  SYSLOGNG_SUFFIX		:= tar.gz
> >  SYSLOGNG_URL		:= 
> > https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX
> > )
> > @@ -32,7 +32,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-
> > 2.1-only
> >  
> >  SYSLOGNG_ENV 	= \
> >  	$(CROSS_ENV) \
> > -	ac_cv_path_PYTHON=$(CROSS_PYTHON)
> > +	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
> >  
> >  #
> >  # autoconf
> > @@ -41,10 +41,21 @@ SYSLOGNG_AUTOCONF = \
> >  	$(CROSS_AUTOCONF_USR) \
> >  	$(GLOBAL_IPV6_OPTION) \
> >  	--enable-dynamic-linking \
> > +	--disable-amqp \
> >  	--disable-debug \
> > +	--disable-geoip2 \
> > +	--disable-java \
> > +	--disable-java-modules \
> > +	--disable-kafka \
> > +	--disable-mongodb \
> > +	--disable-redis \
> > +	--disable-riemann \
> > +	--disable-smtp \
> > +	--disable-snmp-dest \
> > +	--disable-sql \
> >  	--disable-sun-streams \
> > -	--$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
> > -	--$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-
> > mongodb \
> > +	--$(call ptx/endis, PTXCONF_SYSLOGNG_HTTP)-http \
> > +	--$(call ptx/endis, PTXCONF_SYSLOGNG_JSON)-json \
> >  	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python 
> > \
> >  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
> >  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source 
> > \
> > @@ -53,8 +64,26 @@ SYSLOGNG_AUTOCONF = \
> >  	--with-systemd-journal=$(call ptx/ifdef,
> > PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
> >  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
> >  	--localstatedir=/var/run \
> > +	--with-ivykis=internal \
> > +	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
> >  	--with-libnet=$(SYSROOT)/usr/bin \
> > -	--with-python=$(PYTHON_MAJORMINOR)
> > +	--with-python=$(PYTHON3_MAJORMINOR)
> 
> As I noted in my last review, please use configure_helper.py to check
> and
> improve the options.
> - GLOBAL_LARGE_FILE_OPTION should be used
> - the sorting should be corrected
> - there are several enable/disable and with/without options that are
>   missing and may pick up dependencies automatically.

Ah, I didn't know about GLOBAL_LARGE_FILE_OPTION, and mostly used
configure_helper.py to compare the old and the new syslogng version.

Should I list *all* options that configure supports, even when the
defaults are fine? I thought I had caught everything that has an actual
effect. I guess disabling libcurl etc. could be made explicit as well,
but these deps are only used when the corresponding modules are
enabled.

I also found the option --disable-all-modules, which overrides the
defaults for various other options to "no" - which would allow us to
make the SYSLOGNG_AUTOCONF section shorter, but the diff shown by
configure_helper.py larger. Which way should I go here?

Matthias


> 
> Ignore the --with-python output: configure_helper.py currently cannot
> handle two options with the same name --enable-python and --with-
> python in
> this case. The two options are merged so the output for this is
> wrong.
> 
> > +
> > +# ----------------------------------------------------------------
> > ------------
> > +# Install
> > +# ----------------------------------------------------------------
> > ------------
> > +
> > +$(STATEDIR)/syslogng.install:
> > +	@$(call targetinfo)
> > +
> > +	@$(call world/install, SYSLOGNG)
> > +
> > +	@rm "$(SYSLOGNG_PKGDIR)/usr/bin/loggen"
> > +	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/libloggen_"*
> > +	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen"
> 
> Why are these removed? This deserves a comment above.
> 
> Michael
> 
> > +	@$(call touch)
> > +
> >  
> >  # ----------------------------------------------------------------
> > ------------
> >  # Target-Install
> > @@ -73,6 +102,8 @@ $(STATEDIR)/syslogng.targetinstall:
> >  	@$(call install_copy, syslogng, 0, 0, 0755, -, \
> >  		/usr/sbin/syslog-ng)
> >  	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-
> > $(SYSLOG_LIBVERSION))
> > +	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-
> > $(SYSLOG_LIBVERSION))
> > +	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
> >  	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng,
> > *.so)
> >  
> >  #	# config
> > -- 
> > 2.17.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > 
> 
> 


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] (EXT) Re: [PATCH v2] syslogng: update to 3.25.1

[Michael Olbrich]

On Fri, Feb 21, 2020 at 09:30:30AM +0100, Matthias Schiffer wrote:
> On Fri, 2020-02-21 at 08:47 +0100, Michael Olbrich wrote:
> > On Thu, Feb 20, 2020 at 09:39:47AM +0100, Matthias Schiffer wrote:
> > >  	--with-systemd-journal=$(call ptx/ifdef,
> > > PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
> > >  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
> > >  	--localstatedir=/var/run \
> > > +	--with-ivykis=internal \
> > > +	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
> > >  	--with-libnet=$(SYSROOT)/usr/bin \
> > > -	--with-python=$(PYTHON_MAJORMINOR)
> > > +	--with-python=$(PYTHON3_MAJORMINOR)
> > 
> > As I noted in my last review, please use configure_helper.py to check
> > and
> > improve the options.
> > - GLOBAL_LARGE_FILE_OPTION should be used
> > - the sorting should be corrected
> > - there are several enable/disable and with/without options that are
> >   missing and may pick up dependencies automatically.
> 
> Ah, I didn't know about GLOBAL_LARGE_FILE_OPTION, and mostly used
> configure_helper.py to compare the old and the new syslogng version.
> 
> Should I list *all* options that configure supports, even when the
> defaults are fine? I thought I had caught everything that has an actual
> effect. I guess disabling libcurl etc. could be made explicit as well,
> but these deps are only used when the corresponding modules are
> enabled.
> 
> I also found the option --disable-all-modules, which overrides the
> defaults for various other options to "no" - which would allow us to
> make the SYSLOGNG_AUTOCONF section shorter, but the diff shown by
> configure_helper.py larger. Which way should I go here?

To make updates easier, I prefer a shorter configure_helper.py output:
- If it makes sense, then the output should be empty (probably not
  reasonable here)
- options that obviously don't matter are find
  - stuff like Windows or OSX specific options
  - some --with-* options for extra search paths
  ...
- any option that avoids / forces a autodetect check _must_ be specified.
  Never depend on the auto detections.
- not adding options that can overwrite a fixed value (paths etc.) is ok
- make sure the options are sorted correctly

I hope this helps.

Michael

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

Re: [ptxdist] (EXT) Re: [PATCH v2] syslogng: update to 3.25.1

[Michael Olbrich]

On Wed, Mar 18, 2020 at 11:50:17AM +0100, Michael Olbrich wrote:
> On Fri, Feb 21, 2020 at 09:30:30AM +0100, Matthias Schiffer wrote:
> > On Fri, 2020-02-21 at 08:47 +0100, Michael Olbrich wrote:
> > > On Thu, Feb 20, 2020 at 09:39:47AM +0100, Matthias Schiffer wrote:
> > > >  	--with-systemd-journal=$(call ptx/ifdef,
> > > > PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
> > > >  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
> > > >  	--localstatedir=/var/run \
> > > > +	--with-ivykis=internal \
> > > > +	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
> > > >  	--with-libnet=$(SYSROOT)/usr/bin \
> > > > -	--with-python=$(PYTHON_MAJORMINOR)
> > > > +	--with-python=$(PYTHON3_MAJORMINOR)
> > > 
> > > As I noted in my last review, please use configure_helper.py to check
> > > and
> > > improve the options.
> > > - GLOBAL_LARGE_FILE_OPTION should be used
> > > - the sorting should be corrected
> > > - there are several enable/disable and with/without options that are
> > >   missing and may pick up dependencies automatically.
> > 
> > Ah, I didn't know about GLOBAL_LARGE_FILE_OPTION, and mostly used
> > configure_helper.py to compare the old and the new syslogng version.
> > 
> > Should I list *all* options that configure supports, even when the
> > defaults are fine? I thought I had caught everything that has an actual
> > effect. I guess disabling libcurl etc. could be made explicit as well,
> > but these deps are only used when the corresponding modules are
> > enabled.
> > 
> > I also found the option --disable-all-modules, which overrides the
> > defaults for various other options to "no" - which would allow us to
> > make the SYSLOGNG_AUTOCONF section shorter, but the diff shown by
> > configure_helper.py larger. Which way should I go here?
> 
> To make updates easier, I prefer a shorter configure_helper.py output:
> - If it makes sense, then the output should be empty (probably not
>   reasonable here)
> - options that obviously don't matter are find
>   - stuff like Windows or OSX specific options
>   - some --with-* options for extra search paths
>   ...
> - any option that avoids / forces a autodetect check _must_ be specified.
>   Never depend on the auto detections.
> - not adding options that can overwrite a fixed value (paths etc.) is ok
> - make sure the options are sorted correctly
> 
> I hope this helps.

Any change, you'll send a new version here? I was just about to remove
syslogng entirely (after more than a year in staging). But then I
remembered this thread. So it's still there but it won't be much longer.

Michael

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

Re: [ptxdist] (EXT) Re: (EXT) Re: [PATCH v2] syslogng: update to 3.25.1

[Matthias Schiffer]

On Fri, 2020-04-03 at 07:28 +0200, Michael Olbrich wrote:
> On Wed, Mar 18, 2020 at 11:50:17AM +0100, Michael Olbrich wrote:
> > On Fri, Feb 21, 2020 at 09:30:30AM +0100, Matthias Schiffer wrote:
> > > On Fri, 2020-02-21 at 08:47 +0100, Michael Olbrich wrote:
> > > > On Thu, Feb 20, 2020 at 09:39:47AM +0100, Matthias Schiffer
> > > > wrote:
> > > > >  	--with-systemd-journal=$(call ptx/ifdef,
> > > > > PTXCONF_SYSLOGNG_SYSTEMD,system,no) \
> > > > >  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
> > > > >  	--localstatedir=/var/run \
> > > > > +	--with-ivykis=internal \
> > > > > +	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
> > > > >  	--with-libnet=$(SYSROOT)/usr/bin \
> > > > > -	--with-python=$(PYTHON_MAJORMINOR)
> > > > > +	--with-python=$(PYTHON3_MAJORMINOR)
> > > > 
> > > > As I noted in my last review, please use configure_helper.py to
> > > > check
> > > > and
> > > > improve the options.
> > > > - GLOBAL_LARGE_FILE_OPTION should be used
> > > > - the sorting should be corrected
> > > > - there are several enable/disable and with/without options
> > > > that are
> > > >   missing and may pick up dependencies automatically.
> > > 
> > > Ah, I didn't know about GLOBAL_LARGE_FILE_OPTION, and mostly used
> > > configure_helper.py to compare the old and the new syslogng
> > > version.
> > > 
> > > Should I list *all* options that configure supports, even when
> > > the
> > > defaults are fine? I thought I had caught everything that has an
> > > actual
> > > effect. I guess disabling libcurl etc. could be made explicit as
> > > well,
> > > but these deps are only used when the corresponding modules are
> > > enabled.
> > > 
> > > I also found the option --disable-all-modules, which overrides
> > > the
> > > defaults for various other options to "no" - which would allow us
> > > to
> > > make the SYSLOGNG_AUTOCONF section shorter, but the diff shown by
> > > configure_helper.py larger. Which way should I go here?
> > 
> > To make updates easier, I prefer a shorter configure_helper.py
> > output:
> > - If it makes sense, then the output should be empty (probably not
> >   reasonable here)
> > - options that obviously don't matter are find
> >   - stuff like Windows or OSX specific options
> >   - some --with-* options for extra search paths
> >   ...
> > - any option that avoids / forces a autodetect check _must_ be
> > specified.
> >   Never depend on the auto detections.
> > - not adding options that can overwrite a fixed value (paths etc.)
> > is ok
> > - make sure the options are sorted correctly
> > 
> > I hope this helps.
> 
> Any change, you'll send a new version here? I was just about to
> remove
> syslogng entirely (after more than a year in staging). But then I
> remembered this thread. So it's still there but it won't be much
> longer.

Hello Michael,

sorry, I didn't see your previous mail. I assume I can have another
look at some point in the next ~2 weeks.

Matthias

> 
> Michael
> 


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] kmscube: switch to https URL

[Michael Olbrich]

On Thu, Feb 13, 2020 at 06:22:03PM +0100, Matthias Schiffer wrote:
> From: Markus Niebel <Markus.Niebel@tq-group.com>
> 
> Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
> ---
>  rules/kmscube.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/kmscube.make b/rules/kmscube.make
> index a6d5d0150..94a2f31fa 100644
> --- a/rules/kmscube.make
> +++ b/rules/kmscube.make
> @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
>  KMSCUBE_VERSION	:= 2017-03-13-g803bac5
>  KMSCUBE		:= kmscube-$(KMSCUBE_VERSION)
>  KMSCUBE_MD5	:= 781a59ab2d1d245e99a49df7c3dc1876
> -KMSCUBE_URL	:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
> +KMSCUBE_URL	:= https://gitlab.freedesktop.org/mesa/kmscube.git;tag=$(KMSCUBE_VERSION)

With gitlab, we can avoid git entirely:

https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX)

Should work.

Michael

>  KMSCUBE_SUFFIX	:= tar.gz
>  KMSCUBE_SOURCE	:= $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
>  KMSCUBE_DIR	:= $(BUILDDIR)/$(KMSCUBE)
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

Re: [ptxdist] (EXT) Re: [PATCH] kmscube: switch to https URL

[Matthias Schiffer]

On Fri, 2020-02-14 at 09:40 +0100, Michael Olbrich wrote:
> On Thu, Feb 13, 2020 at 06:22:03PM +0100, Matthias Schiffer wrote:
> > From: Markus Niebel <Markus.Niebel@tq-group.com>
> > 
> > Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> > Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com
> > >
> > ---
> >  rules/kmscube.make | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/rules/kmscube.make b/rules/kmscube.make
> > index a6d5d0150..94a2f31fa 100644
> > --- a/rules/kmscube.make
> > +++ b/rules/kmscube.make
> > @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
> >  KMSCUBE_VERSION	:= 2017-03-13-g803bac5
> >  KMSCUBE		:= kmscube-$(KMSCUBE_VERSION)
> >  KMSCUBE_MD5	:= 781a59ab2d1d245e99a49df7c3dc1876
> > -KMSCUBE_URL	:=
> > git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
> > +KMSCUBE_URL	:= 
> > https://gitlab.freedesktop.org/mesa/kmscube.git;tag=$(KMSCUBE_VERSION
> > )
> 
> With gitlab, we can avoid git entirely:
> 
> 
https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX
> )
> 
> Should work.
> 
> Michael

Are these archive downloads guaranteed to have stable MD5 sums with
Gitlab? I know that the OpenWrt project generally avoids archive
downloads from Github for this reason.

Matthias


> 
> >  KMSCUBE_SUFFIX	:= tar.gz
> >  KMSCUBE_SOURCE	:= $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
> >  KMSCUBE_DIR	:= $(BUILDDIR)/$(KMSCUBE)
> > -- 
> > 2.17.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > 
> 
> 


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] (EXT) Re: [PATCH] kmscube: switch to https URL

[Michael Olbrich]

On Fri, Feb 14, 2020 at 09:53:41AM +0100, Matthias Schiffer wrote:
> On Fri, 2020-02-14 at 09:40 +0100, Michael Olbrich wrote:
> > On Thu, Feb 13, 2020 at 06:22:03PM +0100, Matthias Schiffer wrote:
> > > From: Markus Niebel <Markus.Niebel@tq-group.com>
> > > 
> > > Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> > > Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com
> > > >
> > > ---
> > >  rules/kmscube.make | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/rules/kmscube.make b/rules/kmscube.make
> > > index a6d5d0150..94a2f31fa 100644
> > > --- a/rules/kmscube.make
> > > +++ b/rules/kmscube.make
> > > @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
> > >  KMSCUBE_VERSION	:= 2017-03-13-g803bac5
> > >  KMSCUBE		:= kmscube-$(KMSCUBE_VERSION)
> > >  KMSCUBE_MD5	:= 781a59ab2d1d245e99a49df7c3dc1876
> > > -KMSCUBE_URL	:=
> > > git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
> > > +KMSCUBE_URL	:= 
> > > https://gitlab.freedesktop.org/mesa/kmscube.git;tag=$(KMSCUBE_VERSION
> > > )
> > 
> > With gitlab, we can avoid git entirely:
> > 
> > 
> https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX
> > )
> > 
> > Should work.
> > 
> > Michael
> 
> Are these archive downloads guaranteed to have stable MD5 sums with
> Gitlab? I know that the OpenWrt project generally avoids archive
> downloads from Github for this reason.

We use those all the time (for github and gitlab) and I've not had any
problems with this. It's just a 'git archive' anyways: The md5 sum doesn't
even change from the current one.

Michael

> Matthias
> 
> 
> > 
> > >  KMSCUBE_SUFFIX	:= tar.gz
> > >  KMSCUBE_SOURCE	:= $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
> > >  KMSCUBE_DIR	:= $(BUILDDIR)/$(KMSCUBE)
> > > -- 
> > > 2.17.1
> > > 
> > > 
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > > 
> > 
> > 
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

[ptxdist] [PATCH v2] kmscube: switch to https archive download

[Matthias Schiffer]

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 rules/kmscube.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/kmscube.make b/rules/kmscube.make
index a6d5d0150..5275a627c 100644
--- a/rules/kmscube.make
+++ b/rules/kmscube.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube
 KMSCUBE_VERSION	:= 2017-03-13-g803bac5
 KMSCUBE		:= kmscube-$(KMSCUBE_VERSION)
 KMSCUBE_MD5	:= 781a59ab2d1d245e99a49df7c3dc1876
-KMSCUBE_URL	:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
 KMSCUBE_SUFFIX	:= tar.gz
+KMSCUBE_URL	:= https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
 KMSCUBE_SOURCE	:= $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
 KMSCUBE_DIR	:= $(BUILDDIR)/$(KMSCUBE)
 
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de