[ptxdist] [PATCH] nginx: fix IPv6 build override patch

[Clemens Gruber]

In the previous version of the IPv6 override patch, the defines were
defined to yes but nginx checked them with #if, which did not work.
Fix it by defining to 1 or 0 but keeping yes/no in the rule file for
consistency with the other environment variables.

Signed-off-by: Clemens Gruber 
---
 ...unix-allow-overriding-the-IPv6-build-test.patch | 30 +++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git 
a/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
 
b/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
index 93813beb7..2fdf43a4c 100644
--- 
a/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
+++ 
b/patches/nginx-1.12.2/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
@@ -4,11 +4,33 @@ Subject: [PATCH] auto/unix: allow overriding the IPv6 build 
tests
 
 Signed-off-by: Clemens Gruber 
 ---
- auto/unix | 7 ---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ auto/feature | 7 ++-
+ auto/unix| 6 --
+ 2 files changed, 10 insertions(+), 3 deletions(-)
 
+diff --git a/auto/feature b/auto/feature
+index 8016d802e7a8..a9c6b6ee5eeb 100644
+--- a/auto/feature
 b/auto/feature
+@@ -81,10 +81,15 @@ if [ -x $NGX_AUTOTEST ]; then
+ value)
+ if test -n "$ngx_feature_run_force_result" ; then
+ echo " not tested (maybe cross-compiling)"
++if test "$ngx_feature_run_force_result" = "yes" ; then
++ngx_feature_run_force_result_int=1
++else
++ngx_feature_run_force_result_int=0
++fi
+ cat << END >> $NGX_AUTO_CONFIG_H
+
+ #ifndef $ngx_feature_name
+-#define $ngx_feature_name  $ngx_feature_run_force_result
++#define $ngx_feature_name  $ngx_feature_run_force_result_int
+ #endif
+
+ END
 diff --git a/auto/unix b/auto/unix
-index ed821b5a5aaa..dba1be478b9d 100644
+index ed821b5a5aaa..e7ad3b5c0be5 100644
 --- a/auto/unix
 +++ b/auto/unix
 @@ -412,7 +412,8 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, 
NULL, 0)"
@@ -21,7 +43,7 @@ index ed821b5a5aaa..dba1be478b9d 100644
  ngx_feature_incs="#include 
#include "
  ngx_feature_path=
-@@ -640,7 +640,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; 
. auto/types/value
+@@ -640,7 +641,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; 
. auto/types/value
  
  ngx_feature="AF_INET6"
  ngx_feature_name="NGX_HAVE_INET6"
-- 
2.15.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] valgrind: don't use the host mpicc to build target libraries

[Jan Luebbe]

Otherwise, valgrind builds a libmpiwrap-arm-linux.so for the
host architecture when mpicc is found.

Signed-off-by: Jan Luebbe 
---
 rules/valgrind.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/valgrind.make b/rules/valgrind.make
index 30ce223f96e9..afb7fabfb4b1 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -60,6 +60,7 @@ endif
 VALGRIND_CONF_TOOL := autoconf
 VALGRIND_CONF_OPT  := \
$(CROSS_AUTOCONF_USR) \
+   --without-mpicc \
--enable-tls
 
 # 
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Empty modules.dep after kernel update

[Matthias Klein]

Hello Michael,

thanks a lot for the tip!

It was the modules compression which was turned on ...


Best regards,
Matthias

-- Originalnachricht --
Von: "Michael Olbrich" 
An: ptxdist@pengutronix.de
Gesendet: 22.11.2017 14:14:39
Betreff: Re: [ptxdist] Empty modules.dep after kernel update


Hi,

On Wed, Nov 22, 2017 at 12:27:28PM +, Matthias Klein wrote:
 I am working on a kernel update from 4.4 to 4.14 in our ptxdist 
2016.04

 based BSP.

 The kernel builds fine, but the modules.dep file is zero bytes long.
 I updated libkmod.make from version 22 to 24, but that did not help.

 When I run the depmod from sysroot-host/sbin/ by hand it finds no 
symbols:


 ./depmod -a -n -b ~/bsp/platform-xxx/root 4.14.1-3-gb5f7a9a47e0b
 # Aliases extracted from modules themselves.
 # Soft dependencies extracted from modules themselves.
 # Aliases for symbols, used by symbol_request().

 If I run the same with the old 4.4 path I get a lot of symbols / 
output

 ./depmod -a -n -b ~/bsp/platform-xxx/root 4.4.79


 Does anyone have an idea what could be wrong, or what I can check?


Does it work with 'depmod' from your host system? Maybe you enabled 
module

compression fo 4.14? That's currently disabled in host-libkmod.

Michael

--
Pengutronix e.K.   |
 |
Industrial Linux Solutions | http://www.pengutronix.de/ 
 |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0   
 |
Amtsgericht Hildesheim, HRA 2686   | Fax:   
+49-5121-206917- |


___
ptxdist mailing list
ptxdist@pengutronix.de



___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Empty modules.dep after kernel update

[Michael Olbrich]

Hi,

On Wed, Nov 22, 2017 at 12:27:28PM +, Matthias Klein wrote:
> I am working on a kernel update from 4.4 to 4.14 in our ptxdist 2016.04
> based BSP.
> 
> The kernel builds fine, but the modules.dep file is zero bytes long.
> I updated libkmod.make from version 22 to 24, but that did not help.
> 
> When I run the depmod from sysroot-host/sbin/ by hand it finds no symbols:
> 
> ./depmod -a -n -b ~/bsp/platform-xxx/root 4.14.1-3-gb5f7a9a47e0b
> # Aliases extracted from modules themselves.
> # Soft dependencies extracted from modules themselves.
> # Aliases for symbols, used by symbol_request().
> 
> If I run the same with the old 4.4 path I get a lot of symbols / output
> ./depmod -a -n -b ~/bsp/platform-xxx/root 4.4.79
> 
> 
> Does anyone have an idea what could be wrong, or what I can check?

Does it work with 'depmod' from your host system? Maybe you enabled module
compression fo 4.14? That's currently disabled in host-libkmod.

Michael

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Empty modules.dep after kernel update

[Matthias Klein]

Hello,

I am working on a kernel update from 4.4 to 4.14 in our ptxdist 2016.04 
based BSP.


The kernel builds fine, but the modules.dep file is zero bytes long.
I updated libkmod.make from version 22 to 24, but that did not help.

When I run the depmod from sysroot-host/sbin/ by hand it finds no 
symbols:


./depmod -a -n -b ~/bsp/platform-xxx/root 4.14.1-3-gb5f7a9a47e0b
# Aliases extracted from modules themselves.
# Soft dependencies extracted from modules themselves.
# Aliases for symbols, used by symbol_request().

If I run the same with the old 4.4 path I get a lot of symbols / output
./depmod -a -n -b ~/bsp/platform-xxx/root 4.4.79


Does anyone have an idea what could be wrong, or what I can check?


Thanks a lot for your help!


Best regards,
Matthias
___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3] linuxptp: Update package and configs

[Michael Grzeschik]

Usualy we can not ensure only to use transparent clock switches.
Therefor we setup the fix option -P to the commandline to enable
the P2P mechanism in ptp4l.

The following options are highly depending on the usecase
so we remove them for the defaults.

path_trace_enabled
follow_up_info
tx_timestamp_timeout

With all other options were simple defaults the whole
config can be removed.

We also add some service files to start the ptp4l service on
dev eth0. In case the ptp4l daemon is configured
we add the option to install the phc2sys daemon to adjust the
system time by the ptp master.

Signed-off-by: Michael Grzeschik 
---
v1 -> v2: - removed install stage for gPTP.conf from rules file
  - limited to run ptp4l only on eth0 for the default setup case

v2 -> v3: - removed second -r option in phc2sys rule
  - changed systemd rule for ptp4l to static configuration

 projectroot/etc/gPTP.conf  | 28 --
 projectroot/usr/lib/systemd/system/phc2sys.service | 10 
 projectroot/usr/lib/systemd/system/ptp4l.service   | 12 ++
 rules/linuxptp.in  | 12 ++
 rules/linuxptp.make| 20 +---
 5 files changed, 51 insertions(+), 31 deletions(-)
 delete mode 100644 projectroot/etc/gPTP.conf
 create mode 100644 projectroot/usr/lib/systemd/system/phc2sys.service
 create mode 100644 projectroot/usr/lib/systemd/system/ptp4l.service

diff --git a/projectroot/etc/gPTP.conf b/projectroot/etc/gPTP.conf
deleted file mode 100644
index 5bbbaf288..0
--- a/projectroot/etc/gPTP.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[global]
-#
-# Run time options
-#
-assume_two_step 1
-logging_level   6
-path_trace_enabled  1
-follow_up_info  1
-tx_timestamp_timeout40
-use_syslog  1
-verbose 0
-summary_interval0
-#
-# Transport options
-#
-transportSpecific   0x1
-ptp_dst_mac 01:80:C2:00:00:0E
-p2p_dst_mac 01:80:C2:00:00:0E
-uds_address /var/run/ptp4l
-#
-# Default interface options
-#
-network_transport   L2
-delay_mechanism P2P
-time_stamping   hardware
-
-[eth0]
-
diff --git a/projectroot/usr/lib/systemd/system/phc2sys.service 
b/projectroot/usr/lib/systemd/system/phc2sys.service
new file mode 100644
index 0..992a95484
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/phc2sys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Precision Time Protocol system clock synchronization
+Wants=ptp4l@.service
+
+[Service]
+ExecStart=/usr/sbin/phc2sys -a -r
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/projectroot/usr/lib/systemd/system/ptp4l.service 
b/projectroot/usr/lib/systemd/system/ptp4l.service
new file mode 100644
index 0..90d09e56d
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/ptp4l.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Precision Time Protocol (PTP) service
+BindsTo = sys-subsystem-net-devices-eth0.device
+After = sys-subsystem-net-devices-eth0.device
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/ptp4l -P -i eth0
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/rules/linuxptp.in b/rules/linuxptp.in
index 641d844c7..5418d2ad0 100644
--- a/rules/linuxptp.in
+++ b/rules/linuxptp.in
@@ -7,3 +7,15 @@ config LINUXPTP
  The Linux PTP project implements the Precision Time protocol (PTP),
  standardized as IEEE1588.
 
+if LINUXPTP
+
+config LINUXPTP_SYSTEMD_SERVICE
+   bool "install ptp4l and phc2sys systemd service files"
+   default y
+
+config LINUXPTP_PHC2SYS_SYSTEMD_SERVICE
+   bool "Enable phc2sys systemd service file"
+   default y
+   depends on LINUXPTP_SYSTEMD_SERVICE
+
+endif
diff --git a/rules/linuxptp.make b/rules/linuxptp.make
index 59cbb5123..9d3163d56 100644
--- a/rules/linuxptp.make
+++ b/rules/linuxptp.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) += linuxptp
 #
 # Paths and names
 #
-LINUXPTP_VERSION   := 1.6
-LINUXPTP_MD5   := 6aa15d83f5a35f1fd076ba9adc4e7285
+LINUXPTP_VERSION   := 1.8
+LINUXPTP_MD5   := 5688cdfe57932273e1dbf35b3b97b9a0
 LINUXPTP   := linuxptp-$(LINUXPTP_VERSION)
 LINUXPTP_SUFFIX:= tgz
 LINUXPTP_URL   := $(call ptx/mirror, SF, 
linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX))
@@ -64,7 +64,21 @@ $(STATEDIR)/linuxptp.targetinstall:
@$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/phc2sys)
@$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/pmc)
@$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/hwstamp_ctl)
-   @$(call install_alternative, linuxptp, 0, 0, 0644, /etc/gPTP.conf)
+   @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/phc_ctl)
+   @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/timemaster)
+
+ifdef PTXCONF_LINUXPTP_SYSTEMD_SERVICE
+   @$(call install_alternative, 

Re: [ptxdist] [PATCH] glib: version bump 2.52.1 -> 2.54.2

[Ian Abbott]

On 22/11/17 09:05, Michael Olbrich wrote:

On Wed, Nov 22, 2017 at 12:18:07AM +0100, Ladislav Michl wrote:

Update to latest stable version.

Also it turned out that package install stage is using GTKDOC tools
found on build host, so add empty ac_cv_path_* to avoid that.

Signed-off-by: Ladislav Michl 
---
  Note: See also previous mail. Perhaps it would be worth to create
  some global for disabling gtk-doc and ac_cv_path_* overriding...
  I'll leave this for later; consider this patch a bugfix ;)


Can you check if other packages are affected too? I think gnutls or
gstreamer1 might be from what I can tell from reading the Makefiles.

If they are affected, then I'll work on a more general solution.

Michael


On my system, udev-legacy was one of the failing packages.  I got errors 
such as these:


Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
Traceback (most recent call last):
  File "/usr/bin/gtkdoc-rebase", line 56, in 
sys.exit(rebase.run(options))
  File "/usr/share/gtk-doc/python/gtkdoc/rebase.py", line 66, in run
dir = common.GetModuleDocDir('glib-2.0')
  File "/usr/share/gtk-doc/python/gtkdoc/common.py", line 104, in 
GetModuleDocDir
path = subprocess.check_output([config.pkg_config, 
'--variable=prefix', module_name], universal_newlines=True)

  File "/usr/lib/python2.7/subprocess.py", line 219, in check_output
raise CalledProcessError(retcode, cmd, output=output)
subprocess.CalledProcessError: Command '['/usr/bin/pkg-config', 
'--variable=prefix', 'glib-2.0']' returned non-zero exit status 1

make[4]: *** [install-data-local] Error 1
Makefile:772: recipe for target 'install-data-local' failed
make[3]: *** [install-am] Error 2
Makefile:500: recipe for target 'install-am' failed
make[2]: *** [install-recursive] Error 1
Makefile:3190: recipe for target 'install-recursive' failed
make[1]: *** [install] Error 2
Makefile:3668: recipe for target 'install' failed
make[1]: Leaving directory 
'/mnt/lindata/work/abbotti/ptxdist/projects/testproject/platform-EBV-Socrates/build-target/udev-182'



I worked around it by uninstalling the Debian host's gtk-doc-tools package.

--
-=( Ian Abbott @ MEV Ltd.E-mail:  )=-
-=(  Web: http://www.mev.co.uk/  )=-

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] glib: version bump 2.52.1 -> 2.54.2

[Ladislav Michl]

On Wed, Nov 22, 2017 at 10:05:32AM +0100, Michael Olbrich wrote:
> On Wed, Nov 22, 2017 at 12:18:07AM +0100, Ladislav Michl wrote:
> > Update to latest stable version.
> > 
> > Also it turned out that package install stage is using GTKDOC tools
> > found on build host, so add empty ac_cv_path_* to avoid that.
> > 
> > Signed-off-by: Ladislav Michl 
> > ---
> >  Note: See also previous mail. Perhaps it would be worth to create
> >  some global for disabling gtk-doc and ac_cv_path_* overriding...
> >  I'll leave this for later; consider this patch a bugfix ;)
> 
> Can you check if other packages are affected too? I think gnutls or
> gstreamer1 might be from what I can tell from reading the Makefiles.

Yes, all those using gtk-doc, although only glib fails building
as install stage is looking for glib installed. Configure finds:
checking for gtkdoc-check... /usr/bin/gtkdoc-check
checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf

And gtkdoc-rebase in Debian unstable is currently buggy one (see
previous mail).

> If they are affected, then I'll work on a more general solution.

As we do not use gtk-doc at all, I guess adding empty
ac_cv_path_GTKDOC_REBASE etc would do the trick.

ladis

> Michael
> 
> >  rules/glib.make  | 18 ++
> >  rules/host-glib.make | 10 --
> >  2 files changed, 22 insertions(+), 6 deletions(-)
> > 
> > diff --git a/rules/glib.make b/rules/glib.make
> > index 8592618fc..5d2c11fe6 100644
> > --- a/rules/glib.make
> > +++ b/rules/glib.make
> > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
> >  #
> >  # Paths and names
> >  #
> > -GLIB_VERSION   := 2.52.1
> > -GLIB_MD5   := 36b4c7bf4f2b398ac8ad90578d05c950
> > +GLIB_VERSION   := 2.54.2
> > +GLIB_MD5   := 50f83e08f080f99b1e2f0ad2b760fb81
> >  GLIB   := glib-$(GLIB_VERSION)
> >  GLIB_SUFFIX:= tar.xz
> >  GLIB_SOURCE:= $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
> > @@ -32,14 +32,21 @@ GLIB_LICENSE:= LGPL-2.0+
> >  # Prepare
> >  # 
> > 
> >  
> > +# If one of GTKDOC tools is found at configure stage, it might be used,
> > +# no matter whether we use --disable-gtk-doc as this option controls
> > +# generating documentation, while in tarballs it is already generated
> > +# and providing empty paths to GTKDOC tools avoids doc installation.
> >  GLIB_CONF_ENV  := \
> > $(CROSS_ENV) \
> > glib_cv_uscore=no \
> > glib_cv_stack_grows=no \
> > glib_cv_have_qsort_r=yes \
> > ac_cv_func_statfs=yes \
> > -   ac_cv_path_MSGFMT=: \
> > -   ac_cv_path_XGETTEXT=no
> > +   ac_cv_path_MSGFMT="" \
> > +   ac_cv_path_XGETTEXT="" \
> > +   ac_cv_prog_GTKDOC_CHECK="" \
> > +   ac_cv_path_GTKDOC_REBASE="" \
> > +   ac_cv_path_GTKDOC_MKPDF=""
> >  
> >  #
> >  # autoconf
> > @@ -51,6 +58,7 @@ GLIB_CONF_ENV := \
> >  GLIB_CONF_TOOL := autoconf
> >  GLIB_CONF_OPT  := \
> > $(CROSS_AUTOCONF_USR) \
> > +   --disable-maintainer-mode \
> > --enable-debug=minimum \
> > --disable-gc-friendly \
> > --enable-mem-pools \
> > @@ -67,6 +75,8 @@ GLIB_CONF_OPT := \
> > --disable-libelf \
> > --disable-libmount \
> > --disable-gtk-doc \
> > +   --disable-gtk-doc-html \
> > +   --disable-gtk-doc-pdf \
> > --disable-man \
> > --disable-dtrace \
> > --disable-systemtap \
> > diff --git a/rules/host-glib.make b/rules/host-glib.make
> > index 8e0e42c6b..534fd3453 100644
> > --- a/rules/host-glib.make
> > +++ b/rules/host-glib.make
> > @@ -24,8 +24,11 @@ HOST_GLIB_DIR= $(HOST_BUILDDIR)/$(GLIB)
> >  
> >  HOST_GLIB_CONF_ENV := \
> > $(HOST_ENV) \
> > -   ac_cv_path_MSGFMT=: \
> > -   ac_cv_path_XGETTEXT=no
> > +   ac_cv_path_MSGFMT="" \
> > +   ac_cv_path_XGETTEXT="" \
> > +   ac_cv_prog_GTKDOC_CHECK="" \
> > +   ac_cv_path_GTKDOC_REBASE="" \
> > +   ac_cv_path_GTKDOC_MKPDF=""
> >  
> >  #
> >  # autoconf
> > @@ -33,6 +36,7 @@ HOST_GLIB_CONF_ENV:= \
> >  HOST_GLIB_CONF_TOOL:= autoconf
> >  HOST_GLIB_CONF_OPT := \
> > $(HOST_AUTOCONF) \
> > +   --disable-maintainer-mode \
> > --disable-debug \
> > --disable-gc-friendly \
> > --enable-mem-pools \
> > @@ -48,6 +52,8 @@ HOST_GLIB_CONF_OPT:= \
> > --disable-libelf \
> > --disable-libmount \
> > --disable-gtk-doc \
> > +   --disable-gtk-doc-html \
> > +   --disable-gtk-doc-pdf \
> > --disable-man \
> > --disable-dtrace \
> > --disable-systemtap \
> > -- 
> > 2.15.0
> > 
> > 
> > ___
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> -- 
> Pengutronix e.K.   | |
> Industrial Linux Solutions | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
> Amtsgericht Hildesheim, HRA 2686   | Fax:   

[ptxdist] syslinux dep on uuid/uuid.h

[Erwin Rol]

Hey all,

I tried to update syslinux to 4.X and ran into a dependency problem. No
problem I thought and added select LIBUUID.  

The thing is, that doesn't work. syslinux.in is under platform/ and it
seems it is not possible to use target dependencies from there. 

My hack (since I have scripts around ptxdist anyway) is to do;
./ptxdist install util-linux-ng   (libuuid is part of that)
./ptxdist images

That works, but clearly isn't the right solution.

So what is the right solution, move syslinux.in to rules/ ?
Something else ?

- Erwin


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] nginx: version bump 1.10.3 -> 1.12.1

[Roland Hieber]

On 21.11.2017 14:49, Clemens Gruber wrote:

Hi,

On Tue, Nov 21, 2017 at 01:46:52AM +0100, Roland Hieber wrote:

[...]


diff --git a/rules/nginx.make b/rules/nginx.make
index ef98c0adb..0f8ce65f2 100644
--- a/rules/nginx.make
+++ b/rules/nginx.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NGINX) += nginx
  #
  # Paths and names
  #
-NGINX_VERSION  := 1.10.3
-NGINX_MD5  := 204a20cb4f0b0c9db746c630d89ff4ea
+NGINX_VERSION  := 1.12.1
+NGINX_MD5  := a307e74aca95403e5ee00f153807ce58
  NGINX := nginx-$(NGINX_VERSION)
  NGINX_SUFFIX  := tar.gz
  NGINX_URL := https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX)
@@ -44,7 +44,8 @@ NGINX_CONF_ENV := \
ngx_force_have_map_anon=yes \
ngx_force_have_map_devzero=yes \
ngx_force_have_sysvshm=yes \
-   ngx_force_have_posix_sem=yes
+   ngx_force_have_posix_sem=yes \


I cannot get IPv6 to work, because nginx complains about "the INET6
sockets are not supported on this platform" when I try to have it listen
on [::]:443. This happens because NGX_HAVE_INET6 apparently gets defined
to "yes" in objs/ngx_auto_config.h, and it works well if I change this line:


+   ngx_force_ipv6=$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6, yes, no)


to
ngx_force_ipv6=$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6, 1, 0)

Can you reproduce this?


Yes, my mistake. I assumed, they use #ifdef NGX_HAVE_INET6 and not
#if (NGX_HAVE_INET6)..
So NGX_HAVE_INET6 is defined to yes in ngx_autoconfig.h, which evaluates
to 0.

It's a little bit misleading because for ngx_feature_run != value, "yes"
is a possible value, so all other ngx_force_foo can be set to yes and
no.

Now we could just use 1 and 0 for ngx_force_ipv6. But maybe it would be
preferable to translate yes and no into 1 and 0 respectively in case of
ngx_feature_run = value (in auto/feature) to be consistent with other
passed ngx_force_ environment variables?


OK, whatever you say, both seems fine to me.

 - Roland

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] glib: version bump 2.52.1 -> 2.54.2

[Michael Olbrich]

On Wed, Nov 22, 2017 at 12:18:07AM +0100, Ladislav Michl wrote:
> Update to latest stable version.
> 
> Also it turned out that package install stage is using GTKDOC tools
> found on build host, so add empty ac_cv_path_* to avoid that.
> 
> Signed-off-by: Ladislav Michl 
> ---
>  Note: See also previous mail. Perhaps it would be worth to create
>  some global for disabling gtk-doc and ac_cv_path_* overriding...
>  I'll leave this for later; consider this patch a bugfix ;)

Can you check if other packages are affected too? I think gnutls or
gstreamer1 might be from what I can tell from reading the Makefiles.

If they are affected, then I'll work on a more general solution.

Michael

>  rules/glib.make  | 18 ++
>  rules/host-glib.make | 10 --
>  2 files changed, 22 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/glib.make b/rules/glib.make
> index 8592618fc..5d2c11fe6 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
>  #
>  # Paths and names
>  #
> -GLIB_VERSION := 2.52.1
> -GLIB_MD5 := 36b4c7bf4f2b398ac8ad90578d05c950
> +GLIB_VERSION := 2.54.2
> +GLIB_MD5 := 50f83e08f080f99b1e2f0ad2b760fb81
>  GLIB := glib-$(GLIB_VERSION)
>  GLIB_SUFFIX  := tar.xz
>  GLIB_SOURCE  := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
> @@ -32,14 +32,21 @@ GLIB_LICENSE  := LGPL-2.0+
>  # Prepare
>  # 
> 
>  
> +# If one of GTKDOC tools is found at configure stage, it might be used,
> +# no matter whether we use --disable-gtk-doc as this option controls
> +# generating documentation, while in tarballs it is already generated
> +# and providing empty paths to GTKDOC tools avoids doc installation.
>  GLIB_CONF_ENV:= \
>   $(CROSS_ENV) \
>   glib_cv_uscore=no \
>   glib_cv_stack_grows=no \
>   glib_cv_have_qsort_r=yes \
>   ac_cv_func_statfs=yes \
> - ac_cv_path_MSGFMT=: \
> - ac_cv_path_XGETTEXT=no
> + ac_cv_path_MSGFMT="" \
> + ac_cv_path_XGETTEXT="" \
> + ac_cv_prog_GTKDOC_CHECK="" \
> + ac_cv_path_GTKDOC_REBASE="" \
> + ac_cv_path_GTKDOC_MKPDF=""
>  
>  #
>  # autoconf
> @@ -51,6 +58,7 @@ GLIB_CONF_ENV   := \
>  GLIB_CONF_TOOL   := autoconf
>  GLIB_CONF_OPT:= \
>   $(CROSS_AUTOCONF_USR) \
> + --disable-maintainer-mode \
>   --enable-debug=minimum \
>   --disable-gc-friendly \
>   --enable-mem-pools \
> @@ -67,6 +75,8 @@ GLIB_CONF_OPT   := \
>   --disable-libelf \
>   --disable-libmount \
>   --disable-gtk-doc \
> + --disable-gtk-doc-html \
> + --disable-gtk-doc-pdf \
>   --disable-man \
>   --disable-dtrace \
>   --disable-systemtap \
> diff --git a/rules/host-glib.make b/rules/host-glib.make
> index 8e0e42c6b..534fd3453 100644
> --- a/rules/host-glib.make
> +++ b/rules/host-glib.make
> @@ -24,8 +24,11 @@ HOST_GLIB_DIR  = $(HOST_BUILDDIR)/$(GLIB)
>  
>  HOST_GLIB_CONF_ENV   := \
>   $(HOST_ENV) \
> - ac_cv_path_MSGFMT=: \
> - ac_cv_path_XGETTEXT=no
> + ac_cv_path_MSGFMT="" \
> + ac_cv_path_XGETTEXT="" \
> + ac_cv_prog_GTKDOC_CHECK="" \
> + ac_cv_path_GTKDOC_REBASE="" \
> + ac_cv_path_GTKDOC_MKPDF=""
>  
>  #
>  # autoconf
> @@ -33,6 +36,7 @@ HOST_GLIB_CONF_ENV  := \
>  HOST_GLIB_CONF_TOOL  := autoconf
>  HOST_GLIB_CONF_OPT   := \
>   $(HOST_AUTOCONF) \
> + --disable-maintainer-mode \
>   --disable-debug \
>   --disable-gc-friendly \
>   --enable-mem-pools \
> @@ -48,6 +52,8 @@ HOST_GLIB_CONF_OPT  := \
>   --disable-libelf \
>   --disable-libmount \
>   --disable-gtk-doc \
> + --disable-gtk-doc-html \
> + --disable-gtk-doc-pdf \
>   --disable-man \
>   --disable-dtrace \
>   --disable-systemtap \
> -- 
> 2.15.0
> 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de