[ptxdist] toolchain glibc symlink regression. Some symlinks are no longer installed

2016-08-18 Thread evermind.crazyfury

Hello

I had problems with symlinks that are present within the toolcain but 
not present in the created rootfs,

As result the rootfs was not bootable due to the missing symlinks.

eg calling
ptxdist targetinstall glibc

will no longer create/copy necessary symlinks.

for example root/lib/libm.so.6 was missing in the created rootfs

after reverting below patch the symlinks are created again.

Kind Regards,

Frieder


From ef20fc7f4ee74ccfb376319d91cae27bcf55a17a Mon Sep 17 00:00:00 2001
From: Michael Olbrich 
Date: Sun, 5 Jun 2016 19:24:34 +0200
Subject: [PATCH] ptxd_install_toolchain_lib: use ptxd_install_file 
instead of

 ptxd_install_shared

ptxd_install_toolchain_lib creates ptxd_install_link for all necessary
links, so using ptxd_install_shared just creates them a second time.

Signed-off-by: Michael Olbrich 
---
 scripts/install_copy_toolchain.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install_copy_toolchain.sh 
b/scripts/install_copy_toolchain.sh

index 5de2827..2e2616e 100755
--- a/scripts/install_copy_toolchain.sh
+++ b/scripts/install_copy_toolchain.sh
@@ -170,7 +170,7 @@ ptxd_install_toolchain_lib() {

perm="$(stat -c %a "${lib_path}")"

-   echo "ptxd_install_shared \"${lib_path}\" \"${prefix}\" 
0 0 \"${perm}\" \"${strip}\"" >> "${STATEDIR}/${packet}.cmds"
+   echo "ptxd_install_file \"${lib_path}\" 
\"${prefix}/${lib}\" 0 0 \"${perm}\" \"${strip}\"" >> 
"${STATEDIR}/${packet}.cmds"

fi
else
echo "error: found ${lib_path}, but neither file nor link" 2>&1
--
2.9.2


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libmodbus3: version bump 3.0.6 -> 3.1.4

2016-08-18 Thread Matthias Klein
Signed-off-by: Matthias Klein 
---
 rules/libmodbus3.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index 4e04c86..d46048e 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
 #
 # Paths and names
 #
-LIBMODBUS3_VERSION := 3.0.6
-LIBMODBUS3_MD5 := c80f88b6ca19cabc4ceffc195ca07771
+LIBMODBUS3_VERSION := 3.1.4
+LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
 LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
 LIBMODBUS3_SUFFIX  := tar.gz
 LIBMODBUS3_URL := 
http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] ibrdtn: add packaging rules for IBR-DTN and dtndht

2016-08-18 Thread Michael Olbrich
On Wed, Aug 17, 2016 at 04:53:36PM +0200, Roland Hieber wrote:
[...]
> + @$(call install_copy,ibrdtnd, 0, 0, 0644, -, /etc/ibrdtnd.conf)

You should probably use install_alternative here, so that the file can be
overwritten in the BSP.

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

Re: [ptxdist] [PATCH] ibrdtn: add packaging rules for IBR-DTN and dtndht

2016-08-18 Thread Michael Olbrich
On Wed, Aug 17, 2016 at 04:53:36PM +0200, Roland Hieber wrote:
> IBR-DTN is a lightweight implementation of the Bundle Protocol (RFC
> 5050), designed for embedded systems like the RouterBoard532A or
> Ubiquiti RouterStation Pro.
> 
> IBR-DTN consists of several upstream tarballs which split its
> functionality into modular parts, namely ibrcommon, ibrdtn, ibrdtnd and
> ibrdtn-tools.  Although they are released at the same time with the same
> version, they are usually packaged separately to provide the modularity
> on the package level.  In order to provide clean and readable Makefiles,
> the upstream naming scheme is adopted here.
> 
> Although dtndht is versioned and released as a separate upstream
> package, it is effectively part of IBR-DTN as it is not really used
> anywhere else, and it's also developed in close contact with IBR-DTN by
> the same authors.  For this reason, I'm including all package rules in a
> single patch.
> 
> The upstream releases includes some functionality which depends on
> software not currently available in ptxdist.  This includes tffs,
> wifip2p and libvmime.  I have included the directives for these
> features, but commented them out, so they can easily be enabled once
> that software gets packaged.
> 
> Signed-off-by: Roland Hieber 

I've made several comments below, that apply to more that one place. Please
fix it everywhere.

And check your configure options. You need to specify everything that is
optional or may be auto detected. Please look at some other rules for
guidance or ask me if you are unsure if an option should be specified.

> ---
>  projectroot/lib/systemd/system/ibrdtnd.service | 12 
>  rules/dtndht.in| 18 ++
>  rules/dtndht.make  | 53 +
>  rules/ibrcommon.in | 39 +
>  rules/ibrcommon.make   | 56 ++
>  rules/ibrdtn-tools.in  | 44 +++
>  rules/ibrdtn-tools.make| 68 ++
>  rules/ibrdtn.in| 35 
>  rules/ibrdtn.make  | 55 ++
>  rules/ibrdtnd.in   | 78 
> ++
>  rules/ibrdtnd.make | 73 
>  11 files changed, 531 insertions(+)
>  create mode 100644 projectroot/lib/systemd/system/ibrdtnd.service
>  create mode 100644 rules/dtndht.in
>  create mode 100644 rules/dtndht.make
>  create mode 100644 rules/ibrcommon.in
>  create mode 100644 rules/ibrcommon.make
>  create mode 100644 rules/ibrdtn-tools.in
>  create mode 100644 rules/ibrdtn-tools.make
>  create mode 100644 rules/ibrdtn.in
>  create mode 100644 rules/ibrdtn.make
>  create mode 100644 rules/ibrdtnd.in
>  create mode 100644 rules/ibrdtnd.make
> 
> diff --git a/projectroot/lib/systemd/system/ibrdtnd.service 
> b/projectroot/lib/systemd/system/ibrdtnd.service
> new file mode 100644
> index 000..f5ba5cd
> --- /dev/null
> +++ b/projectroot/lib/systemd/system/ibrdtnd.service
> @@ -0,0 +1,12 @@
> +[Unit]
> +Description=IBR-DTN Bundle Protocol daemon
> +Requires=network.target
> +
> +[Service]
> +ExecStartPre=/bin/mkdir -p /etc/ibrdtn/bpsec /etc/ibrdtn/certs
> +ExecStartPre=/bin/chown root:root -R /etc/ibrdtn/bpsec /etc/ibrdtn/certs

The rootfs may be read-only. These directories should be created in the
targetinstall stage.

> +ExecStart=/usr/sbin/dtnd -D -c /etc/ibrdtnd.conf
> +Restart=always
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/rules/dtndht.in b/rules/dtndht.in
> new file mode 100644
> index 000..72824b5
> --- /dev/null
> +++ b/rules/dtndht.in
> @@ -0,0 +1,18 @@
> +## SECTION=networking
> +
> +menuconfig DTNDHT
> + tristate
> + prompt "dtndht"
> + select OPENSSL if DTNDHT_WITH_OPENSSL

tab before 'if'.

> + help
> +   DTNDHT is a library providing a fully distributed BitTorrent DHT-based
> +   naming service especially for DTN Bundle Protocol EIDs (RFC 5050). 
> +
> +if DTNDHT

> + config DTNDHT_WITH_OPENSSL

we don't indent here.

> + bool
> + default y
> + prompt "use OpenSSL instead of built-in crypto"
> +endif
> +
> +# vim: syntax=kconfig
> diff --git a/rules/dtndht.make b/rules/dtndht.make
> new file mode 100644
> index 000..6908f50
> --- /dev/null
> +++ b/rules/dtndht.make
> @@ -0,0 +1,53 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2016 by Roland Hieber 
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_DTNDHT) += dtndht
> +
> +#
> +# Paths and names
> +#
> +DTNDHT_VERSION := 0.2.3
> +DTNDHT_MD5 := 37c33910ac7e760aad4db81724aeb4fb
> +DTNDHT := dtndht-$(DTNDHT_VERSION)
> +DTNDHT_SUFFIX  := tar.gz
> +DTNDHT_URL := 
>