Re: [ptxdist] [PATCH] host-autotools-autoconf: fix m4 path

[Jon Ringle]

On Fri, 22 Feb 2019, Michael Olbrich wrote:


Make sure the path for m4 is just /bin/m4 and then fix it correctly in
host-autotools-autoconf.install.post. Otherwise the absolute path to
sysroot-host is part of the dev package.

Signed-off-by: Michael Olbrich 
---

Hi,

Can you check, if you get a correct dev package for host-autotools-autoconf
with this?


The dev package still has the absolute path to sysroot-host m4 in it from 
the build that created the dev package, but this is getting fixed up 
correctly now when the dev package is being used.


Tested-by: Jon Ringle 


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] kernel: rework prepare stage

[Jon Ringle]

On Fri, 22 Feb 2019, Michael Olbrich wrote:


The old implementation is broken, when a initramfs is used.
Changing the kconfig symbol back to '# Automatically set by PTXDist' is
broken because '$(<)' is not the kernel config any more (Broken since
cd920ab716bab0c190666e0273c10b19c7cdaeec "barebox/kernel: drop explicit
dependency").
Also, world/kconfig-sync compares .config and KERNEL_CONFIG and this does
not work because CONFIG_INITRAMFS_SOURCE in .config has been modified.

Instead, make sure that KERNEL_CONFIG contains the path independent dummy
text before copying it to .config.
Then run the default prepare stage that checks or updates the config.
Insert the path for the empty initramfs after all checks are done.

Signed-off-by: Michael Olbrich 
---

Hi Jon,

The initramfs handling is completely broken :-/. Can you try this patch?
That should fix your problem. I've queued this for master, but I'm still
waiting for some test results before pushing this.



Tested with 'ssh localhost "cd $(pwd); ptxdist images"'
Looks good.

Tested-by: Jon Ringle 

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] libconfig: version bump 1.4.9 -> 1.7.2

[Ian Abbott]

The old version is no longer downloadable so use the latest version.

Signed-off-by: Ian Abbott 
---
 rules/libconfig.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/libconfig.make b/rules/libconfig.make
index 241c0d8d0..57277d749 100644
--- a/rules/libconfig.make
+++ b/rules/libconfig.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_LIBCONFIG) += libconfig
 #
 # Paths and names
 #
-LIBCONFIG_VERSION  := 1.4.9
-LIBCONFIG_MD5  := b6ee0ce2b3ef844bad7cac2803a90634
+LIBCONFIG_VERSION  := 1.7.2
+LIBCONFIG_MD5  := 6bd98ee3a6e6b9126c82c916d7a9e690
 LIBCONFIG  := libconfig-$(LIBCONFIG_VERSION)
 LIBCONFIG_SUFFIX   := tar.gz
-LIBCONFIG_URL  := 
http://www.hyperrealm.com/libconfig/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
+LIBCONFIG_URL  := 
http://hyperrealm.github.io/libconfig/dist/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
 LIBCONFIG_SOURCE   := $(SRCDIR)/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
 LIBCONFIG_DIR  := $(BUILDDIR)/$(LIBCONFIG)
 LIBCONFIG_LICENSE  := LGPL-2.1-only
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] libconfig: Move back from staging

[Ian Abbott]

Signed-off-by: Ian Abbott 
---
 rules/libconfig.in | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/rules/libconfig.in b/rules/libconfig.in
index 61b6a49e5..5a6ec7e93 100644
--- a/rules/libconfig.in
+++ b/rules/libconfig.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=system_libraries
+## SECTION=system_libraries
 
 menuconfig LIBCONFIG
tristate
@@ -8,10 +6,6 @@ menuconfig LIBCONFIG
help
  C/C++ Configuration File Library
 
- STAGING: remove in ptxdist-2019.05.0
- Old version that is no longer available for download.
- Should be updated to a new version.
-
 if LIBCONFIG
 
 config LIBCONFIG_CXX
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] host-autotools-autoconf: fix m4 path

[Michael Olbrich]

The path for m4 already is the full path in sysroot-host.
Replace it with the current sysroot-host in case we just extracted a dev
package.

Signed-off-by: Michael Olbrich 
---

Next try, please test this.

Michael

 rules/host-autotools-autoconf.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/host-autotools-autoconf.make 
b/rules/host-autotools-autoconf.make
index 9f9c4de94c4e..ab2bb28958e8 100644
--- a/rules/host-autotools-autoconf.make
+++ b/rules/host-autotools-autoconf.make
@@ -48,7 +48,8 @@ $(STATEDIR)/host-autotools-autoconf.install.post:
@$(call targetinfo)
@sed -i \
-e "s;'\(/share/autoconf\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
-   -e 
"s;'\(/bin/\(m4\)\?\(auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
+   -e "s;'\(/bin/auto[^']*\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
+   -e 
"s;'/[^']*/sysroot-host\(/bin/m4\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/* \
$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/share/autoconf/autom4te.cfg
@$(call world/install.post, HOST_AUTOTOOLS_AUTOCONF)
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] doc: improve the suboption name scheme description

[Juergen Borleis]

Signed-off-by: Juergen Borleis 
---
 doc/dev_manual.rst | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index 523ecde28..e17aa9b1b 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -881,9 +881,10 @@ add on demand to the ``configure`` parameters:
 
 endif
 
-.. note:: To extend the base name by a suboption name as a trailing
-  component gives PTXdist the ability to detect a change in the package’s
-  settings to force its rebuild.
+.. important:: Always follow the rule to extend the base name by a suboption
+  name as the trailing part of the variable name. This gives PTXdist the 
ability
+  to detect a change in the package’s settings (via menuconfig) to force its
+  rebuild on demand.
 
 To make usage of the new menu entries, we must check them in the rule
 file and add the correct parameters:
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] doc: follow the rule to use breaking lines

[Juergen Borleis]

Synchronize the examples.

Signed-off-by: Juergen Borleis 
---
 doc/dev_manual.rst | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index 10091c76c..523ecde28 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -812,9 +812,10 @@ in this line and supplement this expression as follows:
 
 .. code-block:: make
 
-FOO_CONF_OPT := $(CROSS_AUTOCONF_USR) \
-   --enable-debug \
-   --with-bar
+FOO_CONF_OPT := \
+$(CROSS_AUTOCONF_USR) \
+--enable-debug \
+--with-bar
 
 .. note:: We recommend to use this format with each parameter on a line of
  its own. This format is easier to read and a diff shows more exactly any
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/3] doc: mention dedicated PTXdist macros to be used in rule files

[Juergen Borleis]

In order to simplify rule files, it's worth to use more of the provided
rule file option macros PTXdist already provides. Show only this optimized
example and remove the previous version from the old days.

Signed-off-by: Juergen Borleis 
---
 doc/dev_manual.rst | 40 +---
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index f0c2e00ee..10091c76c 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -892,24 +892,18 @@ file and add the correct parameters:
 #
 # autoconf
 #
-FOO_CONF_OPT := $(CROSS_AUTOCONF_USR)
-
-ifdef PTXCONF_FOO_DEBUG
-FOO_CONF_OPT += --enable-debug
-else
-FOO_CONF_OPT += --disable-debug
-endif
-
-ifdef PTXCONF_FOO_BAR
-FOO_CONF_OPT += --with-bar
-else
-FOO_CONF_OPT += --without-bar
-endif
+FOO_CONF_OPT := \
+$(CROSS_AUTOCONF_USR) \
+--$(call ptx/endis, PTXCONF_FOO_DEBUG)-debug \
+--$(call ptx/wwo, PTXCONF_FOO_BAR)-bar
 
-.. important:: Please note the trailing ``PTXCONF_`` for each define. While 
Kconfig is
+.. important:: Please note the leading ``PTXCONF_`` for each define. While 
Kconfig is
   using ``FOO_BAR``, the rule file must use ``PTXCONF_FOO_BAR`` instead.
 
-It is a good practice to add both settings, e.g. ``--disable-debug``
+.. note:: Refer :ref:`Rule File Macro Reference ` for further
+   details about these special kind of option macros (e.g. ``ptx/...``).
+
+It is a good practice to always add both settings, e.g. ``--disable-debug``
 even if this is the default case. Sometimes ``configure`` tries to guess
 something and the binary result might differ depending on the build
 order. For example some kind of package would also build some X related
@@ -950,22 +944,6 @@ In this example, many configure options from libsigrok 
(marked with ``+``)
 are not yet present in ``LIBSIGROK_CONF_OPT`` and must be added, possibly also
 by providing more dynamic options in the package definition.
 
-Since every optional parameter adds four lines of code to the rule
-files, PTXdist provides some shortcuts to handle it. Refer to section
-:ref:`param_macros` for further details.
-
-With these special macros in use, the file content shown above looks
-much simpler:
-
-.. code-block:: make
-
-#
-# autoconf
-#
-FOO_CONF_OPT := $(CROSS_AUTOCONF_USR) \
-   $(call ptx/endis, PTXCONF_FOO_DEBUG)-debug \
-   $(call ptx/wwo, PTXCONF_FOO_BAR)-bar
-
 If some parts of a package are built on demand only, they must also be
 installed on demand only. Besides the *prepare* stage, we also must
 modify our *targetinstall* stage:
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] doc: mention dedicated PTXdist macros to be used in rule files

[Juergen Borleis]

On Friday 22 February 2019 12:57:05 Myself wrote:
> In order to simplify rule files, it's worth to use more of the provided
> rule file option macros PTXdist already provides.
>
> Signed-off-by: Juergen Borleis 
> ---
>  doc/dev_manual.rst | 22 --
>  1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
> index f0c2e00ee..effafa6e0 100644
> --- a/doc/dev_manual.rst
> +++ b/doc/dev_manual.rst
> @@ -892,23 +892,17 @@ file and add the correct parameters:
>  #
>  # autoconf
>  #
> -FOO_CONF_OPT := $(CROSS_AUTOCONF_USR)
> -
> -ifdef PTXCONF_FOO_DEBUG
> -FOO_CONF_OPT += --enable-debug
> -else
> -FOO_CONF_OPT += --disable-debug
> -endif
> -
> -ifdef PTXCONF_FOO_BAR
> -FOO_CONF_OPT += --with-bar
> -else
> -FOO_CONF_OPT += --without-bar
> -endif
> +FOO_CONF_OPT := \
> +$(CROSS_AUTOCONF_USR) \
> +--$(call ptx/endis, PTXCONF_FOO_DEBUG)-debug \
> +--$(call ptx/wwo, PTXCONF_FOO_BAR)-bar
>
> -.. important:: Please note the trailing ``PTXCONF_`` for each define.
> While Kconfig is +.. important:: Please note the leading ``PTXCONF_`` for
> each define. While Kconfig is using ``FOO_BAR``, the rule file must use
> ``PTXCONF_FOO_BAR`` instead.
>
> +.. note:: Refer :ref:`Rule File Macro Reference ` for
> further +   details about these special kind of option macros (e.g.
> ``ptx/...``). +
>  It is a good practice to add both settings, e.g. ``--disable-debug``
>  even if this is the default case. Sometimes ``configure`` tries to guess
>  something and the binary result might differ depending on the build

Please do not apply. The same text can be found a few lines below.

jb

-- 
Pengutronix e.K.                             | Juergen Borleis             |
Industrial Linux Solutions                   | http://www.pengutronix.de/  |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] host-autotools-autoconf: fix m4 path

[Michael Olbrich]

On Fri, Feb 22, 2019 at 09:14:03AM +0100, Michael Olbrich wrote:
> Make sure the path for m4 is just /bin/m4 and then fix it correctly in
> host-autotools-autoconf.install.post. Otherwise the absolute path to
> sysroot-host is part of the dev package.
> 
> Signed-off-by: Michael Olbrich 
> ---
> 
> Hi,
> 
> Can you check, if you get a correct dev package for host-autotools-autoconf
> with this?
> 
> Michael
> 
>  rules/host-autotools-autoconf.make | 7 ++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/host-autotools-autoconf.make 
> b/rules/host-autotools-autoconf.make
> index 9f9c4de94c4e..9c2f516ddc45 100644
> --- a/rules/host-autotools-autoconf.make
> +++ b/rules/host-autotools-autoconf.make
> @@ -35,6 +35,11 @@ $(STATEDIR)/autogen-tools: 
> $(STATEDIR)/host-autotools-autoconf.install.post
>  # Prepare
>  # 
> 
>  
> +# Note: the path for m4 will be fixed in .install.post
> +HOST_AUTOTOOLS_AUTOCONF_CONF_ENV := \
> + $(HOST_ENV) \
> + ac_cv_path_M4=/bin/m4

This does not work. There is an extra check so the path must be usable.
I need to come up with a different solution.

Michael

> +
>  #
>  # autoconf
>  #
> @@ -48,7 +53,7 @@ $(STATEDIR)/host-autotools-autoconf.install.post:
>   @$(call targetinfo)
>   @sed -i \
>   -e "s;'\(/share/autoconf\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
> - -e 
> "s;'\(/bin/\(m4\)\?\(auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
> + -e 
> "s;'\(/bin/\(m4\|auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
>   $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/* \
>   $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/share/autoconf/autom4te.cfg
>   @$(call world/install.post, HOST_AUTOTOOLS_AUTOCONF)
> -- 
> 2.20.1
> 
> 
> ___
> 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

[ptxdist] [PATCH v2] doc: mention dedicated PTXdist macros to be used in rule files

[Juergen Borleis]

In order to simplify rule files, it's worth to use more of the provided
rule file option macros PTXdist already provides.

Signed-off-by: Juergen Borleis 
---
 doc/dev_manual.rst | 22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index f0c2e00ee..effafa6e0 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -892,23 +892,17 @@ file and add the correct parameters:
 #
 # autoconf
 #
-FOO_CONF_OPT := $(CROSS_AUTOCONF_USR)
-
-ifdef PTXCONF_FOO_DEBUG
-FOO_CONF_OPT += --enable-debug
-else
-FOO_CONF_OPT += --disable-debug
-endif
-
-ifdef PTXCONF_FOO_BAR
-FOO_CONF_OPT += --with-bar
-else
-FOO_CONF_OPT += --without-bar
-endif
+FOO_CONF_OPT := \
+$(CROSS_AUTOCONF_USR) \
+--$(call ptx/endis, PTXCONF_FOO_DEBUG)-debug \
+--$(call ptx/wwo, PTXCONF_FOO_BAR)-bar
 
-.. important:: Please note the trailing ``PTXCONF_`` for each define. While 
Kconfig is
+.. important:: Please note the leading ``PTXCONF_`` for each define. While 
Kconfig is
   using ``FOO_BAR``, the rule file must use ``PTXCONF_FOO_BAR`` instead.
 
+.. note:: Refer :ref:`Rule File Macro Reference ` for further
+   details about these special kind of option macros (e.g. ``ptx/...``).
+
 It is a good practice to add both settings, e.g. ``--disable-debug``
 even if this is the default case. Sometimes ``configure`` tries to guess
 something and the binary result might differ depending on the build
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] PHP7.3 support? Since 5.6.x is End Of Life

[Thorsten LIEPERT]

Thorsten Liepert 
Development Software

Phone +49 911 97479 839 | thorsten.liep...@diehl.com

Diehl Connectivity Solutions GmbH
Stephanstraße 49
90478 Nürnberg
https://www.diehl-cs.com

> Am 22.02.2019 um 12:39 schrieb webmas...@zutroll.de:
> 
> Am 2019-02-22 10:24, schrieb Thorsten LIEPERT:
>> Hello,
>> A while back I already did a transition to PHP7.2 but harnet time to
>> populate it here yet.
>> I just tried to upgrade to 7.3.2 and it work without any problems.
>> I’ll attach my patches. I also did clean up the lighted rule and
>> removed php5 with this stack.
>> Thorsten Liepert
>> Development Software
>> Phone +49 911 97479 839 | thorsten.liep...@diehl.com
>> Diehl Connectivity Solutions GmbH
>> Stephanstraße 49
>> 90478 Nürnberg
>> https://www.diehl-cs.com
> Hello,
> 
> thanks for your patches, has mysql be gone in the php7? its missing in your 
> files.
> 
> Also it is not linking against the shared library from ptxdist it is still 
> php bundled sqlite 3.24.0.
> 
> But anyway very good starting point, now with correct config in files.
As we are currently not using MySQL or sqlite I haven’t tested this part 
actually. But if I remember correctly I read something about that PHP
Has removed some Parts of the MySQL-API.

http://php.net/manual/en/mysql.php

Include PDO_MYSQL or mysqli support you might have to add those switches to the 
makefiles.

> 
> 
> Should:
> --with-config-file-path=/etc/php7 \
> 
> 
> be
> 
> --with-config-file-path=/etc/php \
> 
> regarding the make install?
> 
You are right this should be

--with-config-file-path=/etc/php \



> Regards
> 
>>> Am 22.02.2019 um 09:59 schrieb webmas...@zutroll.de:
>>> Hello,
>>> PHP 7.3.2 seems to work well with sqlite, since it uses its own bundeled 
>>> sqlite3.
>>> I use with --with-sqlite3, so not specifing any special src.
>>> I have attached my modified php make file.
>>> I kept the naming php5.make due limited time, but the target file is now 
>>> named php instead of php5.
>>> Hope this helps to getting this working again with ptxdist builded 
>>> sqlite3.so
>>> Regards
>>> Am 2019-02-22 09:28, schrieb Michael Olbrich:
 Hi,
 On Mon, Feb 11, 2019 at 03:31:38PM +0100, Simon Agostini wrote:
>is PHP 7.3 suppot planned?
 I'd be happy to accept patches for this, but I currently don't have plans
 to do this myself.
>I tried to adapt the PHP5 make file but I get:
>/build-target/php-7.3.2/ext/pdo_sqlite/libsqlite/sqlite3.c', needed by
>'ext/pdo_sqlite/libsqlite/sqlite3.lo'.  Stop.
>with --with-sqlite3=$(PTXDIST_SYSROOT_TARGET)/usr
>if I remove the dir path it works, but I think this shall not be the
>optimal build!?
 The php5 package is not maintained very well. It has no priority for me and
 other than the occasional minor version bump, nobody else seems to care
 either.
 I'm guessing, that the php build system is broken and there is some mixup
 about internal vs. system sqlite. Do you get sqlite support at all if you
 remove --with-sqlite3=...?
 Michael
>>> ___
>>> ptxdist mailing list
>>> ptxdist@pengutronix.de
>> ___
>> ptxdist mailing list
>> ptxdist@pengutronix.de
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de


smime.p7s
Description: S/MIME cryptographic signature
___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] doc: mention dedicated PTXdist macros to be used in rule files

[Juergen Borleis]

Hi Michael,

On Friday 22 February 2019 12:42:47 Michael Olbrich wrote:
> > In order to simplify rule files, it's worth to use more of the provided
> > rule file macros PTXdist already provides.
> >
> > Signed-off-by: Juergen Borleis 
> > ---
> >  doc/dev_manual.rst | 17 +
> >  1 file changed, 17 insertions(+)
> >
> > diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
> > index f0c2e00ee..984e91cd4 100644
> > --- a/doc/dev_manual.rst
> > +++ b/doc/dev_manual.rst
> > @@ -909,6 +909,23 @@ file and add the correct parameters:
> >  .. important:: Please note the trailing ``PTXCONF_`` for each define.
> > While Kconfig is
>
> Not about your change, but I think 'trailing' is the wrong word here.
> Maybe something with 'prefix'? Other ideas?

Arrgh, "leading" I meant... m(

Will send a V2.

jb

-- 
Pengutronix e.K.                             | Juergen Borleis             |
Industrial Linux Solutions                   | http://www.pengutronix.de/  |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] doc: mention dedicated PTXdist macros to be used in rule files

[Michael Olbrich]

On Fri, Feb 22, 2019 at 11:30:06AM +0100, Juergen Borleis wrote:
> In order to simplify rule files, it's worth to use more of the provided
> rule file macros PTXdist already provides.
> 
> Signed-off-by: Juergen Borleis 
> ---
>  doc/dev_manual.rst | 17 +
>  1 file changed, 17 insertions(+)
> 
> diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
> index f0c2e00ee..984e91cd4 100644
> --- a/doc/dev_manual.rst
> +++ b/doc/dev_manual.rst
> @@ -909,6 +909,23 @@ file and add the correct parameters:
>  .. important:: Please note the trailing ``PTXCONF_`` for each define. While 
> Kconfig is

Not about your change, but I think 'trailing' is the wrong word here. Maybe
something with 'prefix'? Other ideas?

>using ``FOO_BAR``, the rule file must use ``PTXCONF_FOO_BAR`` instead.
>  
> +This kind of rule file style is sometimes error prone and hard to read. There

I think we should rewrite the code block above instead.

> +is a simpler way available to handle these build-time options. PTXdist
> +provides some macros to unify and simplify creating these options on demand.
> +Using these macros makes the rule file looks like instead:
> +
> +.. code-block:: make
> +
> +#
> +# autoconf
> +#
> +FOO_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \

Breaking lines like this is recommend.

Michael

> +--$(call ptx/endis, PTXCONF_FOO_DEBUG)-debug \
> +--$(call ptx/wwo, PTXCONF_FOO_BAR)-bar
> +
> +Refer :ref:`Rule File Macro Reference ` for further details 
> about
> +these kind of macros.
> +
>  It is a good practice to add both settings, e.g. ``--disable-debug``
>  even if this is the default case. Sometimes ``configure`` tries to guess
>  something and the binary result might differ depending on the build
> -- 
> 2.11.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

Re: [ptxdist] PHP7.3 support? Since 5.6.x is End Of Life

[webmaster]

Am 2019-02-22 10:24, schrieb Thorsten LIEPERT:

Hello,

A while back I already did a transition to PHP7.2 but harnet time to
populate it here yet.

I just tried to upgrade to 7.3.2 and it work without any problems.
I’ll attach my patches. I also did clean up the lighted rule and
removed php5 with this stack.






Thorsten Liepert
Development Software

Phone +49 911 97479 839 | thorsten.liep...@diehl.com

Diehl Connectivity Solutions GmbH
Stephanstraße 49
90478 Nürnberg
https://www.diehl-cs.com

Hello,

thanks for your patches, has mysql be gone in the php7? its missing in 
your files.


Also it is not linking against the shared library from ptxdist it is 
still php bundled sqlite 3.24.0.


But anyway very good starting point, now with correct config in files.


Should:
--with-config-file-path=/etc/php7 \


be

--with-config-file-path=/etc/php \

regarding the make install?

Regards




Am 22.02.2019 um 09:59 schrieb webmas...@zutroll.de:

Hello,

PHP 7.3.2 seems to work well with sqlite, since it uses its own 
bundeled sqlite3.

I use with --with-sqlite3, so not specifing any special src.

I have attached my modified php make file.
I kept the naming php5.make due limited time, but the target file is 
now named php instead of php5.


Hope this helps to getting this working again with ptxdist builded 
sqlite3.so


Regards



Am 2019-02-22 09:28, schrieb Michael Olbrich:

Hi,
On Mon, Feb 11, 2019 at 03:31:38PM +0100, Simon Agostini wrote:

is PHP 7.3 suppot planned?
I'd be happy to accept patches for this, but I currently don't have 
plans

to do this myself.

I tried to adapt the PHP5 make file but I get:
/build-target/php-7.3.2/ext/pdo_sqlite/libsqlite/sqlite3.c', 
needed by

'ext/pdo_sqlite/libsqlite/sqlite3.lo'.  Stop.
with --with-sqlite3=$(PTXDIST_SYSROOT_TARGET)/usr
if I remove the dir path it works, but I think this shall not be 
the

optimal build!?
The php5 package is not maintained very well. It has no priority for 
me and
other than the occasional minor version bump, nobody else seems to 
care

either.
I'm guessing, that the php build system is broken and there is some 
mixup
about internal vs. system sqlite. Do you get sqlite support at all if 
you

remove --with-sqlite3=...?
Michael

___
ptxdist mailing list
ptxdist@pengutronix.de



___
ptxdist mailing list
ptxdist@pengutronix.de


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] doc: fix missing step to setup a Python virtualenv

[Michael Olbrich]

On Fri, Feb 22, 2019 at 11:03:03AM +0100, Juergen Borleis wrote:
> In order to build the PTXdist documentation a virtualenv is a useful
> helper. This change mentions its correct setup.
> 
> Signed-off-by: Juergen Borleis 
> ---
>  doc/including_bsp_doc.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/doc/including_bsp_doc.inc b/doc/including_bsp_doc.inc
> index cfccc45b4..d4abcd8ea 100644
> --- a/doc/including_bsp_doc.inc
> +++ b/doc/including_bsp_doc.inc
> @@ -32,6 +32,7 @@ when not globally present in the host system.
>  .. code-block:: text
>  
> $ pip3 install --upgrade --user pip virtualenv
> +   $ virtualenv -p python3 env

We've had a patch like this before. I think the correct way to create this
is:

$ python3 -m venv env

And the 'pip3 install ...' above is no longer needed. Unfortunately I
didn't get any feedback from the Python experts about this...

Michael

> $ source env/bin/activate
> $ pip3 install sphinx
> $ pip3 install sphinx_rtd_theme
> -- 
> 2.11.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

[ptxdist] [PATCH] doc: mention dedicated PTXdist macros to be used in rule files

[Juergen Borleis]

In order to simplify rule files, it's worth to use more of the provided
rule file macros PTXdist already provides.

Signed-off-by: Juergen Borleis 
---
 doc/dev_manual.rst | 17 +
 1 file changed, 17 insertions(+)

diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index f0c2e00ee..984e91cd4 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -909,6 +909,23 @@ file and add the correct parameters:
 .. important:: Please note the trailing ``PTXCONF_`` for each define. While 
Kconfig is
   using ``FOO_BAR``, the rule file must use ``PTXCONF_FOO_BAR`` instead.
 
+This kind of rule file style is sometimes error prone and hard to read. There
+is a simpler way available to handle these build-time options. PTXdist
+provides some macros to unify and simplify creating these options on demand.
+Using these macros makes the rule file looks like instead:
+
+.. code-block:: make
+
+#
+# autoconf
+#
+FOO_CONF_OPT := $(CROSS_AUTOCONF_USR) \
+--$(call ptx/endis, PTXCONF_FOO_DEBUG)-debug \
+--$(call ptx/wwo, PTXCONF_FOO_BAR)-bar
+
+Refer :ref:`Rule File Macro Reference ` for further details about
+these kind of macros.
+
 It is a good practice to add both settings, e.g. ``--disable-debug``
 even if this is the default case. Sometimes ``configure`` tries to guess
 something and the binary result might differ depending on the build
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/4] doc: BUILDTIME versus RUNTIME

[Juergen Borleis]

Describe the difference of some detailed dependency descriptions in
Kconfig menufiles.

Signed-off-by: Juergen Borleis 
---
 doc/daily_work.inc | 58 ++
 doc/dev_manual.rst |  5 +
 2 files changed, 63 insertions(+)

diff --git a/doc/daily_work.inc b/doc/daily_work.inc
index 5708903db..e4260e448 100644
--- a/doc/daily_work.inc
+++ b/doc/daily_work.inc
@@ -1297,3 +1297,61 @@ non-interactive user, e.g. a different application.
should use the **LGPL license for both parts** from the beginning. Else
you may cannot move source code in such a way, because it would require a
license change for this specific piece of source code (to be pedantic!).
+
+.. _external_dependencies_variants:
+
+Controling Package Dependencies in more Detail
+--
+
+In section :ref:`external_dependencies` a simple method is shown how to define
+an external package dependency a particular package can have in order to build
+it.
+
+Implicit Dependencies
+~
+
+For the simple dependency definition PTXdist adds internally a dependency
+to the *install* stage of the defined external dependency (or to a different
+package to use PTXdist glossary).
+
+We must keep this in mind, because there are packages out there, which don't
+install anything in their *install* stage. They install something in their
+*targetinstall* stage instead. In this case even if the dependency is defined
+like shown in :ref:`external_dependencies`, building the particular package may
+fail depending on the build order.
+
+To avoid this, an explicit ``make`` style dependency must be added to the rule
+file. If the *compile* stage of package ``foo`` has a dependency to package
+``bar``'s *targetinstall* stage just add the following lines to your rule file:
+
+.. code-block:: make
+
+   $(STATEDIR)/foo.compile: $(STATEDIR)/bar.targetinstall
+
+Build-Time only Dependency
+~~
+
+Sometimes packages have a compile-time dependency to a different package, but
+can live without its content at run-time. An example can be a static library
+which is linked at compile-time and not required as a separate package at
+run-time. Another example is making use of this detailed dependency can make
+developer's life easier when using individual package lists for dedicated
+image files. Think about a development image and a production image which 
should
+be built at the same time but should contain a different packages list each
+(refer :ref:`multi_image_individual_root_filesystems` for details).
+
+Marking a menu file based dependency with ``if BUILDTIME`` limits the 
dependency
+to compile-time only. In this case its possible to have the package in one
+image's list, but not its dependency.
+
+Run-Time only Dependency
+
+
+The other way round is ``if RUNTIME``. This forces the dependency package is
+part of the final image as well, but PTXdist can improve its build-time job by
+reordering package's build.
+A use case for this run-time dependency can be a package which just installs a
+shell script. This shell script makes use of some shell commands which must be
+present at run-time and thus depends on a package which provides these shell
+commands. But these shell commands are not required to build the shell script
+itself. In this case PTXdist can build both packages independently.
diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index a14e64b0f..f0c2e00ee 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -992,6 +992,8 @@ as expected:
 Whenever we change a *FOO* related menu entry, PTXdist should detect it
 and re-build the package when a new build is started.
 
+.. _external_dependencies:
+
 Managing External Compile Time Dependencies
 ^^^
 
@@ -1035,6 +1037,9 @@ file looks like:
 
 PTXdist now builds the *zlib* first and our new package thereafter.
 
+Refer :ref:`external_dependencies_variants` for more specific dependency
+description.
+
 Managing External Compile Time Dependencies on Demand
 ^
 
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/4] doc: follow 'proselint' and improve the text

[Juergen Borleis]

Follow the hints of the nice tool 'proselint'...

Signed-off-by: Juergen Borleis 
---
 doc/daily_work.inc  | 2 +-
 doc/ref_manual.rst  | 4 ++--
 doc/user_manual.inc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/daily_work.inc b/doc/daily_work.inc
index e4260e448..3fc894106 100644
--- a/doc/daily_work.inc
+++ b/doc/daily_work.inc
@@ -356,7 +356,7 @@ Using available CPU Cores
 ~
 
 PTXdist uses all available CPU cores when building a project by default.
-But there are some exceptions:
+There are some exceptions:
 
 -  the prepare stage of all autotools build system based packages can
use only one CPU core. This is due to the fact, the running
diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst
index 96274ac97..69f7fdee8 100644
--- a/doc/ref_manual.rst
+++ b/doc/ref_manual.rst
@@ -556,7 +556,7 @@ Usage:
 
 This macro is very similar to ``world/compile``. The only differences is
 that is uses the specified ``build arguments`` instead of
-``_MAKE_OPT``.  This is usefull if ``make`` needs to be called more
+``_MAKE_OPT``. This is usefull if ``make`` needs to be called more
 than once in the compile stage.
 
 world/execute, execute
@@ -622,7 +622,7 @@ The  parameter can be:
   parameter in this case to locate the file to copy from. 
   The  is uses a path relative to the :ref:`package install
   directory`. This only works if the package uses the default
-  or a similar *install* stage.  For our *foo* example used source file is
+  or a similar *install* stage. For our *foo* example used source file is
   ``/packages/foo-1.1.0/``.
 
 The  parameter can be:
diff --git a/doc/user_manual.inc b/doc/user_manual.inc
index 9f78f5b46..0a4e4b34c 100644
--- a/doc/user_manual.inc
+++ b/doc/user_manual.inc
@@ -314,7 +314,7 @@ Next we will build the BSP to show some of PTXdist’s main 
features.
 Selecting a Userland Configuration
 ~~
 
-First of all we have to select a userland configuration. This step
+First we have to select a userland configuration. This step
 defines what kind of applications will be built for the hardware
 platform. The |ptxdistBSPName| project comes
 with a predefined configuration we select in the following step:
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/4] doc: describe a strange behaviour and its solution

[Juergen Borleis]

Using a unusual 'umask' leads to a strange erroneous behaviour. This was
reported on the PTXdist mailing list.

Signed-off-by: Juergen Borleis 
---
 doc/daily_work.inc | 16 
 doc/ref_manual.rst |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/doc/daily_work.inc b/doc/daily_work.inc
index 3fc894106..74da11953 100644
--- a/doc/daily_work.inc
+++ b/doc/daily_work.inc
@@ -1355,3 +1355,19 @@ shell script. This shell script makes use of some shell 
commands which must be
 present at run-time and thus depends on a package which provides these shell
 commands. But these shell commands are not required to build the shell script
 itself. In this case PTXdist can build both packages independently.
+
+``umask`` Pitfall
+-
+
+When using PTXdist keep in mind it requires some 'always expected' permissions
+to do its job (this does not include root permissions!). But it includes some
+permissions related to file permission masks.
+
+PTXdist requires a ``umask`` of ``0022`` to be able to create files accessible
+by regular users. This is important at build-time, since it propagates to the
+generated target filesystem images as well. For example the ``install_tree``
+macro (refer :ref:`install_tree,reference`) uses the file permissions it finds
+in the build machine's filesystem also for the target filesystem image. With
+a different ``umask`` than ``0022`` at build-time this may fail badly at
+run-time with strange erroneous behaviour (for example some daemons with
+regular user permissions cannot acces their own configuration files).
diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst
index 69f7fdee8..e2be86060 100644
--- a/doc/ref_manual.rst
+++ b/doc/ref_manual.rst
@@ -681,6 +681,8 @@ Copy a file from the package install directory to the root 
filesystem:
 
  $(call install_copy, foo, 0, 0, 0755, -, /usr/bin/foo)
 
+.. _install_tree,reference:
+
 install_tree
 
 
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/4] doc: fix missing step to setup a Python virtualenv

[Juergen Borleis]

In order to build the PTXdist documentation a virtualenv is a useful
helper. This change mentions its correct setup.

Signed-off-by: Juergen Borleis 
---
 doc/including_bsp_doc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/including_bsp_doc.inc b/doc/including_bsp_doc.inc
index cfccc45b4..d4abcd8ea 100644
--- a/doc/including_bsp_doc.inc
+++ b/doc/including_bsp_doc.inc
@@ -32,6 +32,7 @@ when not globally present in the host system.
 .. code-block:: text
 
$ pip3 install --upgrade --user pip virtualenv
+   $ virtualenv -p python3 env
$ source env/bin/activate
$ pip3 install sphinx
$ pip3 install sphinx_rtd_theme
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] PHP7.3 support? Since 5.6.x is End Of Life

[Thorsten LIEPERT]

Hello,

A while back I already did a transition to PHP7.2 but harnet time to populate 
it here yet.

I just tried to upgrade to 7.3.2 and it work without any problems. I’ll attach 
my patches. I also did clean up the lighted rule and removed php5 with this 
stack. 





0001-new-package-PHP-7.patch
Description: Binary data


0002-rules-lighttpd-select-php7-instead-of-php5.patch
Description: Binary data


0003-rules-remove-obsolete-package-php5.patch
Description: Binary data


Thorsten Liepert 
Development Software

Phone +49 911 97479 839 | thorsten.liep...@diehl.com

Diehl Connectivity Solutions GmbH
Stephanstraße 49
90478 Nürnberg
https://www.diehl-cs.com

> Am 22.02.2019 um 09:59 schrieb webmas...@zutroll.de:
> 
> Hello,
> 
> PHP 7.3.2 seems to work well with sqlite, since it uses its own bundeled 
> sqlite3.
> I use with --with-sqlite3, so not specifing any special src.
> 
> I have attached my modified php make file.
> I kept the naming php5.make due limited time, but the target file is now 
> named php instead of php5.
> 
> Hope this helps to getting this working again with ptxdist builded sqlite3.so
> 
> Regards
> 
> 
> 
> Am 2019-02-22 09:28, schrieb Michael Olbrich:
>> Hi,
>> On Mon, Feb 11, 2019 at 03:31:38PM +0100, Simon Agostini wrote:
>>> is PHP 7.3 suppot planned?
>> I'd be happy to accept patches for this, but I currently don't have plans
>> to do this myself.
>>> I tried to adapt the PHP5 make file but I get:
>>> /build-target/php-7.3.2/ext/pdo_sqlite/libsqlite/sqlite3.c', needed by
>>> 'ext/pdo_sqlite/libsqlite/sqlite3.lo'.  Stop.
>>> with --with-sqlite3=$(PTXDIST_SYSROOT_TARGET)/usr
>>> if I remove the dir path it works, but I think this shall not be the
>>> optimal build!?
>> The php5 package is not maintained very well. It has no priority for me and
>> other than the occasional minor version bump, nobody else seems to care
>> either.
>> I'm guessing, that the php build system is broken and there is some mixup
>> about internal vs. system sqlite. Do you get sqlite support at all if you
>> remove --with-sqlite3=...?
>> Michael
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de



smime.p7s
Description: S/MIME cryptographic signature
___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] PHP7.3 support? Since 5.6.x is End Of Life

[webmaster]

Hello,

PHP 7.3.2 seems to work well with sqlite, since it uses its own bundeled 
sqlite3.

I use with --with-sqlite3, so not specifing any special src.

I have attached my modified php make file.
I kept the naming php5.make due limited time, but the target file is now 
named php instead of php5.


Hope this helps to getting this working again with ptxdist builded 
sqlite3.so


Regards



Am 2019-02-22 09:28, schrieb Michael Olbrich:

Hi,

On Mon, Feb 11, 2019 at 03:31:38PM +0100, Simon Agostini wrote:

 is PHP 7.3 suppot planned?


I'd be happy to accept patches for this, but I currently don't have 
plans

to do this myself.


 I tried to adapt the PHP5 make file but I get:
 /build-target/php-7.3.2/ext/pdo_sqlite/libsqlite/sqlite3.c', 
needed by

 'ext/pdo_sqlite/libsqlite/sqlite3.lo'.  Stop.

 with --with-sqlite3=$(PTXDIST_SYSROOT_TARGET)/usr

 if I remove the dir path it works, but I think this shall not be 
the

 optimal build!?


The php5 package is not maintained very well. It has no priority for me 
and

other than the occasional minor version bump, nobody else seems to care
either.

I'm guessing, that the php build system is broken and there is some 
mixup
about internal vs. system sqlite. Do you get sqlite support at all if 
you

remove --with-sqlite3=...?

Michael
# -*-makefile-*-
#
# Copyright (C) 2006-2008 by Robert Schwebel
#   2009, 2012 by Marc Kleine-Budde 
#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
#

#
# We provide this package
#
PACKAGES-$(PTXCONF_PHP5) += php5

#
# Paths and names
#
PHP5_VERSION:= 7.3.2
PHP5_MD5:= 92a237d2f4075eb00dd2b1f36e71ae4c
PHP5:= php-$(PHP5_VERSION)
PHP5_SUFFIX := tar.xz
PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX)
PHP5_DIR:= $(BUILDDIR)/$(PHP5)
PHP5_LICENSE:= PHP

#
# Note: older releases are moved to the 'museum', but the 'de.php.net'
# response with a HTML file instead of the archive. So, try the 'museum'
# URL first
#
PHP5_URL := \
http://museum.php.net/php7/$(PHP5).$(PHP5_SUFFIX) \
http://php.net/distributions/$(PHP5).$(PHP5_SUFFIX)

# 
# Prepare
# 

PHP5_CONF_ENV := \
$(CROSS_ENV) \
ac_cv_prog_cc_cross=yes \
ac_cv_c_bigendian_php=$(call ptx/ifdef, PTXCONF_ENDIAN_BIG, yes, no)

# autoconf
#
PHP5_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--disable-phar \
--with-config-file-path=/etc/php \
--enable-opcache=no \
--without-iconv

# FIXME: php5 doesn't interprete "with_foo=no" correctly, so we cannot
# give --without-foo options. Should be fixed in php5's configure.in.

# 
# SAPI Modules
# 

ifdef PTXCONF_PHP5_SAPI_AOLSERVER
PHP5_AUTOCONF += --with-aolserver=FIXME
else
#PHP5_AUTOCONF += --without-aolserver
endif

ifdef PTXCONF_PHP5_SAPI_APXS2FILTER
PHP5_AUTOCONF += --with-apxs2filter=$(PTXDIST_SYSROOT_TARGET)/usr/bin/apxs
else
#PHP5_AUTOCONF += --without-apxs2filter
endif

ifdef PTXCONF_PHP5_SAPI_APXS2
PHP5_AUTOCONF += --with-apxs2=$(PTXDIST_SYSROOT_TARGET)/usr/bin/apxs
else
# PHP5_AUTOCONF += --without-apxs2
endif

ifdef PTXCONF_PHP5_SAPI_CAUDIUM
PHP5_AUTOCONF += --with-caudium
else
# PHP5_AUTOCONF += --without-caudium
endif

ifdef PTXCONF_PHP5_SAPI_CLI
PHP5_AUTOCONF += --enable-cli
else
PHP5_AUTOCONF += --disable-cli
endif

ifdef PTXCONF_PHP5_SAPI_CONTINUITY
PHP5_AUTOCONF += --with-continuity
else
#PHP5_AUTOCONF += --without-continuity
endif

ifdef PTXCONF_PHP5_SAPI_EMBEDDED
PHP5_AUTOCONF += --enable-embed
else
#PHP5_AUTOCONF += --disable-embed
endif

ifdef PTXCONF_PHP5_SAPI_ISAPI
PHP5_AUTOCONF += --with-isapi
else
#PHP5_AUTOCONF += --without-isapi
endif

ifdef PTXCONF_PHP5_SAPI_MILTER
PHP5_AUTOCONF += --with-milter
else
#PHP5_AUTOCONF += --without-milter
endif

ifdef PTXCONF_PHP5_SAPI_NSAPI
PHP5_AUTOCONF += --with-nsapi
else
#PHP5_AUTOCONF += --without-nsapi
endif

ifdef PTXCONF_PHP5_SAPI_PHTTPD
PHP5_AUTOCONF += --with-phttpd
else
#PHP5_AUTOCONF += --without-phttpd
endif

ifdef PTXCONF_PHP5_SAPI_PI3WEB
PHP5_AUTOCONF += --with-pi3web
else
#PHP5_AUTOCONF += --without-pi3web
endif

ifdef PTXCONF_PHP5_SAPI_ROXEN
PHP5_AUTOCONF += --with-roxen
else
#PHP5_AUTOCONF += --without-roxen
endif

ifdef PTXCONF_PHP5_SAPI_ROXEN_ZTS
PHP5_AUTOCONF += --with-roxen-zts
else
#PHP5_AUTOCONF += --without-roxen-zts
endif

ifdef PTXCONF_PHP5_SAPI_THTTPD
PHP5_AUTOCONF += --with-thttpd
else
#PHP5_AUTOCONF += --without-thttpd
endif

ifdef PTXCONF_PHP5_SAPI_TUX
PHP5_AUTOCONF += --with-tux
else
#PHP5_AUTOCONF += --without-tux
endif

ifdef PTXCONF_PHP5_SAPI_CGI
PHP5_AUTOCONF += --enable-cgi
else
PHP5_AUTOCONF += --disable-cgi
endif

# ---
# General Options
# ---

ifdef PTXCONF_PHP5_XML
PHP5_AUTOCONF 

[ptxdist] [PATCH] ima-evm-utils: version bump to 1.1

[Juergen Borleis]

This version bump also adds support for openssl-1.1.x.

Signed-off-by: Juergen Borleis 
---
 ...ove-file-at-it-s-autogenerated-by-autotoo.patch |   0
 ...2-Makefile.am-rename-INCLUDES-AM_CPPFLAGS.patch |   0
 ...tl-find-add-missing-closedir-dir-on-error.patch |   6 +-
 ...-add-missing-error-handling-and-propagate.patch |   6 +-
 ...d-fallback-definitions-for-XATTR_NAME_IMA.patch |   2 +-
 ...maevm-use-EVP_MAX_MD_SIZE-for-hash-size-i.patch |  20 ++--
 ...se-SHA_DIGEST_LENGTH-instead-of-open-codi.patch |   8 +-
 ...mctl-add-parameter-e-to-set-evm-hash-algo.patch |  50 +-
 ...add-support-for-offline-image-preparation.patch | 110 ++---
 ...ot-account-.-and-.-for-directory-hash-gen.patch |   4 +-
 .../0011-HACK-don-t-generate-man-page.patch|   0
 .../0012-Fix-warning-for-non-debug-use-case.patch  |  28 ++
 .../autogen.sh |   0
 .../series |   3 +-
 rules/ima-evm-utils.make   |   6 +-
 15 files changed, 136 insertions(+), 107 deletions(-)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0001-INSTALL-remove-file-at-it-s-autogenerated-by-autotoo.patch
 (100%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0002-Makefile.am-rename-INCLUDES-AM_CPPFLAGS.patch (100%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0003-evmctl-find-add-missing-closedir-dir-on-error.patch 
(79%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0004-evmctl-find-add-missing-error-handling-and-propagate.patch
 (87%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0005-evmctl-add-fallback-definitions-for-XATTR_NAME_IMA.patch
 (94%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0006-evmctl-libimaevm-use-EVP_MAX_MD_SIZE-for-hash-size-i.patch
 (76%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0007-libimaevm-use-SHA_DIGEST_LENGTH-instead-of-open-codi.patch
 (77%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0008-evmctl-add-parameter-e-to-set-evm-hash-algo.patch (69%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0009-evmctl-add-support-for-offline-image-preparation.patch 
(68%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0010-evmctl-Do-not-account-.-and-.-for-directory-hash-gen.patch
 (89%)
 rename patches/{ima-evm-utils-1.0 => 
ima-evm-utils-1.1}/0011-HACK-don-t-generate-man-page.patch (100%)
 create mode 100644 
patches/ima-evm-utils-1.1/0012-Fix-warning-for-non-debug-use-case.patch
 rename patches/{ima-evm-utils-1.0 => ima-evm-utils-1.1}/autogen.sh (100%)
 rename patches/{ima-evm-utils-1.0 => ima-evm-utils-1.1}/series (86%)

diff --git 
a/patches/ima-evm-utils-1.0/0001-INSTALL-remove-file-at-it-s-autogenerated-by-autotoo.patch
 
b/patches/ima-evm-utils-1.1/0001-INSTALL-remove-file-at-it-s-autogenerated-by-autotoo.patch
similarity index 100%
rename from 
patches/ima-evm-utils-1.0/0001-INSTALL-remove-file-at-it-s-autogenerated-by-autotoo.patch
rename to 
patches/ima-evm-utils-1.1/0001-INSTALL-remove-file-at-it-s-autogenerated-by-autotoo.patch
diff --git 
a/patches/ima-evm-utils-1.0/0002-Makefile.am-rename-INCLUDES-AM_CPPFLAGS.patch 
b/patches/ima-evm-utils-1.1/0002-Makefile.am-rename-INCLUDES-AM_CPPFLAGS.patch
similarity index 100%
rename from 
patches/ima-evm-utils-1.0/0002-Makefile.am-rename-INCLUDES-AM_CPPFLAGS.patch
rename to 
patches/ima-evm-utils-1.1/0002-Makefile.am-rename-INCLUDES-AM_CPPFLAGS.patch
diff --git 
a/patches/ima-evm-utils-1.0/0003-evmctl-find-add-missing-closedir-dir-on-error.patch
 
b/patches/ima-evm-utils-1.1/0003-evmctl-find-add-missing-closedir-dir-on-error.patch
similarity index 79%
rename from 
patches/ima-evm-utils-1.0/0003-evmctl-find-add-missing-closedir-dir-on-error.patch
rename to 
patches/ima-evm-utils-1.1/0003-evmctl-find-add-missing-closedir-dir-on-error.patch
index 77e9f5fc6..4b1c84584 100644
--- 
a/patches/ima-evm-utils-1.0/0003-evmctl-find-add-missing-closedir-dir-on-error.patch
+++ 
b/patches/ima-evm-utils-1.1/0003-evmctl-find-add-missing-closedir-dir-on-error.patch
@@ -10,10 +10,10 @@ Signed-off-by: Marc Kleine-Budde 
  1 file changed, 2 insertions(+)
 
 diff --git a/src/evmctl.c b/src/evmctl.c
-index c20cbfe80ab6..19f5f3bc87b0 100644
+index 2ffee786865b..20eccfa93b2b 100644
 --- a/src/evmctl.c
 +++ b/src/evmctl.c
-@@ -1092,6 +1092,7 @@ static int find(const char *path, int dts, find_cb_t 
func)
+@@ -1229,6 +1229,7 @@ static int find(const char *path, int dts, find_cb_t 
func)
  
if (fchdir(dirfd(dir))) {
log_err("Failed to chdir %s\n", path);
@@ -21,7 +21,7 @@ index c20cbfe80ab6..19f5f3bc87b0 100644
return -1;
}
  
-@@ -1107,6 +1108,7 @@ static int find(const char *path, int dts, find_cb_t 
func)
+@@ -1244,6 +1245,7 @@ static int find(const char *path, int dts, find_cb_t 
func)
  
if (chdir("..")) {
log_err("Failed to chdir: %s\n", path);
diff --git 

Re: [ptxdist] PHP7.3 support? Since 5.6.x is End Of Life

[Michael Olbrich]

Hi,

On Mon, Feb 11, 2019 at 03:31:38PM +0100, Simon Agostini wrote:
>  is PHP 7.3 suppot planned?

I'd be happy to accept patches for this, but I currently don't have plans
to do this myself.

>  I tried to adapt the PHP5 make file but I get:
>  /build-target/php-7.3.2/ext/pdo_sqlite/libsqlite/sqlite3.c', needed by
>  'ext/pdo_sqlite/libsqlite/sqlite3.lo'.  Stop.
> 
>  with --with-sqlite3=$(PTXDIST_SYSROOT_TARGET)/usr
> 
>  if I remove the dir path it works, but I think this shall not be the
>  optimal build!?

The php5 package is not maintained very well. It has no priority for me and
other than the occasional minor version bump, nobody else seems to care
either.

I'm guessing, that the php build system is broken and there is some mixup
about internal vs. system sqlite. Do you get sqlite support at all if you
remove --with-sqlite3=...?

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] [PATCH] host-autotools-autoconf: fix m4 path

[Michael Olbrich]

Make sure the path for m4 is just /bin/m4 and then fix it correctly in
host-autotools-autoconf.install.post. Otherwise the absolute path to
sysroot-host is part of the dev package.

Signed-off-by: Michael Olbrich 
---

Hi,

Can you check, if you get a correct dev package for host-autotools-autoconf
with this?

Michael

 rules/host-autotools-autoconf.make | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rules/host-autotools-autoconf.make 
b/rules/host-autotools-autoconf.make
index 9f9c4de94c4e..9c2f516ddc45 100644
--- a/rules/host-autotools-autoconf.make
+++ b/rules/host-autotools-autoconf.make
@@ -35,6 +35,11 @@ $(STATEDIR)/autogen-tools: 
$(STATEDIR)/host-autotools-autoconf.install.post
 # Prepare
 # 
 
+# Note: the path for m4 will be fixed in .install.post
+HOST_AUTOTOOLS_AUTOCONF_CONF_ENV   := \
+   $(HOST_ENV) \
+   ac_cv_path_M4=/bin/m4
+
 #
 # autoconf
 #
@@ -48,7 +53,7 @@ $(STATEDIR)/host-autotools-autoconf.install.post:
@$(call targetinfo)
@sed -i \
-e "s;'\(/share/autoconf\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
-   -e 
"s;'\(/bin/\(m4\)\?\(auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
+   -e 
"s;'\(/bin/\(m4\|auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/* \
$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/share/autoconf/autom4te.cfg
@$(call world/install.post, HOST_AUTOTOOLS_AUTOCONF)
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] kernel: rework prepare stage

[Michael Olbrich]

The old implementation is broken, when a initramfs is used.
Changing the kconfig symbol back to '# Automatically set by PTXDist' is
broken because '$(<)' is not the kernel config any more (Broken since
cd920ab716bab0c190666e0273c10b19c7cdaeec "barebox/kernel: drop explicit
dependency").
Also, world/kconfig-sync compares .config and KERNEL_CONFIG and this does
not work because CONFIG_INITRAMFS_SOURCE in .config has been modified.

Instead, make sure that KERNEL_CONFIG contains the path independent dummy
text before copying it to .config.
Then run the default prepare stage that checks or updates the config.
Insert the path for the empty initramfs after all checks are done.

Signed-off-by: Michael Olbrich 
---

Hi Jon,

The initramfs handling is completely broken :-/. Can you try this patch?
That should fix your problem. I've queued this for master, but I'm still
waiting for some test results before pushing this.

Michael

 rules/kernel.make | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/rules/kernel.make b/rules/kernel.make
index 99ad37b85ea7..6a9666df196b 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -105,30 +105,31 @@ KERNEL_INITRAMFS_SOURCE_$(PTXCONF_IMAGE_KERNEL_INITRAMFS) 
+= $(STATEDIR)/empty.c
 
 $(STATEDIR)/kernel.prepare:
@$(call targetinfo)
-
-   @$(call world/kconfig-setup, KERNEL)
+#
+# Make sure there is a non empty INITRAMFS_SOURCE in $(KERNEL_CONFIG), but
+# not the real expanded path because it contains local workdir path which
+# is not relevant to other developers.
+#
+ifdef KERNEL_INITRAMFS_SOURCE_y
+   @sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# 
Automatically set by PTXDist\",g' \
+   "$(KERNEL_CONFIG)"
+endif
 ifdef PTXCONF_KERNEL_IMAGE_SIMPLE
cp $(PTXCONF_KERNEL_IMAGE_SIMPLE_DTS) \

$(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/dts/$(PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET).dts
 endif
 
-ifdef KERNEL_INITRAMFS_SOURCE_y
-   @touch "$(KERNEL_INITRAMFS_SOURCE_y)"
-   @sed -i -e 
's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"$(KERNEL_INITRAMFS_SOURCE_y)\",g'
 \
-   "$(KERNEL_DIR)/.config"
-endif
-
-   @$(call ptx/oldconfig, KERNEL)
-   @$(call world/kconfig-sync, KERNEL)
+   @$(call world/prepare, KERNEL)
 
 #
-# Don't keep the expanded path to INITRAMS_SOURCE in $(KERNEL_CONFIG),
-# because it contains local workdir path which is not relevant to
-# other developers.
+# Use a existing dummy INITRAMFS_SOURCE for the fist 'make' call. The
+# kernel image will be rebuilt in the image-kernel package with the real
+# initramfs.
 #
 ifdef KERNEL_INITRAMFS_SOURCE_y
-   @sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# 
Automatically set by PTXDist\",g' \
-   "$(<)"
+   @touch "$(KERNEL_INITRAMFS_SOURCE_y)"
+   @sed -i -e 
's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"$(KERNEL_INITRAMFS_SOURCE_y)\",g'
 \
+   "$(KERNEL_DIR)/.config"
 endif
@$(call touch)
 
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de