[ptxdist] [PATCH 2/3] openssl: add cryptodev support

2017-06-24 Thread Ladislav Michl 
For OpenSSL_1_0_2-stable branch two patches mentioned in cryptodev's
README were forward-ported. That's safe to do as they are no-op
until cryptodev support is enabled. These patches were also merged
to master branch in 2014 to be finally removed altogether
in commit f39a5501ce69cab0c7282f5dcbf2b80d8ee259f2 as a part of
openssl's effort to move to Apache License version 2.0.
See this PR: https://github.com/openssl/openssl/pull/3699
Blog post mentioned in said PR also states: "...but we expect to have
a replacement soon (for at least Linux and FreeBSD)." Whatever "soon"
means...

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 ...todev-Fix-issue-with-signature-generation.patch | 404 +
 ...0201-cryptodev-allow-copying-EVP-contexts.patch | 205 +++
 patches/openssl-1.0.2l/series  |   3 +
 rules/openssl.in   |  16 +
 rules/openssl.make |   7 +
 5 files changed, 635 insertions(+)

diff --git 
a/patches/openssl-1.0.2l/0200-cryptodev-Fix-issue-with-signature-generation.patch
 
b/patches/openssl-1.0.2l/0200-cryptodev-Fix-issue-with-signature-generation.patch
new file mode 100644
index 0..6e660b3d3
--- /dev/null
+++ 
b/patches/openssl-1.0.2l/0200-cryptodev-Fix-issue-with-signature-generation.patch
@@ -0,0 +1,404 @@
+From 63334c3d1c3919b046a7926a131e676ce2705fb5 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <n...@gnutls.org>
+Date: Fri, 4 Jul 2014 07:31:25 +0200
+Subject: [PATCH 1/2] cryptodev: Fix issue with signature generation
+
+That patch also enables support for SHA2 hashes, and
+removes support for hashes that were never supported by
+cryptodev.
+
+[manually rebased to OpenSSL_1_0_2-stable branch]
+Ladislav Michl <la...@linux-mips.org>
+---
+ crypto/engine/eng_cryptodev.c | 181 --
+ 1 file changed, 141 insertions(+), 40 deletions(-)
+
+diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
+index af59471c4..75bb85b26 100644
+--- a/crypto/engine/eng_cryptodev.c
 b/crypto/engine/eng_cryptodev.c
+@@ -2,6 +2,7 @@
+  * Copyright (c) 2002 Bob Beck <b...@openbsd.org>
+  * Copyright (c) 2002 Theo de Raadt
+  * Copyright (c) 2002 Markus Friedl
++ * Copyright (c) 2012 Nikos Mavrogiannopoulos
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -73,7 +74,6 @@ struct dev_crypto_state {
+ struct session_op d_sess;
+ int d_fd;
+ # ifdef USE_CRYPTODEV_DIGESTS
+-char dummy_mac_key[HASH_MAX_LEN];
+ unsigned char digest_res[HASH_MAX_LEN];
+ char *mac_data;
+ int mac_len;
+@@ -190,8 +190,10 @@ static struct {
+ static struct {
+ int id;
+ int nid;
+-int keylen;
++int digestlen;
+ } digests[] = {
++#if 0
++/* HMAC is not supported */
+ {
+ CRYPTO_MD5_HMAC, NID_hmacWithMD5, 16
+ },
+@@ -208,6 +210,7 @@ static struct {
+ {
+ CRYPTO_SHA1_KPDK, NID_undef, 0
+ },
++#endif
+ {
+ CRYPTO_MD5, NID_md5, 16
+ },
+@@ -215,6 +218,15 @@ static struct {
+ CRYPTO_SHA1, NID_sha1, 20
+ },
+ {
++CRYPTO_SHA2_256, NID_sha256, 32
++},
++{
++CRYPTO_SHA2_384, NID_sha384, 48
++},
++{
++CRYPTO_SHA2_512, NID_sha512, 64
++},
++{
+ 0, NID_undef, 0
+ },
+ };
+@@ -287,6 +299,7 @@ static int get_asym_dev_crypto(void)
+ static int get_cryptodev_ciphers(const int **cnids)
+ {
+ static int nids[CRYPTO_ALGORITHM_MAX];
++unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN];
+ struct session_op sess;
+ int fd, i, count = 0;
+ 
+@@ -295,7 +308,7 @@ static int get_cryptodev_ciphers(const int **cnids)
+ return (0);
+ }
+ memset(, 0, sizeof(sess));
+-sess.key = (caddr_t) "123456789abcdefghijklmno";
++sess.key = (void*) fake_key;
+ 
+ for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
+ if (ciphers[i].nid == NID_undef)
+@@ -326,6 +339,7 @@ static int get_cryptodev_ciphers(const int **cnids)
+ static int get_cryptodev_digests(const int **cnids)
+ {
+ static int nids[CRYPTO_ALGORITHM_MAX];
++unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN];
+ struct session_op sess;
+ int fd, i, count = 0;
+ 
+@@ -334,12 +348,12 @@ static int get_cryptodev_digests(const int **cnids)
+ return (0);
+ }
+ memset(, 0, sizeof(sess));
+-sess.mackey = (caddr_t) "123456789abcdefghijklmno";
++sess.mackey = fake_key;
+ for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
+ if (digests[i].nid == NID_undef)
+ continue;
+ sess.mac = digests[i].id;
+-sess.mackeylen = digests[i].keylen;
++sess.mackeylen = 8;
+ sess.cipher = 0;
+ if (ioctl(fd, CIOCGSESSION, ) != -1 &&
+ ioctl(fd, CIOCFSESSION, ) != -1)
+

[ptxdist] [PATCH 1/3] cryptodev: new package

2017-06-24 Thread Ladislav Michl 
Cryptodev-linux is a device that allows access to Linux kernel
cryptographic drivers; thus allowing of userspace applications
to take advantage of hardware accelerators. Cryptodev-linux is
implemented as a standalone module that requires no dependencies
other than a stock linux kernel. Its API is compatible with
OpenBSD's cryptodev userspace API (/dev/crypto).

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/cryptodev.in   | 11 
 rules/cryptodev.make | 75 
 2 files changed, 86 insertions(+)

diff --git a/rules/cryptodev.in b/rules/cryptodev.in
new file mode 100644
index 0..7a231340e
--- /dev/null
+++ b/rules/cryptodev.in
@@ -0,0 +1,11 @@
+## SECTION=core
+
+config CRYPTODEV
+   tristate
+   select KERNEL
+   prompt "cryptodev"
+   help
+ Cryptodev-linux is a device that allows access to Linux kernel
+ cryptographic drivers; thus allowing of userspace applications
+ to take advantage of hardware accelerators. Its API is
+ compatible with OpenBSD's cryptodev userspace API (/dev/crypto). 
diff --git a/rules/cryptodev.make b/rules/cryptodev.make
new file mode 100644
index 0..0cad936b3
--- /dev/null
+++ b/rules/cryptodev.make
@@ -0,0 +1,75 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Ladislav Michl <la...@linux-mips.org>
+#
+# 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_CRYPTODEV) += cryptodev
+
+#
+# Paths and names and versions
+#
+CRYPTODEV_VERSION  := 1.9
+CRYPTODEV_MD5  := cb4e0ed9e5937716c7c8a7be84895b6d
+CRYPTODEV  := cryptodev-linux-$(CRYPTODEV_VERSION)
+CRYPTODEV_SUFFIX   := tar.gz
+CRYPTODEV_URL  := \
+   http://nwl.cc/pub/cryptodev-linux/$(CRYPTODEV).$(CRYPTODEV_SUFFIX) \
+   http://download.gna.org/cryptodev-linux/$(CRYPTODEV).$(CRYPTODEV_SUFFIX)
+CRYPTODEV_SOURCE   := $(SRCDIR)/$(CRYPTODEV).$(CRYPTODEV_SUFFIX)
+CRYPTODEV_DIR  := $(BUILDDIR)/$(CRYPTODEV)
+CRYPTODEV_LICENSE  := GPL-2.0
+
+ifdef PTXCONF_CRYPTODEV
+$(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/cryptodev.targetinstall
+endif
+
+# 
+# Prepare
+# 
+
+$(STATEDIR)/cryptodev.prepare:
+   @$(call targetinfo)
+   @$(call touch)
+
+# 
+# Compile
+# 
+
+$(STATEDIR)/cryptodev.compile:
+   @$(call targetinfo)
+   $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) $(KERNEL_MAKEVARS) \
+   KERNEL_DIR=$(KERNEL_DIR) \
+   -C $(CRYPTODEV_DIR)
+   @$(call touch)
+
+# 
+# Install
+# 
+
+$(STATEDIR)/cryptodev.install:
+   @$(call targetinfo)
+   @$(call touch)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/cryptodev.targetinstall:
+   @$(call targetinfo)
+   $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) $(KERNEL_MAKEVARS) \
+   KERNEL_DIR=$(KERNEL_DIR) \
+   DESTDIR=$(SYSROOT) \
+   prefix=/usr \
+   -C $(CRYPTODEV_DIR) \
+   install
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [RFC/PATCH 0/3] cryptodev

2017-06-24 Thread Ladislav Michl 
Hi there!

This serie adds support for cryptodev hardware acceleration.
However, there's one issue unresolved: cryptodev module
loading.
As we have three different modutils implementations available
and also supporting systemd and sysv init it is a bit messy
to generate proper config to load cryptodev at boot time.
So we could either leave module loading to BSP or do something
on ptxdist level. Thoughts?

Thank you,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] modemmanager: version bump 1.6.6 -> 1.6.8

2017-06-19 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/modemmanager.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index ea6af7669..9afea1e7d 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.6.6
-MODEMMANAGER_MD5   := 99a46bd34ce65f8c18bd48994982922e
+MODEMMANAGER_VERSION   := 1.6.8
+MODEMMANAGER_MD5   := ac08d539ec3dc35db8d6b7c8d6c660ff
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.xz
 MODEMMANAGER_URL   := 
http://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/4] ppp: version bump to 2.4.7

2017-06-15 Thread Ladislav Michl 
On Fri, Jun 02, 2017 at 02:56:07PM +0200, Sascha Hauer wrote:
> This updates ppp to version 2.4.7. The former 2.4.5 version had the
> Debian package patches applied plus some ptxdist specific patches. The
> Debian patches have been updated to the recent 2.4.7 Debian patches, the
> ptxdist specific patches have been forward ported from the 2.4.5 ptxdist
> package.
> 
> Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>

I'd really appreciate having this one merged...

Tested-by: Ladislav Michl <la...@linux-mips.org>

Thank you,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v1] networkmanager: version bump: 1.6.2 -> 1.8.0

2017-05-15 Thread Ladislav Michl 
On Mon, May 15, 2017 at 10:57:35AM +0200, Michael Olbrich wrote:
> On Thu, May 11, 2017 at 08:54:41PM +0200, Robert Schwebel wrote:
> > NetworkManager 1.8 has a bunch of new functionality; for details, see
> > https://blogs.gnome.org/lkundrak/2017/05/10/networkmanager-1-8-whats-new/
> > 
> > For ptxdist, one of the most interesting features is the removed
> > dependency to libsoap, which in turn makes it possible to drop the
> > dependency to libxml2 and sqlite as well.
> > 
> > Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de>
> > ---
> >  rules/networkmanager.in   |  7 ---
> >  rules/networkmanager.make | 12 +++-
> >  2 files changed, 11 insertions(+), 8 deletions(-)
> > 
> > diff --git a/rules/networkmanager.in b/rules/networkmanager.in
> > index 36fe00adc..f7ad1c87d 100644
> > --- a/rules/networkmanager.in
> > +++ b/rules/networkmanager.in
> > @@ -4,6 +4,7 @@ menuconfig NETWORKMANAGER
> > tristate
> > # intltool is unconditionally requested by configure
> > select HOST_INTLTOOL
> > +   select HOST_GLIB
> 
> What is this needed for?

glib-mkenums and glib-genmarshall (probably)

[snip]

From: Robert Schwebel <r.schwe...@pengutronix.de>
Subject: [PATCH v2] networkmanager: version bump: 1.6.2 -> 1.8.0

NetworkManager 1.8 has a bunch of new functionality; for details, see
https://blogs.gnome.org/lkundrak/2017/05/10/networkmanager-1-8-whats-new/

For ptxdist, one of the most interesting features is the removed
dependency to libsoap, which in turn makes it possible to drop the
dependency to libxml2 and sqlite as well.

Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de>
Tested-by: Ladislav Michl <la...@linux-mips.org>
---
 Changes in v2:
 - sort dependencies alphabeticaly
 - add LGPL-2.0+ license
 - use --without-libpsl
 
 rules/networkmanager.in   |  7 ---
 rules/networkmanager.make | 12 +++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 36fe00adc..e6ab270e5 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -4,6 +4,7 @@ menuconfig NETWORKMANAGER
tristate
# intltool is unconditionally requested by configure
select HOST_INTLTOOL
+   select HOST_GLIB
select LIBC_M
select LIBC_DL
select LIBC_PTHREAD
@@ -12,18 +13,18 @@ menuconfig NETWORKMANAGER
select DBUS_PYTHON  if NETWORKMANAGER_EXAMPLES && 
RUNTIME
select GLIB
select GNUTLS
-   select LIBGUDEV
+   select LIBCURL  if NETWORKMANAGER_CONCHECK
select LIBNDP
select LIBNEWT  if NETWORKMANAGER_NMTUI
select LIBNL3
-   select LIBSOUP  if NETWORKMANAGER_CONCHECK
select LIBUUID
select MODEMMANAGER if NETWORKMANAGER_WWAN
select PPP  if NETWORKMANAGER_PPP
select PPP_PLUGINS  if NETWORKMANAGER_PPP
select READLINE if NETWORKMANAGER_NMCLI
select SYSTEMD  if NETWORKMANAGER_SYSTEMD_UNIT
-   select UDEV if RUNTIME
+   select UDEV
+   select UDEV_LIBUDEV
select WPA_SUPPLICANT   if NETWORKMANAGER_WIRELESS && 
RUNTIME
select WPA_SUPPLICANT_CTRL_IFACE_DBUS   if NETWORKMANAGER_WIRELESS && 
RUNTIME
prompt "networkmanager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 66563d2d3..cd3854f72 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 #
-# Copyright (C) 2009 by Robert Schwebel <r.schwe...@pengutronix.de>
+# Copyright (C) 2009, 2017 by Robert Schwebel <r.schwe...@pengutronix.de>
 #   (C) 2012 by Jan Luebbe <j.lue...@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
@@ -17,13 +17,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.6.2
-NETWORKMANAGER_MD5 := 89c975afe19fbac854191edb6e9bcd3b
+NETWORKMANAGER_VERSION := 1.8.0
+NETWORKMANAGER_MD5 := de0e70933a17ee6a682e8440015c9b1e
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
-NETWORKMANAGER_URL := 
https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := 
https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE  := $(SRCDIR)/$(NETWORKMAN

Re: [ptxdist] [PATCH v2] ppp: version bump 2.4.5 -> 2.4.7

2017-04-21 Thread Ladislav Michl 
On Fri, Apr 21, 2017 at 03:02:37PM +0200, Michael Olbrich wrote:
> On Wed, Apr 12, 2017 at 10:30:51PM +0200, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl <la...@linux-mips.org>
> > ---
> >  Changes:
> >  - v2: Add forgotten 0030-no_crypt_hack.patch 
> > 
> >  Note: patches were not refreshed and renumbered as it
> >  would make review more difficult. I'm ready to send
> >  v3, eventually. 
> 
> I assume, the removed patches are included in the new version?

Yes, all dropped patches are present in mainline.

> If you create the patch with '-M' then renamed files are detected and can
> be reviewed sanely.

Ok, will use that when generating new version.

> mkl: You added these patches initially. Where are those from? Debian? Maybe
> we should check there for new versions.

I checked Debian when doing update and not all patches comes from there.
This is list of debian patches against 2.4.7:
  857 pro  4  2015 010_scripts_README.diff
 4786 pro 30  2015 011_scripts_redialer.diff
 2901 pro  4  2015 018_ip-up_option.diff
 2070 pro  4  2015 adaptive_echos
  958 pro  4  2015 chat_man
11144 led 27  2016 cifdefroute.dif 
 1144 pro 30  2015 close_dev_ppp
 1177 pro 30  2015 fix_linkpidfile 
  682 lis 11 12:48 fix-rp-pppoe-ftbfs.patch 
 2090 pro 30  2015 ipv6-accept-remote  
 7376 pro 30  2015 makefiles_cleanup
 1255 pro  4  2015 no_crypt_hack
 5133 pro  4  2015 ppp-2.3.11-oedod.dif
 6173 led 27  2016 ppp-2.4.2-ifname.diff
 1018 pro  4  2015 ppp-2.4.2-stripMSdomain
 1222 led 27  2016 ppp-2.4.4-strncatfix.patch
  932 led 27  2016 pppd-soname-hack.patch
  868 pro  4  2015 pppdump_use_zlib 
 2186 pro  4  2015 pppoatm_cleanup  
 2584 pro  4  2015 pppoatm_resolver_light
  277 pro  4  2015 pppoe_noads 
10740 čen 29  2016 pr-28-pppoe-custom-host-uniq-tag.patch
 1116 led 27  2016 radius-config.c-unkown-typo
  868 pro  4  2015 radius_mtu
  776 pro  4  2015 rc_mksid-no-buffer-overflow
  434 pro  4  2015 readable_connerrs
  276 pro  4  2015 resolv.conf_no_log  
  637 led 27  2016 secure-card-interpreter-fix
  735 lis 11 12:18 series  
  698 pro  4  2015 setenv_call_file 
 1623 pro  4  2015 zzz_config

Best regards,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] usb-modeswitch: version bump 2.4.0 -> 2.5.0

2017-04-18 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 Changes:
 - v2: drop unecessary DESTDIR
   use install_alternative
 
 rules/usb-modeswitch.make | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index ae2891dfe..1eb477610 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION := 2.4.0
-USB_MODESWITCH_MD5 := 6e1640db47768bb9012f91b7593116ef
+USB_MODESWITCH_VERSION := 2.5.0
+USB_MODESWITCH_MD5 := 38ad5c9d70e06227a00361bdc2b1e568
 USB_MODESWITCH := usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX  := tar.bz2
 USB_MODESWITCH_URL := 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
@@ -68,6 +68,8 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
 ifneq 
($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),)
@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
/usr/sbin/usb_modeswitch_dispatcher)
+   @$(call install_alternative, usb-modeswitch, 0, 0, 0644, \
+   /etc/usb_modeswitch.conf)
 endif
 ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
-- 
2.11.0

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] usb-modeswitch-data: version bump 20160803 -> 20170205

2017-04-12 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/usb-modeswitch-data.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
index a7c7be6a0..4253d3b9d 100644
--- a/rules/usb-modeswitch-data.make
+++ b/rules/usb-modeswitch-data.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH_DATA) += usb-modeswitch-data
 #
 # Paths and names
 #
-USB_MODESWITCH_DATA_VERSION:= 20160803
-USB_MODESWITCH_DATA_MD5:= acc927e44827837eb23b2a7980b38a35
+USB_MODESWITCH_DATA_VERSION:= 20170205
+USB_MODESWITCH_DATA_MD5:= 0cc107cd0c4c83df0d9400c999e21dfd
 USB_MODESWITCH_DATA:= 
usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
 USB_MODESWITCH_DATA_SUFFIX := tar.bz2
 USB_MODESWITCH_DATA_URL:= 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] usb-modeswitch: version bump 2.4.0 -> 2.5.0

2017-04-12 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/usb-modeswitch.make | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index ae2891dfe..0db10dabc 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION := 2.4.0
-USB_MODESWITCH_MD5 := 6e1640db47768bb9012f91b7593116ef
+USB_MODESWITCH_VERSION := 2.5.0
+USB_MODESWITCH_MD5 := 38ad5c9d70e06227a00361bdc2b1e568
 USB_MODESWITCH := usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX  := tar.bz2
 USB_MODESWITCH_URL := 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
@@ -36,6 +36,7 @@ USB_MODESWITCH_CONF_TOOL  := NO
 USB_MODESWITCH_MAKE_ENV:= $(CROSS_ENV)
 USB_MODESWITCH_MAKE_OPT:= $(CROSS_ENV_PROGS)
 USB_MODESWITCH_INSTALL_OPT := \
+   DESTDIR=$(USB_MODESWITCH_PKGDIR) \
UDEVDIR=$(USB_MODESWITCH_PKGDIR)/usr/lib/udev \
install
 
@@ -68,6 +69,8 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
 ifneq 
($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),)
@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
/usr/sbin/usb_modeswitch_dispatcher)
+   @$(call install_copy, usb-modeswitch, 0, 0, 0644, -, \
+   /etc/usb_modeswitch.conf)
 endif
 ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] ppp: version bump 2.4.5 -> 2.4.7

2017-04-12 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 Changes:
 - v2: Add forgotten 0030-no_crypt_hack.patch 

 Note: patches were not refreshed and renumbered as it
 would make review more difficult. I'm ready to send
 v3, eventually. 

 patches/ppp-2.4.5/0001-git-20100307.patch  | 134 -
 patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch   |  21 ---
 patches/ppp-2.4.5/0004-use_system_logwtmp.patch|  28 
 patches/ppp-2.4.5/0005-update_if_pppol2tp.patch|  61 
 .../ppp-2.4.5/0006-dont-exit-pado-timeout.patch|  50 ---
 patches/ppp-2.4.5/0007-fix_warnings.patch  |  38 -
 patches/ppp-2.4.5/0008-man_syntax_errors.patch |  63 
 patches/ppp-2.4.5/0013-documentation_typos.patch   |  95 
 patches/ppp-2.4.5/0015-fix_null_pppdb.patch|  35 -
 patches/ppp-2.4.5/0024-radius_enanchements.patch   | 166 -
 ...Remove-old-version-of-Linux-if_pppol2tp.h.patch | 104 -
 .../0003-adaptive_echos.patch  |   0
 .../0009-makefiles_cleanup.patch   |   0
 .../0010-always_setsid.patch   |   0
 .../0011-close_dev_ppp.patch   |   0
 .../{ppp-2.4.5 => ppp-2.4.7}/0012-chat_man.patch   |   0
 .../0014-fix_linkpidfile.patch |   0
 .../0016-pppdump_use_zlib.patch|   0
 .../0017-pppoatm_resolver_light.patch  |   0
 .../0018-pppoatm_cleanup.patch |   0
 .../0019-pppoe_noads.patch |   0
 .../0020-readable_connerrs.patch   |   0
 .../0021-011_scripts_redialer.diff.patch   |   0
 .../0022-cifdefroute.dif.patch |   0
 .../0023-ppp-2.3.11-oedod.dif.patch|   0
 .../{ppp-2.4.5 => ppp-2.4.7}/0025-radius_mtu.patch |   0
 .../0026-018_ip-up_option.diff.patch   |   0
 .../0027-ppp-2.4.2-stripMSdomain.patch |   0
 .../0028-setenv_call_file.patch|   0
 .../0029-010_scripts_README.diff.patch |   0
 .../0030-no_crypt_hack.patch   |  24 ++-
 .../0031-resolv.conf_no_log.patch  |   0
 .../{ppp-2.4.5 => ppp-2.4.7}/0032-zzz_config.patch |   5 +-
 .../0033-pppd-make-makefile-sysroot-aware.patch|   0
 ...-make-the-self-made-configure-cross-aware.patch |   0
 .../0035-use-CPPFLAGS-when-compiling.patch |   0
 patches/{ppp-2.4.5 => ppp-2.4.7}/series|  11 --
 rules/ppp.make |   4 +-
 38 files changed, 21 insertions(+), 818 deletions(-)

diff --git a/patches/ppp-2.4.5/0001-git-20100307.patch 
b/patches/ppp-2.4.5/0001-git-20100307.patch
deleted file mode 100644
index d0d0e5b4a..0
--- a/patches/ppp-2.4.5/0001-git-20100307.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Marco d'Itri <m...@linux.it>
-Date: Wed, 25 Jan 2012 19:14:26 +0100
-Subject: [PATCH] git-20100307
-

- pppd/lcp.c   |   28 +++-
- pppd/plugins/pppol2tp/Makefile.linux |2 +-
- pppd/plugins/rp-pppoe/plugin.c   |4 ++--
- pppd/pppd.8  |8 
- 4 files changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/lcp.c b/pppd/lcp.c
-index 5c77490..8ed2778 100644
 a/pppd/lcp.c
-+++ b/pppd/lcp.c
-@@ -397,21 +397,29 @@ lcp_close(unit, reason)
- char *reason;
- {
- fsm *f = _fsm[unit];
-+int oldstate;
- 
- if (phase != PHASE_DEAD && phase != PHASE_MASTER)
-   new_phase(PHASE_TERMINATE);
--if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
-+
-+if (f->flags & DELAYED_UP) {
-+  untimeout(lcp_delayed_up, f);
-+  f->state = STOPPED;
-+}
-+oldstate = f->state;
-+
-+fsm_close(f, reason);
-+if (oldstate == STOPPED && f->flags & 
(OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) {
-   /*
-* This action is not strictly according to the FSM in RFC1548,
-* but it does mean that the program terminates if you do a
--   * lcp_close() in passive/silent mode when a connection hasn't
--   * been established.
-+   * lcp_close() when a connection hasn't been established
-+   * because we are in passive/silent mode or because we have
-+   * delayed the fsm_lowerup() call and it hasn't happened yet.
-*/
--  f->state = CLOSED;
-+  f->flags &= ~DELAYED_UP;
-   lcp_finished(f);
--
--} else
--  fsm_close(f, reason);
-+}
- }
- 
- 
-@@ -453,9 +461,10 @@ lcp_lowerdown(unit)
- {
- fsm *f = _fsm[unit];
- 
--if (f->flags & DELAYED_UP)
-+if (f->flags & DELAYED_UP) {
-   f->flags &= ~DELAYED_UP;
--else
-+  untimeout(lcp_delayed_up, f);
-+} else
-   fsm_lowerdown(_fsm[unit]);
- }
- 
-@@ -489,6 +498,7 @@ lcp_input(unit, p, len)
- 
- if (f->fl

Re: [ptxdist] /usr merge

2017-04-12 Thread Ladislav Michl 
On Wed, Apr 12, 2017 at 11:24:35AM +0200, Michael Olbrich wrote:
> On Wed, Apr 12, 2017 at 10:27:30AM +0200, Enrico Weigelt, metux IT consult 
> wrote:
> > On 11.04.2017 12:07, Michael Olbrich wrote:
> > > I've just pushed a large series of commits for /usr merge. This means that
> > > /bin, /sbin and /lib are now symlinks to the corresponding directories in
> > > /usr. All files are installed accordingly.
> > 
> > Just curious: what's the actual problem to solve ?
> 
> The issues below.
> 
> > For my embedded projects, I haven't had an actual usecase for having
> > them separated, but on server systems lots of them over the past 20yrs.
> > 
> > Note that this separation indeed has serious reaons: separating the
> > base system (IOW: everything required to boot up at least to single
> > user mode and mount /usr - whereever it might come from). Most of the
> > practical usecases might be obsolete now (eg. storage is so cheap that
> > people rarely have the need to share /usr within clusters, etc), but
> > still there're lots of systems out there relying on that (maybe quite
> > irrelevant to ptxdist, but certainly for standard like Debian)
> > 
> > I'm personally agnostic to that, but I've already seen such setups
> > (eg. having /usr on separate SDcard) in embedded systems. So, it seems
> > better if that remains configurable.

That's also seen on many consumer electronic devices, but given poor
quality (hack until it works and then it's done), I wouldn't take it
as any measure.

Btw, this is quite a nice summary:
http://lists.busybox.net/pipermail/busybox/2010-December/074114.html

[snip]
> > I really have a bad feeling about such magic in existing commands,
> > which now suddenly change semantics.
> 
> That depends on your definition of changed semantics. After all, the files
> are still reachable at the specified path.
> 
> > At least that should be configurable.
> 
> Doing that is a lot of work. Because that only makes sense, if a separate
> /usr _really_ works. And that is more than making the recent changes
> optional. It starts with making sure that nothing outside /usr needs
> anything in /usr and continues with a clear concept of what should be
> possible without /usr mounted.
> I certainly don't have the time to do the initial work or maintain this
> longterm.
> 
> We have quite a few contributors that add new packages and keep packages up
> to date. But I'm the only one that actually works on the core stuff.
> So unless someone steps up to do this including the maintenance, it's not
> going to happen.

...and also does not need to happen ;-)
Anyway (and back to more constructive note), I updated and tested all my five
configurations and didn't find any issues. Nice work!

Thanks,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] networkmanager: version bump 1.6.0 -> 1.6.2

2017-04-05 Thread Ladislav Michl 
Also install libnm-ppp-plugin as ppp support was modularized in 1.6.0
and fix config options, so $(PPP_SHARED_INST_PATH) gets expanded.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 Changes:
 v2 - as := was used for assignment, $(PPP_SHARED_INST_PATH) evalueated
  empty and networkmanager configure scripts used default path
  /usr/lib/pppd/2.4.5 

 rules/networkmanager.make | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 90654d8d2..1b522f3b7 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.6.0
-NETWORKMANAGER_MD5 := ccdac1d03133a59065cbb93a09fa54b0
+NETWORKMANAGER_VERSION := 1.6.2
+NETWORKMANAGER_MD5 := 89c975afe19fbac854191edb6e9bcd3b
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
 NETWORKMANAGER_URL := 
https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
@@ -33,7 +33,7 @@ NETWORKMANAGER_DIR:= $(BUILDDIR)/$(NETWORKMANAGER)
 # autoconf
 #
 NETWORKMANAGER_CONF_TOOL := autoconf
-NETWORKMANAGER_CONF_OPT := \
+NETWORKMANAGER_CONF_OPT = \
$(CROSS_AUTOCONF_USR) \
--disable-static \
--enable-shared \
@@ -210,6 +210,7 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN
@$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-wwan)
 endif
 ifdef PTXCONF_NETWORKMANAGER_PPP
+   @$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-ppp-plugin)
@$(call install_copy, networkmanager, 0, 0, 0644, -, 
$(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
 endif
@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] ppp: version bump 2.4.5 -> 2.4.7

2017-04-05 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 Note: patches were not refreshed and renumbered as it
 would make review more difficult. I'm ready to send
 v2, eventually. 

 patches/ppp-2.4.5/0001-git-20100307.patch  | 134 -
 patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch   |  21 ---
 patches/ppp-2.4.5/0004-use_system_logwtmp.patch|  28 
 patches/ppp-2.4.5/0005-update_if_pppol2tp.patch|  61 
 .../ppp-2.4.5/0006-dont-exit-pado-timeout.patch|  50 ---
 patches/ppp-2.4.5/0007-fix_warnings.patch  |  38 -
 patches/ppp-2.4.5/0008-man_syntax_errors.patch |  63 
 patches/ppp-2.4.5/0013-documentation_typos.patch   |  95 
 patches/ppp-2.4.5/0015-fix_null_pppdb.patch|  35 -
 patches/ppp-2.4.5/0024-radius_enanchements.patch   | 166 -
 patches/ppp-2.4.5/0030-no_crypt_hack.patch |  62 
 ...Remove-old-version-of-Linux-if_pppol2tp.h.patch | 104 -
 .../0003-adaptive_echos.patch  |   0
 .../0009-makefiles_cleanup.patch   |   0
 .../0010-always_setsid.patch   |   0
 .../0011-close_dev_ppp.patch   |   0
 .../{ppp-2.4.5 => ppp-2.4.7}/0012-chat_man.patch   |   0
 .../0014-fix_linkpidfile.patch |   0
 .../0016-pppdump_use_zlib.patch|   0
 .../0017-pppoatm_resolver_light.patch  |   0
 .../0018-pppoatm_cleanup.patch |   0
 .../0019-pppoe_noads.patch |   0
 .../0020-readable_connerrs.patch   |   0
 .../0021-011_scripts_redialer.diff.patch   |   0
 .../0022-cifdefroute.dif.patch |   0
 .../0023-ppp-2.3.11-oedod.dif.patch|   0
 .../{ppp-2.4.5 => ppp-2.4.7}/0025-radius_mtu.patch |   0
 .../0026-018_ip-up_option.diff.patch   |   0
 .../0027-ppp-2.4.2-stripMSdomain.patch |   0
 .../0028-setenv_call_file.patch|   0
 .../0029-010_scripts_README.diff.patch |   0
 .../0031-resolv.conf_no_log.patch  |   0
 .../{ppp-2.4.5 => ppp-2.4.7}/0032-zzz_config.patch |   5 +-
 .../0033-pppd-make-makefile-sysroot-aware.patch|   0
 ...-make-the-self-made-configure-cross-aware.patch |   0
 .../0035-use-CPPFLAGS-when-compiling.patch |   0
 patches/{ppp-2.4.5 => ppp-2.4.7}/series|  11 --
 rules/ppp.make |   4 +-
 38 files changed, 4 insertions(+), 873 deletions(-)

diff --git a/patches/ppp-2.4.5/0001-git-20100307.patch 
b/patches/ppp-2.4.5/0001-git-20100307.patch
deleted file mode 100644
index d0d0e5b4a..0
--- a/patches/ppp-2.4.5/0001-git-20100307.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Marco d'Itri <m...@linux.it>
-Date: Wed, 25 Jan 2012 19:14:26 +0100
-Subject: [PATCH] git-20100307
-

- pppd/lcp.c   |   28 +++-
- pppd/plugins/pppol2tp/Makefile.linux |2 +-
- pppd/plugins/rp-pppoe/plugin.c   |4 ++--
- pppd/pppd.8  |8 
- 4 files changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/lcp.c b/pppd/lcp.c
-index 5c77490..8ed2778 100644
 a/pppd/lcp.c
-+++ b/pppd/lcp.c
-@@ -397,21 +397,29 @@ lcp_close(unit, reason)
- char *reason;
- {
- fsm *f = _fsm[unit];
-+int oldstate;
- 
- if (phase != PHASE_DEAD && phase != PHASE_MASTER)
-   new_phase(PHASE_TERMINATE);
--if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
-+
-+if (f->flags & DELAYED_UP) {
-+  untimeout(lcp_delayed_up, f);
-+  f->state = STOPPED;
-+}
-+oldstate = f->state;
-+
-+fsm_close(f, reason);
-+if (oldstate == STOPPED && f->flags & 
(OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) {
-   /*
-* This action is not strictly according to the FSM in RFC1548,
-* but it does mean that the program terminates if you do a
--   * lcp_close() in passive/silent mode when a connection hasn't
--   * been established.
-+   * lcp_close() when a connection hasn't been established
-+   * because we are in passive/silent mode or because we have
-+   * delayed the fsm_lowerup() call and it hasn't happened yet.
-*/
--  f->state = CLOSED;
-+  f->flags &= ~DELAYED_UP;
-   lcp_finished(f);
--
--} else
--  fsm_close(f, reason);
-+}
- }
- 
- 
-@@ -453,9 +461,10 @@ lcp_lowerdown(unit)
- {
- fsm *f = _fsm[unit];
- 
--if (f->flags & DELAYED_UP)
-+if (f->flags & DELAYED_UP) {
-   f->flags &= ~DELAYED_UP;
--else
-+  untimeout(lcp_delayed_up, f);
-+} else
-   fsm_lowerdown(_fsm[unit]);
- }
- 
-@@ -489,6 +498,7 @@ lcp_input(unit, p, len)
- 
- if (f->flags & DELAYED_UP) {
-   f->flags &= ~DELAYED_UP;
-+  un

[ptxdist] [PATCH] networkmanager: version bump 1.6.0 -> 1.6.2

2017-04-05 Thread Ladislav Michl 
Also install libnm-ppp-plugin as ppp support was modularized in 1.6.0.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/networkmanager.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 90654d8d2..7508f3a02 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.6.0
-NETWORKMANAGER_MD5 := ccdac1d03133a59065cbb93a09fa54b0
+NETWORKMANAGER_VERSION := 1.6.2
+NETWORKMANAGER_MD5 := 89c975afe19fbac854191edb6e9bcd3b
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
 NETWORKMANAGER_URL := 
https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
@@ -210,6 +210,7 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN
@$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-wwan)
 endif
 ifdef PTXCONF_NETWORKMANAGER_PPP
+   @$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-ppp-plugin)
@$(call install_copy, networkmanager, 0, 0, 0644, -, 
$(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
 endif
@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] v4l-utils: add instalation options for all available utilities

2017-04-05 Thread Ladislav Michl 
Also sort alphabetically.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/v4l-utils.in   | 54 +++-
 rules/v4l-utils.make | 45 +++
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index 1dff76fdd..b73032c10 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -30,35 +30,63 @@ config V4L_UTILS_LIBV4LCONVERT
bool
prompt "install libv4lconvert"
 
+config V4L_UTILS_CECCOMPLIANCE
+   bool
+   prompt "install cec-compliance"
+
+config V4L_UTILS_CECCTL
+   bool
+   prompt "install cec-ctl"
+
+config V4L_UTILS_CECFOLLOWER
+   bool
+   prompt "install cec-follower"
+
+config V4L_UTILS_CECFOLLOWER
+   bool
+   prompt "install cx18-ctl"
+
+config V4L_UTILS_DECODETM6000
+   bool
+   prompt "install decode_tm6000"
+
+config V4L_UTILS_IRCTL
+   bool
+   prompt "install ir-ctl"
+
+config V4L_UTILS_IRKEYTABLE
+   bool
+   prompt "install ir-keytable"
+
+config V4L_UTILS_IVTVCTL
+   bool
+   prompt "install ivtv-ctl"
+
 config V4L_UTILS_MEDIACTL
bool
prompt "install media-ctl"
 
+config V4L_UTILS_RDSCTL
+   bool
+   prompt "install rds-ctl"
+
 config V4L_UTILS_V4L2COMPLIANCE
bool
select V4L_UTILS_LIBV4L2
-   prompt "install v4l2compliance"
+   prompt "install v4l2-compliance"
 
 config V4L_UTILS_V4L2DBG
bool
select V4L_UTILS_LIBV4L2
-   prompt "install v4l-dbg"
+   prompt "install v4l2-dbg"
 
 config V4L_UTILS_V4L2CTL
bool
select V4L_UTILS_LIBV4L2
-   prompt "install v4l-ctl"
+   prompt "install v4l2-ctl"
 
-config V4L_UTILS_CECCTL
+config V4L_UTILS_V4L2SYSFSPATH
bool
-   prompt "install cec-ctl"
-
-config V4L_UTILS_CECCOMPLIANCE
-   bool
-   prompt "install cec-compliance"
-
-config V4L_UTILS_CECFOLLOWER
-   bool
-   prompt "install cec-follower"
+   prompt "install v4l2-sysfs-path"
 
 endif
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index 5c94fdd01..ba3a14568 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -64,35 +64,48 @@ endif
 ifdef PTXCONF_V4L_UTILS_LIBV4LCONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4lconvert)
 endif
-
+ifdef PTXCONF_V4L_UTILS_CECCOMPLIANCE
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-compliance)
+endif
+ifdef PTXCONF_V4L_UTILS_CECCTL
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-ctl)
+endif
+ifdef PTXCONF_V4L_UTILS_CECFOLLOWER
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-follower)
+endif
+ifdef PTXCONF_V4L_UTILS_CX18CTL
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cx18-ctl)
+endif
+ifdef PTXCONF_V4L_UTILS_DECODETM6000
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/decode_tm6000)
+endif
+ifdef PTXCONF_V4L_UTILS_IRCTL
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/ir-ctl)
+endif
+ifdef PTXCONF_V4L_UTILS_IRKEYTABLE
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/ir-keytable)
+endif
+ifdef PTXCONF_V4L_UTILS_IVTVCTL
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/ivtv-ctl)
+endif
 ifdef PTXCONF_V4L_UTILS_MEDIACTL
@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/media-ctl)
 endif
-
+ifdef PTXCONF_V4L_UTILS_RDSCTL
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/rds-ctl)
+endif
 ifdef PTXCONF_V4L_UTILS_V4L2COMPLIANCE
@$(call install_copy, v4l-utils, 0, 0, 0755, -, 
/usr/bin/v4l2-compliance)
 endif
-
 ifdef PTXCONF_V4L_UTILS_V4L2DBG
@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/sbin/v4l2-dbg)
 endif
-
 ifdef PTXCONF_V4L_UTILS_V4L2CTL
@$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/v4l2-ctl)
 endif
-
-ifdef PTXCONF_V4L_UTILS_CECCTL
-   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-ctl)
+ifdef PTXCONF_V4L_UTILS_V4L2SYSFSPATH
+   @$(call install_copy, v4l-utils, 0, 0, 0755, -, 
/usr/bin/v4l2-sysfs-path)
 endif
-
-ifdef PTXCONF_V4L_UTILS_CECCOMPLIANCE
-   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-compliance)
-endif
-
-ifdef PTXCONF_V4L_UTILS_CECFOLLOWER
-   @$(call install_copy, v4l-utils, 0, 0, 0755, -, /usr/bin/cec-follower)
-endif
-
@$(call install_finish, v4l-utils)
 
@$(call touch)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] nettle: Add alternate url

2017-01-09 Thread Ladislav Michl 
On Mon, Jan 09, 2017 at 02:33:04PM +0100, Michael Olbrich wrote:
> On Sun, Jan 08, 2017 at 08:57:29PM +0100, Ladislav Michl wrote:
> > As lysator.liu.se is currently down, add GNU mirror.
> 
> Works (again?) for me. Applied anyways.

Indeed, works for me too, now. I guess someone come to the work
on Monday :-)

Thank you,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] nettle: Add alternate url

2017-01-08 Thread Ladislav Michl 
As lysator.liu.se is currently down, add GNU mirror.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>

diff --git a/rules/nettle.make b/rules/nettle.make
index 2d240e657..59df66e15 100644
--- a/rules/nettle.make
+++ b/rules/nettle.make
@@ -20,12 +20,15 @@ NETTLE_VERSION  := 3.3
 NETTLE_MD5 := 10f969f78a463704ae73529978148dbe
 NETTLE := nettle-$(NETTLE_VERSION)
 NETTLE_SUFFIX  := tar.gz
-NETTLE_URL := 
http://www.lysator.liu.se/~nisse/archive/$(NETTLE).$(NETTLE_SUFFIX)
 NETTLE_SOURCE  := $(SRCDIR)/$(NETTLE).$(NETTLE_SUFFIX)
 NETTLE_DIR := $(BUILDDIR)/$(NETTLE)
 NETTLE_LICENSE := GPL-2.0+
 NETTLE_MAKE_PAR := NO
 
+NETTLE_URL := \
+   http://www.lysator.liu.se/~nisse/archive/$(NETTLE).$(NETTLE_SUFFIX) \
+   $(call ptx/mirror, GNU, nettle/$(NETTLE).$(NETTLE_SUFFIX))
+
 # 
 # Prepare
 # 

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [RFC] ptxd_make_get_http: Specify the username and password

2017-01-08 Thread Ladislav Michl 
On Sun, Jan 08, 2017 at 01:10:14AM +0100, Roland Hieber wrote:
> Hm, curl loads URLs in the form http://user:password@server/path just
> fine for me (and ptxd_make_get() doesn't seem to strip that part, so I
> guess it should also be usable in the Makefiles). The only disadvantage
> in that case is that the username cannot contain a colon, but neither
> can it in your implementation :) So I would change it to take a separate
> "user" and "password" parameter in order to enhance the usefullness of
> this option.

Well, that doesn't improve anything as curl parameter is:
--user=:
so this problem remains, it does only improve situation for wget.
But as wget also accepts credentials in url, I'll forget this
until someone needs colon in username.

ladis

>  - Roland
> 
> On 07.01.2017 22:58, Ladislav Michl wrote:
> > Hi there,
> > 
> > I need to pass username and password to download mercurial snapshot from
> > server, so something like this now works:
> > package_URL := 
> > https://mercurial.site.com/hg/package/archive/$(package_VERSION).$(package_SUFFIX);user=:
> > 
> > Is it acceptable to support it in upstream PTXdist?
> > (it could be probably rewritten some nicer way, but I'm not too good at 
> > shell scripting)
> > 
> > ladis
> > 
> > diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> > index 2bac97817..e392e8b0c 100644
> > --- a/scripts/lib/ptxd_make_get.sh
> > +++ b/scripts/lib/ptxd_make_get.sh
> > @@ -25,6 +25,7 @@ ptxd_make_get_http() {
> > # scan for valid options
> > #
> > while [ ${#} -ne 0 ]; do
> > +   local cred
> > local opt="${1}"
> > shift
> >  
> > @@ -45,6 +46,13 @@ ptxd_make_get_http() {
> > curl_opts[${#curl_opts[@]}]="--cookie"
> > curl_opts[${#curl_opts[@]}]="${opt#cookie:}"
> > ;;
> > +   user=*)
> > +   cred="${opt#user=}"
> > +   cred=(${cred//:/ })
> > +   opts[${#opts[@]}]="--user=${cred[0]}"
> > +   opts[${#opts[@]}]="--password=${cred[1]}"
> > +   curl_opts[${#curl_opts[@]}]="${opt#user=}"
> > +   ;;
> > *)
> > ptxd_bailout "invalid option '${opt}' to 
> > ${FUNCNAME}"
> > ;;
> > 
> > ___
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [RFC] ptxd_make_get_http: Specify the username and password

2017-01-07 Thread Ladislav Michl 
Hi there,

I need to pass username and password to download mercurial snapshot from
server, so something like this now works:
package_URL := 
https://mercurial.site.com/hg/package/archive/$(package_VERSION).$(package_SUFFIX);user=:

Is it acceptable to support it in upstream PTXdist?
(it could be probably rewritten some nicer way, but I'm not too good at shell 
scripting)

ladis

diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index 2bac97817..e392e8b0c 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -25,6 +25,7 @@ ptxd_make_get_http() {
# scan for valid options
#
while [ ${#} -ne 0 ]; do
+   local cred
local opt="${1}"
shift
 
@@ -45,6 +46,13 @@ ptxd_make_get_http() {
curl_opts[${#curl_opts[@]}]="--cookie"
curl_opts[${#curl_opts[@]}]="${opt#cookie:}"
;;
+   user=*)
+   cred="${opt#user=}"
+   cred=(${cred//:/ })
+   opts[${#opts[@]}]="--user=${cred[0]}"
+   opts[${#opts[@]}]="--password=${cred[1]}"
+   curl_opts[${#curl_opts[@]}]="${opt#user=}"
+   ;;
*)
ptxd_bailout "invalid option '${opt}' to 
${FUNCNAME}"
;;

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCHv2] networkmanager: version bump 1.2.2 -> 1.4.2

2016-12-19 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 changes:
 -v2: remove series file, handle new configure options

 ...-sleep-monitor-upower-add-missing-include.patch | 26 --
 patches/NetworkManager-1.2.2/series|  4 
 rules/networkmanager.in|  5 +
 rules/networkmanager.make  | 22 +-
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git 
a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
 
b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
deleted file mode 100644
index 425974c..000
--- 
a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbr...@pengutronix.de>
-Date: Wed, 18 May 2016 10:16:15 +0200
-Subject: [PATCH] sleep-monitor-upower: add missing include
-
-Otherwise building fails with:
-
-nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or 
'...' before 'nm_sleep_monitor_get'
-nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or 
'...' before '(' token
-
-Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>

- src/nm-sleep-monitor-upower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-index 5f0ff24552b2..8d0719039ccf 100644
 a/src/nm-sleep-monitor-upower.c
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -24,6 +24,7 @@
- #include 
- 
- #include "nm-core-internal.h"
-+#include "NetworkManagerUtils.h"
- 
- #include "nm-sleep-monitor.h"
- 
diff --git a/patches/NetworkManager-1.2.2/series 
b/patches/NetworkManager-1.2.2/series
deleted file mode 100644
index d288508..000
--- a/patches/NetworkManager-1.2.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-sleep-monitor-upower-add-missing-include.patch
-# ed83c6f2cf812e4453d3644fb7eafaaf  - git-ptx-patches magic
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 85b1e91..36fe00a 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -16,6 +16,7 @@ menuconfig NETWORKMANAGER
select LIBNDP
select LIBNEWT  if NETWORKMANAGER_NMTUI
select LIBNL3
+   select LIBSOUP  if NETWORKMANAGER_CONCHECK
select LIBUUID
select MODEMMANAGER if NETWORKMANAGER_WWAN
select PPP  if NETWORKMANAGER_PPP
@@ -80,6 +81,10 @@ config NETWORKMANAGER_PPP
bool
prompt "enable ppp support"
 
+config NETWORKMANAGER_CONCHECK
+   bool
+   prompt "enable connectivity checking support"
+
 config NETWORKMANAGER_EXAMPLES
bool
prompt "install examples for Network Manager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 3e4d2ac..f3a9596 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.2.2
-NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035
+NETWORKMANAGER_VERSION := 1.4.2
+NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
-NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := 
https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE  := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
 
@@ -35,8 +35,12 @@ NETWORKMANAGER_DIR   := $(BUILDDIR)/$(NETWORKMANAGER)
 NETWORKMANAGER_CONF_TOOL := autoconf
 NETWORKMANAGER_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+   --enable-silent-rules \
+   --disable-maintainer-mode \
+   --disable-dependency-tracking \
--disable-static \
--enable-shared \
+   --enable-fast-install \
--disable-nls \
--disable-rpath \
--disable-ifcfg-rh \
@@ -47,15 +51,19 @@ NETWORKMANAGER_CONF_OPT := \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \
--disable-introspection \
--disable-qt \
-   --disable-wimax \
+   --disable-teamdctl \
+   --disable-json-validation \
--disable-polkit \
--disable-modify-system \
--$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
--disable-bluez5-dun \
-   --disable-concheck \
+   --$(call ptx/endis,PTXCONF_NETWORKMANAGER_CONCHECK)-concheck \
--enable-more-warnings \
--disable-more-asserts \
--disable-more-logging \
+   --d

[ptxdist] [PATCHv2] usb-modeswitch: version bump 2.3.0 -> 2.4.0

2016-12-19 Thread Ladislav Michl 
Update also usb-modeswitch-data to version 20160803,
as it needs new features from usb-modeswitch-2.4.0

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 changes:
 - v2: updated md5sum (unnoticed previously as I overlooked
   private usb-modeswitch.make rule in my project)

 rules/usb-modeswitch-data.make | 4 ++--
 rules/usb-modeswitch.make  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
index 1e3b86f..14f026a 100644
--- a/rules/usb-modeswitch-data.make
+++ b/rules/usb-modeswitch-data.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH_DATA) += usb-modeswitch-data
 #
 # Paths and names
 #
-USB_MODESWITCH_DATA_VERSION:= 20160112
-USB_MODESWITCH_DATA_MD5:= 040d11138fc0a61b980d704ac3b4547f
+USB_MODESWITCH_DATA_VERSION:= 20160803
+USB_MODESWITCH_DATA_MD5:= acc927e44827837eb23b2a7980b38a35
 USB_MODESWITCH_DATA:= 
usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
 USB_MODESWITCH_DATA_SUFFIX := tar.bz2
 USB_MODESWITCH_DATA_URL:= 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 95149a3..7210ed9 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION := 2.3.0
-USB_MODESWITCH_MD5 := 7faf7dccd50b3ca8aaa16fcb5bf0dc2f
+USB_MODESWITCH_VERSION := 2.4.0
+USB_MODESWITCH_MD5 := 6e1640db47768bb9012f91b7593116ef
 USB_MODESWITCH := usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX  := tar.bz2
 USB_MODESWITCH_URL := 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
-- 
2.10.2


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libqmi: version bump 1.16.0 -> 1.16.2

2016-12-13 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/libqmi.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libqmi.make b/rules/libqmi.make
index 4c7b795..0487148 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
 #
 # Paths and names
 #
-LIBQMI_VERSION := 1.16.0
-LIBQMI_MD5 := 4970c110f160b33637a3515004c637b2
+LIBQMI_VERSION := 1.16.2
+LIBQMI_MD5 := 052318439128e428b1a41e75a605d91f
 LIBQMI := libqmi-$(LIBQMI_VERSION)
 LIBQMI_SUFFIX  := tar.xz
 LIBQMI_URL := 
http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
-- 
2.10.2


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] usb-modeswitch: version bump 2.3.0 -> 2.4.0

2016-12-13 Thread Ladislav Michl 
Update also usb-modeswitch-data to version 20160803,
as it needs new features from usb-modeswitch-2.4.0

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/usb-modeswitch-data.make | 4 ++--
 rules/usb-modeswitch.make  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
index 1e3b86f..14f026a 100644
--- a/rules/usb-modeswitch-data.make
+++ b/rules/usb-modeswitch-data.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH_DATA) += usb-modeswitch-data
 #
 # Paths and names
 #
-USB_MODESWITCH_DATA_VERSION:= 20160112
-USB_MODESWITCH_DATA_MD5:= 040d11138fc0a61b980d704ac3b4547f
+USB_MODESWITCH_DATA_VERSION:= 20160803
+USB_MODESWITCH_DATA_MD5:= acc927e44827837eb23b2a7980b38a35
 USB_MODESWITCH_DATA:= 
usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
 USB_MODESWITCH_DATA_SUFFIX := tar.bz2
 USB_MODESWITCH_DATA_URL:= 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 95149a3..a372464 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION := 2.3.0
+USB_MODESWITCH_VERSION := 2.4.0
 USB_MODESWITCH_MD5 := 7faf7dccd50b3ca8aaa16fcb5bf0dc2f
 USB_MODESWITCH := usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX  := tar.bz2
-- 
2.10.2


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager-openvpn: version bump 1.2.2 -> 1.2.6

2016-12-13 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/networkmanager-openvpn.make | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/networkmanager-openvpn.make 
b/rules/networkmanager-openvpn.make
index 24368ff..d6b2397 100644
--- a/rules/networkmanager-openvpn.make
+++ b/rules/networkmanager-openvpn.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += 
networkmanager-openvpn
 #
 # Paths and names
 #
-NETWORKMANAGER_OPENVPN_VERSION := 1.2.2
-NETWORKMANAGER_OPENVPN_MD5 := f7889d7530f226afd3ef110501a68af4
+NETWORKMANAGER_OPENVPN_VERSION := 1.2.6
+NETWORKMANAGER_OPENVPN_MD5 := 47ed9b6c43ca364976a15e84207687df
 NETWORKMANAGER_OPENVPN := 
NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
 NETWORKMANAGER_OPENVPN_SUFFIX  := tar.xz
 NETWORKMANAGER_OPENVPN_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
@@ -39,8 +39,7 @@ NETWORKMANAGER_OPENVPN_CONF_OPT := \
--disable-nls \
--enable-more-warnings \
--without-libnm-glib \
-   --without-gnome \
-   --without-tests
+   --without-gnome
 
 # 
 # Target-Install
-- 
2.10.2


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager: version bump 1.2.2 -> 1.4.2

2016-12-13 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 ...-sleep-monitor-upower-add-missing-include.patch | 26 --
 rules/networkmanager.make  |  6 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git 
a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
 
b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
deleted file mode 100644
index 425974c..000
--- 
a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbr...@pengutronix.de>
-Date: Wed, 18 May 2016 10:16:15 +0200
-Subject: [PATCH] sleep-monitor-upower: add missing include
-
-Otherwise building fails with:
-
-nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or 
'...' before 'nm_sleep_monitor_get'
-nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or 
'...' before '(' token
-
-Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>

- src/nm-sleep-monitor-upower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-index 5f0ff24552b2..8d0719039ccf 100644
 a/src/nm-sleep-monitor-upower.c
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -24,6 +24,7 @@
- #include 
- 
- #include "nm-core-internal.h"
-+#include "NetworkManagerUtils.h"
- 
- #include "nm-sleep-monitor.h"
- 
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 3e4d2ac..cd06bd6 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.2.2
-NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035
+NETWORKMANAGER_VERSION := 1.4.2
+NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
-NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := 
https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE  := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
 
-- 
2.10.2


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] rsyslog: major update

2016-09-27 Thread Ladislav Michl 
Hi,

On Tue, Sep 27, 2016 at 02:35:11PM +0200, Clemens Gruber wrote:
> On Tue, Sep 27, 2016 at 08:37:58AM +0200, Michael Olbrich wrote:
> > On Mon, Sep 26, 2016 at 09:33:34PM +0200, Clemens Gruber wrote:
[snip]
...
> > > - --disable-omczmq \
> > > - --disable-omrabbitmq \
> > > - --disable-omhiredis \
> > 
> > don't remove configure options that still exist.
> 
> I removed them because they all default to disabled. Do you still want
> to keep them redundantly?

It has more to do with safety than redundancy as defaults can change
over time, so keeping explicitely disabled options is common practice
over ptxdist codebase.

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] systemd: select host-chrpath

2016-09-20 Thread Ladislav Michl 
commit 217ac8c4c1e8d9b3c653970fa8b4b6d87cfc91a1 introduced dependency on
chrpath utility, so select it as a host tool.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
diff --git a/rules/systemd.in b/rules/systemd.in
index d826b7b..86ee545 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -3,6 +3,7 @@
 menuconfig SYSTEMD
tristate
select HOST_GPERF
+   select HOST_CHRPATH
# for 'ln --relative'
select HOST_COREUTILS
select ROOTFS_RUN

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

2016-08-15 Thread Ladislav Michl 
On Mon, Aug 15, 2016 at 04:54:47PM +0200, Michael Olbrich wrote:
> On Mon, Aug 15, 2016 at 04:10:58PM +0200, Ladislav Michl wrote:
> > Just tested, error path triggered, but 'ptxdist clean root' didn't help.
> > I had to delete *.perms files manually. Is it worth better fix or is it
> > enough just change error message?
> 
> Can you try to reproduce this? Clean root should trigger targetinstall for
> all packages and new permission files should be created. For which image
> did it fail?

I built DistroKit with 2016.07 and then switched to git version. Will try to
reproduce after update to Qt-5.7.0 gets more testing.

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

2016-08-15 Thread Ladislav Michl 
On Thu, Aug 04, 2016 at 08:51:39AM +0200, Michael Olbrich wrote:
> I'm already testing it. Looks good so far. I just need to setup a test-case
> to trigger the error path before I push it.

Just tested, error path triggered, but 'ptxdist clean root' didn't help.
I had to delete *.perms files manually. Is it worth better fix or is it
enough just change error message?

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] openssh: version bump 7.2p2 ->7.3p1

2016-08-12 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
diff --git a/rules/openssh.make b/rules/openssh.make
index d9bfec2..1989163 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
 #
 # Paths and names
 #
-OPENSSH_VERSION:= 7.2p2
-OPENSSH_MD5:= 13009a9156510d8f27e752659075cced
+OPENSSH_VERSION:= 7.3p1
+OPENSSH_MD5:= dfadd9f035d38ce5d58a3bf130b86d08
 OPENSSH:= openssh-$(OPENSSH_VERSION)
 OPENSSH_SUFFIX := tar.gz
 OPENSSH_URL:= \
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] confuse: fix download url and upgrade to 3.0

2016-08-12 Thread Ladislav Michl 
Project moved to github a while ago.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
diff --git a/rules/host-libconfuse.make b/rules/host-libconfuse.make
index 26ff6be..184a172 100644
--- a/rules/host-libconfuse.make
+++ b/rules/host-libconfuse.make
@@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCONFUSE) += host-libconfuse
 HOST_LIBCONFUSE_CONF_TOOL  := autoconf
 HOST_LIBCONFUSE_CONF_OPT   := \
$(HOST_AUTOCONF) \
+   --disable-examples \
--disable-nls \
--enable-shared
 
diff --git a/rules/libconfuse.make b/rules/libconfuse.make
index d76f875..62490a5 100644
--- a/rules/libconfuse.make
+++ b/rules/libconfuse.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_LIBCONFUSE) += libconfuse
 #
 # Paths and names
 #
-LIBCONFUSE_VERSION := 2.7
-LIBCONFUSE_MD5 := 45932fdeeccbb9ef4228f1c1a25e9c8f
+LIBCONFUSE_VERSION := 3.0
+LIBCONFUSE_MD5 := bf03099ef213647451c70e54ad4b6e81
 LIBCONFUSE := confuse-$(LIBCONFUSE_VERSION)
 LIBCONFUSE_SUFFIX  := tar.gz
-LIBCONFUSE_URL := 
http://savannah.nongnu.org/download/confuse/$(LIBCONFUSE).$(LIBCONFUSE_SUFFIX)
+LIBCONFUSE_URL := 
https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION)/$(LIBCONFUSE).$(LIBCONFUSE_SUFFIX)
 LIBCONFUSE_SOURCE  := $(SRCDIR)/$(LIBCONFUSE).$(LIBCONFUSE_SUFFIX)
 LIBCONFUSE_DIR := $(BUILDDIR)/$(LIBCONFUSE)
 LIBCONFUSE_LICENSE := ISC
@@ -37,6 +37,7 @@ LIBCONFUSE_ENV:= $(CROSS_ENV)
 #
 LIBCONFUSE_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
+   --disable-examples \
--disable-nls
 
 ifdef PTXCONF_LIBCONFUSE_STATIC
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] use ^_ as separator in perms files

2016-08-03 Thread Ladislav Michl 
On Sun, Jul 31, 2016 at 11:10:37PM +0200, Ladislav Michl wrote:
> Change separator to allow ':' in filenames.

As 2016.08 should be released this month and this patch needs carefull
review and testing, I'm gently pinging anyone responsible...

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] use ^_ as separator in perms files

2016-07-31 Thread Ladislav Michl 
Change separator to allow ':' in filenames.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 Changes since v1:
  - bail out when old perm file format is found
(Note that if packets are pulled from ipkg repository, running
 'ptxdist clean root' will not help)

 rules/post/image_cpio.make |  2 +-
 rules/post/image_ext2.make |  2 +-
 rules/post/image_jffs2.make|  2 +-
 rules/post/image_squashfs.make |  2 +-
 rules/post/image_tgz.make  |  6 +++---
 rules/post/image_ubi.make  |  2 +-
 rules/post/ptxd_make_image_common.make |  2 +-
 scripts/lib/ptxd_lib_dopermissions.awk |  2 +-
 scripts/lib/ptxd_make_image_fix_permissions.sh |  6 --
 scripts/lib/ptxd_make_xpkg_common.sh   |  1 +
 scripts/lib/ptxd_make_xpkg_pkg.sh  |  9 ++---
 scripts/libptxdist.sh  | 11 +++
 12 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/rules/post/image_cpio.make b/rules/post/image_cpio.make
index 573faee..200b283 100644
--- a/rules/post/image_cpio.make
+++ b/rules/post/image_cpio.make
@@ -15,7 +15,7 @@ $(IMAGEDIR)/root.cpio: $(STATEDIR)/image_working_dir
@echo -n "Creating '$(notdir $(@))' from working dir..."
@cd $(image/work_dir) && \
( \
-   awk -F: $(DOPERMISSIONS) $(image/permissions) && \
+   awk $(DOPERMISSIONS) $(image/permissions) && \
echo "find . | cpio --quiet -H newc -o > '$(@)'" \
) | $(FAKEROOT) --
@echo "done."
diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make
index 3e3423b..0dbcafd 100644
--- a/rules/post/image_ext2.make
+++ b/rules/post/image_ext2.make
@@ -15,7 +15,7 @@ ifdef PTXCONF_IMAGE_EXT2
 $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir
@echo -n "Creating root.ext2 from working dir..."
@cd $(image/work_dir);  \
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(   \
echo -n "$(PTXCONF_SYSROOT_HOST)/bin/genext2fs ";   \
echo -n "-b $(PTXCONF_IMAGE_EXT2_SIZE) ";   \
diff --git a/rules/post/image_jffs2.make b/rules/post/image_jffs2.make
index 5e448f5..7f12883 100644
--- a/rules/post/image_jffs2.make
+++ b/rules/post/image_jffs2.make
@@ -17,7 +17,7 @@ $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir 
$(STATEDIR)/host-mtd-utils
@echo -n "(--eraseblock=$(PTXCONF_IMAGE_JFFS2_BLOCKSIZE) "
@echo "$(call remove_quotes,$(PTXCONF_IMAGE_JFFS2_EXTRA_ARGS)))"
@cd $(image/work_dir);  \
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(   \
echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.jffs2 "; \
echo -n "-d $(image/work_dir) ";\
diff --git a/rules/post/image_squashfs.make b/rules/post/image_squashfs.make
index 6d02255..69dc721 100644
--- a/rules/post/image_squashfs.make
+++ b/rules/post/image_squashfs.make
@@ -19,7 +19,7 @@ ifdef PTXCONF_IMAGE_SQUASHFS
 $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir 
$(STATEDIR)/host-squashfs-tools.install.post
@echo -n "Creating root.squashfs from working dir..."
@cd $(image/work_dir);  
\
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(   \
echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mksquashfs "; \
echo -n "$(image/work_dir) ";   
\
diff --git a/rules/post/image_tgz.make b/rules/post/image_tgz.make
index 57f69f4..bace4da 100644
--- a/rules/post/image_tgz.make
+++ b/rules/post/image_tgz.make
@@ -18,10 +18,10 @@ endif
 
 $(IMAGEDIR)/root.tgz: $(STATEDIR)/image_working_dir
@echo -n 'Creating root.tgz from working dir$(if $(IMAGE_TGZ_LABEL), 
with label "$(IMAGE_TGZ_LABEL)",)... '
-   @cd $(image/work_dir);  
\
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   @cd $(image/work_dir);  \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(

[ptxdist] js: return of spidermonkey

2016-07-28 Thread Ladislav Michl 
Commit a33ab9d2dee7c0cc727279c83e6eaf50eaba5e9e removed js with explanation
"It was in staging for a year and nobody cared."
A patch to bring it back into life was sent in February:
https://www.mail-archive.com/ptxdist@pengutronix.de/msg10388.html
(gmane is currently down) Meanwhile SpiderMonkey 45 was released.
Do we want it in PTXdist? The only package depending on js is polkit,
but that was already solved by upgrading to 0.105 - the last version
not depending on js.

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] use ^_ as separator in perms files

2016-07-28 Thread Ladislav Michl 
On Wed, Jul 27, 2016 at 12:59:39PM +0200, Michael Olbrich wrote:
> On Mon, Jul 18, 2016 at 01:22:17PM +0200, Ladislav Michl wrote:
> > Change separator to allow ':' in filenames.
> 
> I like it in general. But I think we should explicitly error out if we come
> across an old command file (NF == 1). And tell the user to run "ptxdist
> clean root" or something like that.
[snip]

Do you mean something like this (untested):

diff --git a/scripts/lib/ptxd_make_image_fix_permissions.sh 
b/scripts/lib/ptxd_make_image_fix_permissions.sh
index c1cfdba..d4bf6b0 100644
--- a/scripts/lib/ptxd_make_image_fix_permissions.sh
+++ b/scripts/lib/ptxd_make_image_fix_permissions.sh
@@ -34,6 +34,11 @@ ptxd_make_image_fix_permissions_check() {
 local ifs_orig="${IFS}"
 IFS="\x1F"
 
+# previous PTXdist versions used ":" as a separator
+if ! grep -q "${IFS}" "${ptxd_reply_perm_files[@]}"; then
+   ptxd_bailout "obsolete perm file detected, please run 'ptxdist clean 
root'"
+fi
+
 # just care about dev-nodes, for now
 egrep -h "^[n]${IFS}" "${ptxd_reply_perm_files[@]}" |
 while read kind file uid_should gid_should prm_should type major_should 
minor_should; do

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] multiple cmake build setups in one package?

2016-07-19 Thread Ladislav Michl 
On Tue, Jul 19, 2016 at 10:41:00AM +0200, Alexander Stein wrote:
> Hi,
> 
> is it possible to generate several build setups, e.g. multiple software 
> components, which requires individual cmake calls, within one ptxdist package?

Yes, you can do whatever you want in your compile target. See for example
rules/svgalib.make

> What would be a workaround if I can't do that?
> 
> Best regards,
> Alexander

regards,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] usb-modeswitch-data: new package

2016-07-18 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 Note: This package uses ':' in filenames
   (this is just a resend of the same patch sent a few months ago)

 rules/usb-modeswitch-data.in   | 10 ++
 rules/usb-modeswitch-data.make | 70 ++
 2 files changed, 80 insertions(+)
 create mode 100644 rules/usb-modeswitch-data.in
 create mode 100644 rules/usb-modeswitch-data.make

diff --git a/rules/usb-modeswitch-data.in b/rules/usb-modeswitch-data.in
new file mode 100644
index 000..ffaacda
--- /dev/null
+++ b/rules/usb-modeswitch-data.in
@@ -0,0 +1,10 @@
+## SECTION=shell_and_console
+
+config USB_MODESWITCH_DATA
+   tristate
+   prompt "usb-modeswitch-data"
+   depends on USB_MODESWITCH && UDEV
+   help
+ Device database and udev rules file for USB_ModeSwitch.
+
+# vim: set sw=8 ts=8 noet ft=kconfig:
diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
new file mode 100644
index 000..6b12898
--- /dev/null
+++ b/rules/usb-modeswitch-data.make
@@ -0,0 +1,70 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Ladislav Michl <la...@linux-mips.org>
+#
+# 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_USB_MODESWITCH_DATA) += usb-modeswitch-data
+
+#
+# Paths and names
+#
+USB_MODESWITCH_DATA_VERSION:= 20160112
+USB_MODESWITCH_DATA_MD5:= 040d11138fc0a61b980d704ac3b4547f
+USB_MODESWITCH_DATA:= 
usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
+USB_MODESWITCH_DATA_SUFFIX := tar.bz2
+USB_MODESWITCH_DATA_URL:= 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
+USB_MODESWITCH_DATA_SOURCE := 
$(SRCDIR)/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
+USB_MODESWITCH_DATA_DIR:= $(BUILDDIR)/$(USB_MODESWITCH_DATA)
+USB_MODESWITCH_DATA_LICENSE:= GPL-2.0
+
+
+# 
+# Nothing to Compile
+# 
+$(STATEDIR)/usb-modeswitch-data.compile:
+   @$(call targetinfo)
+   @$(call touch)
+
+
+# 
+# Prepare
+# 
+
+USB_MODESWITCH_DATA_CONF_TOOL  := NO
+USB_MODESWITCH_DATA_MAKE_ENV   := $(CROSS_ENV)
+USB_MODESWITCH_DATA_INSTALL_OPT:= db-install
+
+
+# 
+# Target-Install
+# 
+$(STATEDIR)/usb-modeswitch-data.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, usb-modeswitch-data)
+   @$(call install_fixup, usb-modeswitch-data,PRIORITY,optional)
+   @$(call install_fixup, usb-modeswitch-data,SECTION,base)
+   @$(call install_fixup, usb-modeswitch-data,AUTHOR,"Ladislav Michl 
<la...@linux-mips.org>")
+   @$(call install_fixup, usb-modeswitch-data,DESCRIPTION,missing)
+
+   @$(call install_copy, usb-modeswitch-data, 0, 0, 0644, -, \
+/lib/udev/rules.d/40-usb_modeswitch.rules)
+
+   @cd $(USB_MODESWITCH_DATA_PKGDIR) && \
+   for f in `find usr/share/usb_modeswitch/ -type f`; do \
+   $(call install_copy, usb-modeswitch-data, 0, 0, 0644, -, /$$f); 
\
+   done
+
+   @$(call install_finish, usb-modeswitch-data)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [RFC] Colons in filenames

2016-07-13 Thread Ladislav Michl 
On Wed, Feb 10, 2016 at 06:23:47PM +0100, Michael Olbrich wrote:
> I think the most readable would be replace the escaping:
> 
> '\:' -> 0x1
> ':'  -> 0x2
> 0x1  -> ':'
> 
> and then use 0x2 as separator.
> 
> Well there is also DOPERMISSIONS in rules/post/ptxd_make_image_common.make
> which ist mostly but not exactly the same. But I suppose we could merge
> that. It will require some testing and careful review. This stuff is rather
> tricky.
> And then there is scripts/lib/ptxd_make_image_fix_permissions.sh...

I used ASCII 31 (unit separator), after all this is whole purpose
of its sole existence. So what about something like following patch?

diff --git a/rules/post/image_cpio.make b/rules/post/image_cpio.make
index 573faee..200b283 100644
--- a/rules/post/image_cpio.make
+++ b/rules/post/image_cpio.make
@@ -15,7 +15,7 @@ $(IMAGEDIR)/root.cpio: $(STATEDIR)/image_working_dir
@echo -n "Creating '$(notdir $(@))' from working dir..."
@cd $(image/work_dir) && \
( \
-   awk -F: $(DOPERMISSIONS) $(image/permissions) && \
+   awk $(DOPERMISSIONS) $(image/permissions) && \
echo "find . | cpio --quiet -H newc -o > '$(@)'" \
) | $(FAKEROOT) --
@echo "done."
diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make
index 3e3423b..0dbcafd 100644
--- a/rules/post/image_ext2.make
+++ b/rules/post/image_ext2.make
@@ -15,7 +15,7 @@ ifdef PTXCONF_IMAGE_EXT2
 $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir
@echo -n "Creating root.ext2 from working dir..."
@cd $(image/work_dir);  \
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(   \
echo -n "$(PTXCONF_SYSROOT_HOST)/bin/genext2fs ";   \
echo -n "-b $(PTXCONF_IMAGE_EXT2_SIZE) ";   \
diff --git a/rules/post/image_jffs2.make b/rules/post/image_jffs2.make
index 5e448f5..7f12883 100644
--- a/rules/post/image_jffs2.make
+++ b/rules/post/image_jffs2.make
@@ -17,7 +17,7 @@ $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir 
$(STATEDIR)/host-mtd-utils
@echo -n "(--eraseblock=$(PTXCONF_IMAGE_JFFS2_BLOCKSIZE) "
@echo "$(call remove_quotes,$(PTXCONF_IMAGE_JFFS2_EXTRA_ARGS)))"
@cd $(image/work_dir);  \
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(   \
echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.jffs2 "; \
echo -n "-d $(image/work_dir) ";\
diff --git a/rules/post/image_squashfs.make b/rules/post/image_squashfs.make
index 6d02255..69dc721 100644
--- a/rules/post/image_squashfs.make
+++ b/rules/post/image_squashfs.make
@@ -19,7 +19,7 @@ ifdef PTXCONF_IMAGE_SQUASHFS
 $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir 
$(STATEDIR)/host-squashfs-tools.install.post
@echo -n "Creating root.squashfs from working dir..."
@cd $(image/work_dir);  
\
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk $(DOPERMISSIONS) $(image/permissions) &&   \
(   \
echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mksquashfs "; \
echo -n "$(image/work_dir) ";   
\
diff --git a/rules/post/image_tgz.make b/rules/post/image_tgz.make
index 57f69f4..a8e129a 100644
--- a/rules/post/image_tgz.make
+++ b/rules/post/image_tgz.make
@@ -19,7 +19,7 @@ endif
 $(IMAGEDIR)/root.tgz: $(STATEDIR)/image_working_dir
@echo -n 'Creating root.tgz from working dir$(if $(IMAGE_TGZ_LABEL), 
with label "$(IMAGE_TGZ_LABEL)",)... '
@cd $(image/work_dir);  
\
-   (awk -F: $(DOPERMISSIONS) $(image/permissions) &&   \
+   (awk -F\x1F $(DOPERMISSIONS) $(image/permissions) &&\
(   echo -n "tar ${IMAGE_TGZ_LABEL_ARGS} -zcf ";\
echo -n "$@ ." )\
) | $(FAKEROOT) --
diff --git a/rules/post/image_ubi.make b/rules/post/image_ubi.make
index edfae1d..17321dc 100644
--- a/rules/post/image_ubi.make
+++ b/rules/post/image_ubi.make
@@ -22,7 +22,7 @@ $(IMAGEDIR)/root.ubifs: $(STATEDIR)/image_working_dir 
$(STATEDIR)/host-mtd-utils
@echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c 
$(PTXCONF_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT) "
@echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS))"
@cd $(image/work_dir);  
\
-   (awk -F:

Re: [ptxdist] [BUG] error: empty parameter to 'ptxd_make_get'

2016-07-09 Thread Ladislav Michl 
On Fri, Jul 01, 2016 at 03:24:35PM +0200, Michael Olbrich wrote:
> On Fri, Jul 01, 2016 at 02:26:31PM +0200, Ladislav Michl wrote:
[...]
> > Perhaps I should also mention I'm using collections. Previous output was 
> > with
> > full collection. Once I delete 'selected_collectionconfig' I get correct 
> > output:
> [...]
> > (Note: collection selects only tagret packages)
> 
> Indeed. I understand the problem now. I'm not sure yet, what the correct
> solution is.

Just tested your b3068eeaeb83ac2cf07168a708821de87fa867e7 and
e1064ce9c59f67d2b9b7c55bfc3a0d160b099def commits. Works for me.

Thank you,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [BUG] error: empty parameter to 'ptxd_make_get'

2016-07-01 Thread Ladislav Michl 
On Fri, Jul 01, 2016 at 12:13:44PM +0200, Michael Olbrich wrote:
> On Fri, Jul 01, 2016 at 10:41:10AM +0200, Ladislav Michl wrote:
> > I extended it a bit:
> > $ cat rules/post/zzz.make
> > foo:
> > echo $(PTXCONF_HOST_GETTEXT)
> > echo $(HOST_GETTEXT_SOURCE)
> > echo $($(HOST_GETTEXT_SOURCE))
> > echo $(PTXCONF_HOST_ACL)
> > echo $(HOST_ACL_SOURCE)
> > echo $($(HOST_ACL_SOURCE))
> > echo $(PTXCONF_HOST_NCURSES)
> > echo $(HOST_NCURSES_SOURCE)
> > echo $($(HOST_NCURSES_SOURCE))
> > 
> > $ grep -e GETTEXT -e ACL -e NCURSES < configs/ptxconfig
> > PTXCONF_HOST_ACL=y
> > PTXCONF_HOST_GETTEXT=m
> > PTXCONF_HOST_NCURSES=m
> > PTXCONF_NCURSES=m
> > (output edited)
> 
> looks correct so far.
> 
> > $ ptxdist --force make foo
> > echo m
> > m
> > echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/gettext-0.19.1.tar.xz
> > /home/ladis/src/peoplemetr/SimEarTools/dist/src/gettext-0.19.1.tar.xz
> > echo
> > 
> 
> You should get 'HOST_GETTEXT' here :-/.

Perhaps I should also mention I'm using collections. Previous output was with
full collection. Once I delete 'selected_collectionconfig' I get correct output:
$ ptxdist --force make foo
echo m
m
echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/gettext-0.19.1.tar.xz
/home/ladis/src/peoplemetr/SimEarTools/dist/src/gettext-0.19.1.tar.xz
echo HOST_GETTEXT
HOST_GETTEXT
echo y
y
echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/acl-2.2.52.src.tar.gz
/home/ladis/src/peoplemetr/SimEarTools/dist/src/acl-2.2.52.src.tar.gz
echo HOST_ACL
HOST_ACL
echo m
m
echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/ncurses-5.9.tar.gz
/home/ladis/src/peoplemetr/SimEarTools/dist/src/ncurses-5.9.tar.gz
echo HOST_NCURSES
HOST_NCURSES

(Note: collection selects only tagret packages)

> > echo y
> > y
> > echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/acl-2.2.52.src.tar.gz
> > /home/ladis/src/peoplemetr/SimEarTools/dist/src/acl-2.2.52.src.tar.gz
> > echo HOST_ACL
> > HOST_ACL
> > echo m
> > m
> > echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/ncurses-5.9.tar.gz
> > /home/ladis/src/peoplemetr/SimEarTools/dist/src/ncurses-5.9.tar.gz
> > echo NCURSES
> > NCURSES
> 
> This is strange. With ncurses and host-ncurses selected, I would have
> expected HOST_NCURSES here.
> 
> Can you make this change:
> 
> diff --git a/rules/post/ptxd_make_world_get.make 
> b/rules/post/ptxd_make_world_get.make
> index 142d672f74c3..6405263fad6b 100644
> --- a/rules/post/ptxd_make_world_get.make
> +++ b/rules/post/ptxd_make_world_get.make
> @@ -14,7 +14,7 @@
>  # $(_SOURCE) := 
>  #
>  define pkg_source
> -$(if $($(1)_SOURCE),$(eval $($(1)_SOURCE) := $(1)),)
> +$(if $($(1)_SOURCE),$(eval $(warning $($(1)_SOURCE) := $(1))),)
>  endef
>  $(foreach pkg, $(PTX_PACKAGES_SELECTED), $(call 
> pkg_source,$(PTX_MAP_TO_PACKAGE_$(pkg
>  
> 
> ... and then run 'ptxdist make foo' again? It will break things, so the

ptxd_make_world_get.make:19: src/glib-2.48.1.tar.xz := GLIB
ptxd_make_world_get.make:19: src/fbterm-1.7.0.tar.gz := FBTERM
ptxd_make_world_get.make:19: src/libpng-1.2.54.tar.xz := LIBPNG
ptxd_make_world_get.make:19: src/nettle-2.7.1.tar.gz := NETTLE
ptxd_make_world_get.make:19: src/xz-5.2.2.tar.bz2 := XZ
ptxd_make_world_get.make:19: src/dbus-glib-0.104.tar.gz := DBUS_GLIB
ptxd_make_world_get.make:19: src/NetworkManager-1.2.2.tar.xz := NETWORKMANAGER
ptxd_make_world_get.make:19: src/libtasn1-4.8.tar.gz := LIBTASN1
ptxd_make_world_get.make:19: src/memtool-2015.12.2.tar.xz := MEMTOOL
ptxd_make_world_get.make:19: src/NetworkManager-openvpn-1.2.2.tar.xz := 
NETWORKMANAGER_OPENVPN
ptxd_make_world_get.make:19: src/ModemManager-1.4.14.tar.xz := MODEMMANAGER
ptxd_make_world_get.make:19: src/zlib-1.2.8.tar.xz := ZLIB
ptxd_make_world_get.make:19: src/htop-2.0.1.tar.gz := HTOP
ptxd_make_world_get.make:19: src/libusb-1.0.18.tar.bz2 := LIBUSB
ptxd_make_world_get.make:19: src/font-alias-1.0.3.tar.bz2 := XORG_FONT_ALIAS
ptxd_make_world_get.make:19: src/atop-1.24.tar.gz := ATOP
ptxd_make_world_get.make:19: src/dbus-1.10.8.tar.gz := DBUS
ptxd_make_world_get.make:19: src/linux-4.6.tar.xz := KERNEL_HEADER
ptxd_make_world_get.make:19: src/libffi-3.2.1.tar.gz := LIBFFI
ptxd_make_world_get.make:19: src/u-boot-2016.03.tar.bz2 := U_BOOT
ptxd_make_world_get.make:19: src/cairo-1.12.18.tar.xz := CAIRO
ptxd_make_world_get.make:19: src/pcre-8.38.tar.bz2 := LIBPCRE
ptxd_make_world_get.make:19: src/libcap-2.24.tar.xz := LIBCAP
ptxd_make_world_get.make:19: src/pixman-0.34.0.tar.bz2 := PIXMAN
ptxd_make_world_get.make:19: src/freetype-2.6.3.tar.bz2 := FREETYPE
ptxd_make_world_get.make:19: src/libgudev-230.tar.xz := LIBGUDEV
ptxd_make_world_get.mak

Re: [ptxdist] [BUG] error: empty parameter to 'ptxd_make_get'

2016-07-01 Thread Ladislav Michl 
On Thu, Jun 30, 2016 at 04:04:20PM +0200, Michael Olbrich wrote:
> I can't reproduce this here. Can you please create a file like this:
> 
> $ cat rules/post/zzz.make
> foo:
>   echo $(PTXCONF_HOST_GETTEXT)
>   echo $(HOST_GETTEXT_SOURCE)
>   echo $($(HOST_GETTEXT_SOURCE))
> 
> And then call:
> $ ptxdist make foo
> 
> What do you get?

I extended it a bit:
$ cat rules/post/zzz.make
foo:
echo $(PTXCONF_HOST_GETTEXT)
echo $(HOST_GETTEXT_SOURCE)
echo $($(HOST_GETTEXT_SOURCE))
echo $(PTXCONF_HOST_ACL)
echo $(HOST_ACL_SOURCE)
echo $($(HOST_ACL_SOURCE))
echo $(PTXCONF_HOST_NCURSES)
echo $(HOST_NCURSES_SOURCE)
echo $($(HOST_NCURSES_SOURCE))

$ grep -e GETTEXT -e ACL -e NCURSES < configs/ptxconfig
PTXCONF_HOST_ACL=y
PTXCONF_HOST_GETTEXT=m
PTXCONF_HOST_NCURSES=m
PTXCONF_NCURSES=m
(output edited)

$ ptxdist --force make foo
echo m
m
echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/gettext-0.19.1.tar.xz
/home/ladis/src/peoplemetr/SimEarTools/dist/src/gettext-0.19.1.tar.xz
echo

echo y
y
echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/acl-2.2.52.src.tar.gz
/home/ladis/src/peoplemetr/SimEarTools/dist/src/acl-2.2.52.src.tar.gz
echo HOST_ACL
HOST_ACL
echo m
m
echo /home/ladis/src/peoplemetr/SimEarTools/dist/src/ncurses-5.9.tar.gz
/home/ladis/src/peoplemetr/SimEarTools/dist/src/ncurses-5.9.tar.gz
echo NCURSES
NCURSES

Thank you,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2016.06.0 released

2016-06-30 Thread Ladislav Michl 
On Thu, Jun 30, 2016 at 09:10:18AM +0200, m.olbr...@pengutronix.de wrote:
> On Tue, Jun 28, 2016 at 12:58:35PM +, Bruno Thomsen wrote:
> > I had the same compile issue on a Fedora 23 host but got Michaels patch 
> > working with a minor ")" tweak.
> > Attached working patch just-in-case somebody stumble across the same issue.
> 
> Thanks for testing this.
> 
> I've pushed this (with the extra ')') to master.
> 
> Have you noticed anything else? I'll probably create a stable release for
> this. It would be great if I got some feedback if there are anny other
> issues that should be fixed.

This one? http://article.gmane.org/gmane.comp.embedded.ptxdist.devel/13933
No patch for it yet, I'll give it a try in the evening.

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [BUG] error: empty parameter to 'ptxd_make_get'

2016-06-23 Thread Ladislav Michl 
Get stage fails for all packages built as host-packages only. Steps to
reproduce:

1) chose any package build for host only and clean it:
$ ptxdist clean host-gettext

2) remove source tarball
$ rm src/gettext-0.19.1.tar.xz 

3) compile
$ ptxdist compile host-gettext
-
target: gettext-0.19.1.tar.xz
-
error: empty parameter to 'ptxd_make_get'
make: *** [$(PROJECT_ROOT)/src/gettext-0.19.1.tar.xz] Error 1
$(PTXDIST_TOPDIR)/rules/post/ptxd_make_world_get.make:26: recipe for target 
'$(PROJECT_ROOT)/src/gettext-0.19.1.tar.xz' failed

This is pretty longstanding bug, but I hit it only rarely as I'm keeping
source tarbals donwloaded in the same dir for multiple projects...

Best regards,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] openvpn: version bump 2.3.6 -> 2.3.11

2016-06-15 Thread Ladislav Michl 
Once there, make 'small' option configurable.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/openvpn.in   | 7 +++
 rules/openvpn.make | 8 
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/rules/openvpn.in b/rules/openvpn.in
index 3ad493a..c620937 100644
--- a/rules/openvpn.in
+++ b/rules/openvpn.in
@@ -35,6 +35,13 @@ menuconfig OPENVPN
 
 if OPENVPN
 
+config OPENVPN_SMALL
+   bool
+   prompt "Enable smaller executable size"
+   default y
+   help
+ This disables OCC, usage message, and verb 4 parm list.
+
 config OPENVPN_LZO
bool
prompt "Enable LZO compression"
diff --git a/rules/openvpn.make b/rules/openvpn.make
index 7cfa427..532809d 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
 #
 # Paths and names
 #
-OPENVPN_VERSION:= 2.3.6
-OPENVPN_MD5:= 6ca03fe0fd093e0d01601abee808835c
+OPENVPN_VERSION:= 2.3.11
+OPENVPN_MD5:= fe17a25235d65e60af8986c6c78c4650
 OPENVPN:= openvpn-$(OPENVPN_VERSION)
-OPENVPN_SUFFIX := tar.gz
+OPENVPN_SUFFIX := tar.xz
 OPENVPN_URL:= 
http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
 OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
 OPENVPN_DIR:= $(BUILDDIR)/$(OPENVPN)
@@ -44,7 +44,7 @@ OPENVPN_AUTOCONF := \
--$(call ptx/endis, PTXCONF_OPENVPN_LZO)-lzo \
--disable-plugins \
--disable-debug \
-   --enable-small \
+   --$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \
--disable-iproute2 \
--disable-selinux \
--$(call ptx/endis, PTXCONF_OPENVPN_SYSTEMD)-systemd \
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1

2016-06-13 Thread Ladislav Michl 
Hi Robert...

On Fri, Jun 10, 2016 at 12:11:15AM +0200, Robert Schwebel wrote:
> Add defaults for the new configure options.

I overlooked your patch, so another one doing the same was sent. However
I think you should consider using it instead :-) 

Thank you,
ladis

> Signed-off-by: Robert Schwebel 
> ---
>  rules/htop.make | 6 --
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/htop.make b/rules/htop.make
> index 8a4b70a..b3719e5 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
>  #
>  # Paths and names
>  #
> -HTOP_VERSION := 1.0.3
> -HTOP_MD5 := e768b9b55c033d9c1dffda72db3a6ac7
> +HTOP_VERSION := 2.0.1
> +HTOP_MD5 := f75fe92b4defaa80d99109830f34b5e2
>  HTOP := htop-$(HTOP_VERSION)
>  HTOP_SUFFIX  := tar.gz
>  HTOP_URL := 
> http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
> @@ -41,6 +41,8 @@ HTOP_CONF_ENV   := \
>  HTOP_CONF_TOOL   := autoconf
>  HTOP_CONF_OPT:= \
>   $(CROSS_AUTOCONF_USR) \
> + --enable-proc \
> + --enable-linux-affinity \
>   --disable-unicode
>  
>  # 
> 
> -- 
> 2.8.1
> 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] htop: version bump 1.0.3 -> 2.0.1

2016-06-13 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
--
diff --git a/rules/htop.make b/rules/htop.make
index 8a4b70a..ed90597 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
 #
 # Paths and names
 #
-HTOP_VERSION   := 1.0.3
-HTOP_MD5   := e768b9b55c033d9c1dffda72db3a6ac7
+HTOP_VERSION   := 2.0.1
+HTOP_MD5   := f75fe92b4defaa80d99109830f34b5e2
 HTOP   := htop-$(HTOP_VERSION)
 HTOP_SUFFIX:= tar.gz
 HTOP_URL   := 
http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
@@ -30,17 +30,16 @@ HTOP_LICENSE:= GPL-2.0
 # Prepare
 # 
 
-HTOP_CONF_ENV  := \
-   $(CROSS_ENV) \
-   ac_cv_file__proc_stat=yes \
-   ac_cv_file__proc_meminfo=yes
-
 #
 # autoconf
 #
 HTOP_CONF_TOOL := autoconf
 HTOP_CONF_OPT  := \
$(CROSS_AUTOCONF_USR) \
+   --enable-proc \
+   --enable-cgroup \
+   --enable-taskstats \
+   --enable-linux-affinity \
--disable-unicode
 
 # 

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] networkmanager: add missing dependency to dbus-glib

2016-06-09 Thread Ladislav Michl 
On Thu, Jun 09, 2016 at 03:11:17PM +0200, Robert Schwebel wrote:
> Signed-off-by: Robert Schwebel 
> ---
>  rules/networkmanager.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/networkmanager.in b/rules/networkmanager.in
> index 85b1e91..15859c4 100644
> --- a/rules/networkmanager.in
> +++ b/rules/networkmanager.in
> @@ -9,6 +9,7 @@ menuconfig NETWORKMANAGER
>   select LIBC_PTHREAD
>   select LIBC_RT
>   select DBUS
> + select DBUS_GLIB
>   select DBUS_PYTHON  if NETWORKMANAGER_EXAMPLES && 
> RUNTIME
>   select GLIB
>   select GNUTLS

No, please. Do not add this dependency unless you verify that anything
depends on libnm-glib. It does not seem any package needs it. See here:
https://wiki.gnome.org/Projects/NetworkManager/libnm

diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index e2af34bb..7decc6b 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -62,7 +62,7 @@ NETWORKMANAGER_CONF_OPT := \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \
-   --with-libnm-glib \
+   --without-libnm-glib \
--with-systemdsystemunitdir=/lib/systemd/system \
--with-hostname-persist=default \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \

Best regards,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Bug on ptxdist-2016.05.0

2016-06-09 Thread Ladislav Michl 
On Thu, Jun 09, 2016 at 01:07:51PM +, Carsten Schlote wrote:
> Hi Raimundo,
> 
> I tried that patch as it really looks like a typo. Anyway, with the patch
> applied you get a problem when target-installing the
> 
> kernel modules. It tried to strip module.symbols and obviously fails.

Problem is caused by commit 535944fdf5b2a32a856cbaa92463d519f75e206f.
Reverting it makes things work again.

> So this fix might need further fixes.

Indeed :-)

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] systemd/udev: fix hardware database generating

2016-06-07 Thread Ladislav Michl 
On Tue, Jun 07, 2016 at 08:13:59PM +0200, Juergen Borleis wrote:
> Without this fix systemd fails at run-time with:
> 
>   systemd-hwdb-update.service - Rebuild Hardware Database
>Loaded: loaded (/lib/systemd/system/systemd-hwdb-update.service; static; 
> vendor preset: enabled)
>Active: failed (Result: exit-code) since Tue 2016-06-07 15:45:38 UTC; 
> 16min ago
> Condition: start condition failed at Tue 2016-06-07 15:45:55 UTC; 16min ago
>ConditionNeedsUpdate=/etc was not met
>  Docs: man:hwdb(7)
>   man:systemd-hwdb(8)
>  Main PID: 413 (code=exited, status=203/EXEC)
> 
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Main process 
> exited, code=exited, status=203/EXEC
> Jun 07 15:45:38 qemu systemd[1]: Failed to start Rebuild Hardware Database.
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Unit entered 
> failed state.
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Failed with 
> result 'exit-code'.
> 
> Signed-off-by: Juergen Borleis <j...@pengutronix.de>

Indeed, it was annoying, but never that much to look for cause myself... Thank 
you.

Tested-by: Ladislav Michl <la...@linux-mips.org>

> diff --git a/rules/systemd.make b/rules/systemd.make
> index 29ddbd84f793..c5ac60843dde 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -156,7 +156,7 @@ $(STATEDIR)/systemd.install:
>   @$(call targetinfo)
>   @$(call world/install, SYSTEMD)
>  ifdef PTXCONF_UDEV_HWDB
> - @systemd-hwdb update --root $(SYSTEMD_PKGDIR)
> + @systemd-hwdb update --usr --root $(SYSTEMD_PKGDIR)
>  endif
>  ifndef PTXCONF_SYSTEMD_VCONSOLE
>   @rm -v 
> $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
> diff --git a/rules/udev.make b/rules/udev.make
> index 2ad990b70e56..c6df5c5b90fb 100644
> --- a/rules/udev.make
> +++ b/rules/udev.make
> @@ -186,7 +186,7 @@ ifdef PTXCONF_UDEV_ETC_CONF
>   @$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
>  endif
>  ifdef PTXCONF_UDEV_HWDB
> - @$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin)
> + @$(call install_copy, udev, 0, 0, 0644, -, /lib/udev/hwdb.bin)
>  endif
>  
>  ifdef PTXCONF_UDEV_LEGACY
> 

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] projectroot: add group shadow

2016-05-21 Thread Ladislav Michl 
Recent commit 4613cf9ccd529ea1122d43f25b2c3742820f3664
'rootfs: /etc/(g)shadow: install as group shadow' introduced following build
error:

ptxdist: error:

group id 'shadow' not found in 'ptxdist/projectroot//etc/group' for:
  '/etc/shadow'

Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
diff --git a/projectroot/etc/group b/projectroot/etc/group
index 078ebe8..5d49176 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -1,6 +1,7 @@
 root:x:0:
 daemon:x:1:
 adm:x:4:
+shadow:x:42:
 utmp:x:43:
 users:x:100:
 ftp:x:101:

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager-openvpn: version bump 1.2.0 -> 1.2.2

2016-05-20 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
diff --git a/rules/networkmanager-openvpn.make 
b/rules/networkmanager-openvpn.make
index 69a42d1..24368ff 100644
--- a/rules/networkmanager-openvpn.make
+++ b/rules/networkmanager-openvpn.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += 
networkmanager-openvpn
 #
 # Paths and names
 #
-NETWORKMANAGER_OPENVPN_VERSION := 1.2.0
-NETWORKMANAGER_OPENVPN_MD5 := 6a8c03288cd0b4b849a7b883689c04f3
+NETWORKMANAGER_OPENVPN_VERSION := 1.2.2
+NETWORKMANAGER_OPENVPN_MD5 := f7889d7530f226afd3ef110501a68af4
 NETWORKMANAGER_OPENVPN := 
NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
 NETWORKMANAGER_OPENVPN_SUFFIX  := tar.xz
 NETWORKMANAGER_OPENVPN_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager-openvpn: new package

2016-05-17 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
diff --git a/rules/networkmanager-openvpn.in b/rules/networkmanager-openvpn.in
new file mode 100644
index 000..df35dab
--- /dev/null
+++ b/rules/networkmanager-openvpn.in
@@ -0,0 +1,7 @@
+## SECTION=networkmanager_plugins
+
+config NETWORKMANAGER_OPENVPN
+   tristate
+   select OPENVPN
+   select GLIB
+   prompt "openvpn"
diff --git a/rules/networkmanager-openvpn.make 
b/rules/networkmanager-openvpn.make
new file mode 100644
index 000..69a42d1
--- /dev/null
+++ b/rules/networkmanager-openvpn.make
@@ -0,0 +1,67 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Ladislav Michl <la...@linux-mips.org>
+#
+# 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_NETWORKMANAGER_OPENVPN) += networkmanager-openvpn
+
+#
+# Paths and names
+#
+NETWORKMANAGER_OPENVPN_VERSION := 1.2.0
+NETWORKMANAGER_OPENVPN_MD5 := 6a8c03288cd0b4b849a7b883689c04f3
+NETWORKMANAGER_OPENVPN := 
NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
+NETWORKMANAGER_OPENVPN_SUFFIX  := tar.xz
+NETWORKMANAGER_OPENVPN_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
+NETWORKMANAGER_OPENVPN_SOURCE  := 
$(SRCDIR)/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
+NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
+NETWORKMANAGER_OPENVPN_CONF_OPT := \
+   $(CROSS_AUTOCONF_USR) \
+   --disable-static \
+   --enable-shared \
+   --disable-nls \
+   --enable-more-warnings \
+   --without-libnm-glib \
+   --without-gnome \
+   --without-tests
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/networkmanager-openvpn.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, networkmanager-openvpn)
+   @$(call install_fixup, networkmanager-openvpn,PRIORITY,optional)
+   @$(call install_fixup, networkmanager-openvpn,SECTION,base)
+   @$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl 
<la...@linux-mips.org>")
+   @$(call install_fixup, networkmanager-openvpn,DESCRIPTION, 
"networkmanager-openvpn")
+
+   @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, 
/etc/dbus-1/system.d/nm-openvpn-service.conf)
+   @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, 
/usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
+
+   @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec/)
+
+   @$(call install_finish, networkmanager-openvpn)
+
+   @$(call touch)
+
+# vim: syntax=make
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index e1c9b8c..13091dc 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -82,4 +82,8 @@ config NETWORKMANAGER_EXAMPLES
bool
prompt "install examples for Network Manager"
 
+menu "plugins"
+source "generated/networkmanager_plugins.in"
+endmenu
+
 endif
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager: version bump 1.0.12 -> 1.2.0

2016-05-17 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index c9caddc..e1c9b8c 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -6,16 +6,14 @@ menuconfig NETWORKMANAGER
select LIBC_DL
select LIBC_PTHREAD
select LIBC_RT
-   select NCURSES  if NETWORKMANAGER_NMTUI
select LIBNEWT  if NETWORKMANAGER_NMTUI
select DBUS
-   select DBUS_GLIB
select READLINE if NETWORKMANAGER_NMCLI
select LIBUUID
+   select GLIB
select GNUTLS
-   select LIBNL3
-   select HOST_INTLTOOL# why? NLS is disabled!!!
select LIBNDP
+   select LIBNL3
select UDEV if RUNTIME
select LIBGUDEV
select MODEMMANAGER if NETWORKMANAGER_WWAN
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 6b042a3..4697f69 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.0.12
-NETWORKMANAGER_MD5 := ebb273456a81ccf9dfaf2461061b0e96
+NETWORKMANAGER_VERSION := 1.2.0
+NETWORKMANAGER_MD5 := d431bad77b68326282249bdb53ade6b4
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
-NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE  := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
 
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] modemmanager: version bump 1.4.12 -> 1.4.14

2016-04-18 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/modemmanager.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 8d343b8..299e879 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.4.12
-MODEMMANAGER_MD5   := 66cc7266b15525cb366253e6639fc564
+MODEMMANAGER_VERSION   := 1.4.14
+MODEMMANAGER_MD5   := cabb72e7c2ddf6af96eca2c9f3d168a3
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.xz
 MODEMMANAGER_URL   := 
http://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager: version bump 1.0.10 -> 1.0.12

2016-04-18 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/networkmanager.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 065b646..6b042a3 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.0.10
-NETWORKMANAGER_MD5 := a8f54460a4708efd840358f32d0968fd
+NETWORKMANAGER_VERSION := 1.0.12
+NETWORKMANAGER_MD5 := ebb273456a81ccf9dfaf2461061b0e96
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
 NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] acl: version bump 2.2.49 -> 2.2.52

2016-04-18 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 ...ildmacros-fix-installation-of-static-libs.patch | 25 --
 ...ave-C-and-CPPFLAGS-from-configure-and-use.patch |  0
 ...ldmacros-add-tag-CC-to-libtool-invocation.patch |  0
 ...buildmacros-fix-install-with-user-domain.patch} |  0
 patches/{acl-2.2.49 => acl-2.2.52}/series  |  3 +--
 rules/acl.make |  4 ++--
 6 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 
patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch
 rename patches/{acl-2.2.49 => 
acl-2.2.52}/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch 
(100%)
 rename patches/{acl-2.2.49 => 
acl-2.2.52}/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch (100%)
 rename patches/{acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch 
=> acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch} (100%)
 rename patches/{acl-2.2.49 => acl-2.2.52}/series (66%)

diff --git 
a/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch 
b/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch
deleted file mode 100644
index ac35a16..000
--- a/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Marc Kleine-Budde <m...@pengutronix.de>
-Date: Wed, 13 Jan 2010 15:33:11 +0100
-Subject: [PATCH] buildmacros: fix installation of static libs
-
-Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>

- include/buildmacros |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/buildmacros b/include/buildmacros
-index 71ce471..d9b0734 100644
 a/include/buildmacros
-+++ b/include/buildmacros
-@@ -99,7 +99,7 @@ endif
- INSTALL_LTLIB_STATIC = \
-   cd $(TOPDIR)/$(LIBNAME)/.libs; \
-   ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
--  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
-+  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR)
- 
- INSTALL_MAN = \
-   @for d in $(MAN_PAGES); do \
--- 
-1.7.0.4
-
diff --git 
a/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch
 
b/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch
similarity index 100%
rename from 
patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch
rename to 
patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch
diff --git 
a/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch 
b/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch
similarity index 100%
rename from 
patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch
rename to 
patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch
diff --git 
a/patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch 
b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch
similarity index 100%
rename from 
patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch
rename to patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch
diff --git a/patches/acl-2.2.49/series b/patches/acl-2.2.52/series
similarity index 66%
rename from patches/acl-2.2.49/series
rename to patches/acl-2.2.52/series
index 8d3b589..2f0742c 100644
--- a/patches/acl-2.2.49/series
+++ b/patches/acl-2.2.52/series
@@ -1,6 +1,5 @@
 # generated by git-ptx-patches
 0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch
 0002-buildmacros-add-tag-CC-to-libtool-invocation.patch
-0003-buildmacros-fix-installation-of-static-libs.patch
-0004-buildmacros-fix-install-with-user-domain.patch
+0003-buildmacros-fix-install-with-user-domain.patch
 # 2eab836d9981c83ac12078b434b28788  - git-ptx-patches magic
diff --git a/rules/acl.make b/rules/acl.make
index 867dcf6..f0a06e1 100644
--- a/rules/acl.make
+++ b/rules/acl.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_ACL) += acl
 #
 # Paths and names
 #
-ACL_VERSION:= 2.2.49
-ACL_MD5:= 181445894cca986da9ae0099d5ce2d08
+ACL_VERSION:= 2.2.52
+ACL_MD5:= a61415312426e9c2212bd7dc7929abda
 ACL:= acl-$(ACL_VERSION)
 ACL_SUFFIX := tar.gz
 ACL_URL:= 
http://download.savannah.gnu.org/releases/acl/$(ACL).src.$(ACL_SUFFIX)
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] js: version bump 1.9.2.16 -> 38.2.1.rc0

2016-02-03 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 
patches/mozjs-38.2.1.rc0/0001-Only-use-PYTHON-after-defined-by-MOZ_PYTHON.patch 
 |  121 
 
patches/mozjs-38.2.1.rc0/0002-Only-use-PYTHON-after-defined-by-MOZ_PYTHON-hack.patch
 |  139 ++
 patches/mozjs-38.2.1.rc0/series
  |2
 rules/js.in
  |   16 -
 rules/js.make  
  |  131 ++---
 5 files changed, 299 insertions(+), 110 deletions(-)

diff --git 
a/patches/mozjs-38.2.1.rc0/0001-Only-use-PYTHON-after-defined-by-MOZ_PYTHON.patch
 
b/patches/mozjs-38.2.1.rc0/0001-Only-use-PYTHON-after-defined-by-MOZ_PYTHON.patch
new file mode 100644
index 000..ba92213
--- /dev/null
+++ 
b/patches/mozjs-38.2.1.rc0/0001-Only-use-PYTHON-after-defined-by-MOZ_PYTHON.patch
@@ -0,0 +1,121 @@
+From 134aa1ace07fa9c78a8d93666a8bc46eeb31afe6 Mon Sep 17 00:00:00 2001
+From: Sean Stangl <ssta...@mozilla.com>
+Date: Fri, 20 Mar 2015 15:19:43 -0700
+Subject: [PATCH 1/2] Only use $PYTHON after defined by MOZ_PYTHON.
+
+---
+ js/src/configure.in | 91 +++--
+ 1 file changed, 46 insertions(+), 45 deletions(-)
+
+diff --git a/js/src/configure.in b/js/src/configure.in
+index 82ef78a..b0140a3 100644
+--- a/js/src/configure.in
 b/js/src/configure.in
+@@ -233,51 +233,6 @@ else
+ MOZ_ANDROID_NDK
+ fi
+ 
+-dnl ==
+-dnl Get mozilla version from central milestone file
+-dnl ==
+-MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py 
--topsrcdir $srcdir`
+-MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py 
--topsrcdir $srcdir --uaversion`
+-MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py 
--topsrcdir $srcdir --symbolversion`
+-
+-AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
+-AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
+-AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
+-AC_SUBST(MOZILLA_SYMBOLVERSION)
+-
+-# Separate version into components for use in shared object naming etc
+-changequote(,)
+-MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed 
"s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
+-MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed 
"s|^[0-9]*\.\([0-9]*\).*|\1|"`
+-MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
+-IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
+-
+-dnl XXX in a temporary bid to avoid developer anger at renaming files
+-dnl XXX before "js" symlinks exist, don't change names.
+-dnl
+-dnl if test -n "$JS_STANDALONE"; then
+-dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION
+-dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config
+-dnl else
+-JS_SHELL_NAME=js
+-JS_CONFIG_NAME=js-config
+-dnl fi
+-
+-changequote([,])
+-if test -n "$IS_ALPHA"; then
+-  changequote(,)
+-  MOZJS_ALPHA=`echo $MOZILLA_VERSION | sed 
"s|^[0-9]*\.[0-9\.]*\([^0-9]\).*|\1|"`
+-  changequote([,])
+-fi
+-AC_DEFINE_UNQUOTED(MOZJS_MAJOR_VERSION,$MOZJS_MAJOR_VERSION)
+-AC_DEFINE_UNQUOTED(MOZJS_MINOR_VERSION,$MOZJS_MINOR_VERSION)
+-AC_SUBST(JS_SHELL_NAME)
+-AC_SUBST(JS_CONFIG_NAME)
+-AC_SUBST(MOZJS_MAJOR_VERSION)
+-AC_SUBST(MOZJS_MINOR_VERSION)
+-AC_SUBST(MOZJS_PATCH_VERSION)
+-AC_SUBST(MOZJS_ALPHA)
+-
+ dnl 
+ dnl Checks for compilers.
+ dnl 
+@@ -738,6 +693,52 @@ XCFLAGS="$X_CFLAGS"
+ 
+ fi # COMPILE_ENVIRONMENT
+ 
++dnl ==
++dnl Get mozilla version from central milestone file
++dnl ==
++MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py 
--topsrcdir $srcdir`
++MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py 
--topsrcdir $srcdir --uaversion`
++MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py 
--topsrcdir $srcdir --symbolversion`
++
++AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
++AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
++AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
++AC_SUBST(MOZILLA_SYMBOLVERSION)
++
++# Separate version into components for use in shared object naming etc
++changequote(,)
++MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed 
"s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
++MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed 
"s|^[0-9]*\.\([0-9]*\).*|\1|"`
++MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
++IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'`
++
++dnl XXX in a temporary bid to a

[ptxdist] [RFC] Colons in filenames

2016-02-03 Thread Ladislav Michl 
On Fri, Jan 22, 2016 at 09:06:36AM +0100, Michael Olbrich wrote:
> On Fri, Jan 22, 2016 at 01:31:37AM +0100, Ladislav Michl wrote:
> > Now I'm going to be honest. Previous patch 'Add usb-modeswitch-data package'
> > break things - 'ptxdist images' fails as ':' is used as delimiter in perms 
> > file.
> > Patch bellow escapes semicolon on producer side, anyone cares about 
> > consumer?
> 
> This does not work well with IFS in bash and FS in awk. but I think we can
> switch different character. Maybe a vertical tab?

Well, I did not give up 'escaping idea' yet. What about something like this?
(awk part could be done better)

diff --git a/scripts/lib/ptxd_lib_dopermissions.awk 
b/scripts/lib/ptxd_lib_dopermissions.awk
index 336948c..17ee1b6 100755
--- a/scripts/lib/ptxd_lib_dopermissions.awk
+++ b/scripts/lib/ptxd_lib_dopermissions.awk
@@ -5,13 +5,29 @@ BEGIN {
 }
 
 $1 ~ "f" {
-   printf("chmod %s'.%s' &&\n" \
-  "chown %s.%s '.%s' &&\n", \
-  $5, $2, $3, $4, $2);
+   path = $2;
+   for (i = 3; i <= NF; i++) {
+   if (substr(path, length(path), 1) == "\\")
+   path = substr(path, 1, length(path) - 1) ":" $i;
+   else {
+   printf("chmod %s'.%s' &&\n" \
+  "chown %s.%s '.%s' &&\n", \
+  $(i+2), path, $i, $(i+1), path);
+   break;
+   }
+   }
 }
 
 $1 ~ "n" {
-   printf("mknod -m %s '.%s'   %s %s %s &&\n" \
-  "chown %s.%s '.%s' &&\n", \
-  $5, $2, $6, $7, $8, $3, $4, $2);
+   path = $2;
+   for (i = 3; i <= NF; i++) {
+   if (substr(path, length(path), 1) == "\\")
+   path = substr(path, 1, length(path) - 1) ":" $i;
+   else {
+   printf("mknod -m %s '.%s'   %s %s %s &&\n" \
+  "chown %s.%s '.%s' &&\n", \
+  $(i+2), path, $(i+3), $(i+4), $(i+5), $i, 
$(i+1), path);
+   break;
+   }
+   }
 }
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh 
b/scripts/lib/ptxd_make_xpkg_pkg.sh
index 5ba404e..01ce361 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -210,7 +210,7 @@ install directory:
 install -m "${mod_nfs}" -d "${ndirs[@]/%/${dir}}" &&
 install -m "${mod}" -o "${usr}" -g "${grp}" -d "${pdirs[@]/%/${dir}}" &&
 
-echo "f:${dir}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}" ||
+echo "f:${dir//:/\\:}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}" ||
 ptxd_install_error "install_dir failed!"
 }
 export -f ptxd_install_dir
@@ -343,7 +343,7 @@ Usually, just remove the 6th parameter and everything works 
fine.
 # now change to requested user and group
 chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
 
-echo "f:${dst}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}"
+echo "f:${dst//:/\\:}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}"
 }
 export -f ptxd_install_file_impl
 
@@ -414,7 +414,7 @@ install device node:
 done &&
 chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
 
-echo "n:${dst}:${usr}:${grp}:${mod}:${type}:${major}:${minor}" >> 
"${pkg_xpkg_perms}"
+echo "n:${dst//:/\\:}:${usr}:${grp}:${mod}:${type}:${major}:${minor}" >> 
"${pkg_xpkg_perms}"
 }
 export -f ptxd_install_mknod
 

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATH] usb-modeswitch-data: new package

2016-02-03 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
Notes:
 - needs tcl on host, but... anyone seen note in rules/tcl.in?
 - colons in filenames, something to be solved...

 usb-modeswitch-data.in   |   10 ++
 usb-modeswitch-data.make |   70 +++
 2 files changed, 80 insertions(+)

diff --git a/rules/usb-modeswitch-data.in b/rules/usb-modeswitch-data.in
new file mode 100644
index 000..ffaacda
--- /dev/null
+++ b/rules/usb-modeswitch-data.in
@@ -0,0 +1,10 @@
+## SECTION=shell_and_console
+
+config USB_MODESWITCH_DATA
+   tristate
+   prompt "usb-modeswitch-data"
+   depends on USB_MODESWITCH && UDEV
+   help
+ Device database and udev rules file for USB_ModeSwitch.
+
+# vim: set sw=8 ts=8 noet ft=kconfig:
diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
new file mode 100644
index 000..6b12898
--- /dev/null
+++ b/rules/usb-modeswitch-data.make
@@ -0,0 +1,70 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Ladislav Michl <la...@linux-mips.org>
+#
+# 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_USB_MODESWITCH_DATA) += usb-modeswitch-data
+
+#
+# Paths and names
+#
+USB_MODESWITCH_DATA_VERSION:= 20160112
+USB_MODESWITCH_DATA_MD5:= 040d11138fc0a61b980d704ac3b4547f
+USB_MODESWITCH_DATA:= 
usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
+USB_MODESWITCH_DATA_SUFFIX := tar.bz2
+USB_MODESWITCH_DATA_URL:= 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
+USB_MODESWITCH_DATA_SOURCE := 
$(SRCDIR)/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
+USB_MODESWITCH_DATA_DIR:= $(BUILDDIR)/$(USB_MODESWITCH_DATA)
+USB_MODESWITCH_DATA_LICENSE:= GPL-2.0
+
+
+# 
+# Nothing to Compile
+# 
+$(STATEDIR)/usb-modeswitch-data.compile:
+   @$(call targetinfo)
+   @$(call touch)
+
+
+# 
+# Prepare
+# 
+
+USB_MODESWITCH_DATA_CONF_TOOL  := NO
+USB_MODESWITCH_DATA_MAKE_ENV   := $(CROSS_ENV)
+USB_MODESWITCH_DATA_INSTALL_OPT:= db-install
+
+
+# 
+# Target-Install
+# 
+$(STATEDIR)/usb-modeswitch-data.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, usb-modeswitch-data)
+   @$(call install_fixup, usb-modeswitch-data,PRIORITY,optional)
+   @$(call install_fixup, usb-modeswitch-data,SECTION,base)
+   @$(call install_fixup, usb-modeswitch-data,AUTHOR,"Ladislav Michl 
<la...@linux-mips.org>")
+   @$(call install_fixup, usb-modeswitch-data,DESCRIPTION,missing)
+
+   @$(call install_copy, usb-modeswitch-data, 0, 0, 0644, -, \
+/lib/udev/rules.d/40-usb_modeswitch.rules)
+
+   @cd $(USB_MODESWITCH_DATA_PKGDIR) && \
+   for f in `find usr/share/usb_modeswitch/ -type f`; do \
+   $(call install_copy, usb-modeswitch-data, 0, 0, 0644, -, /$$f); 
\
+   done
+
+   @$(call install_finish, usb-modeswitch-data)
+
+   @$(call touch)
+
+# vim: syntax=make

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Colons in filenames

2016-01-22 Thread Ladislav Michl 
On Fri, Jan 22, 2016 at 08:18:05AM +0100, Uwe Kleine-König wrote:
> Hello,
> 
> On Fri, Jan 22, 2016 at 01:31:37AM +0100, Ladislav Michl wrote:
> > Now I'm going to be honest. Previous patch 'Add usb-modeswitch-data package'
> > break things - 'ptxdist images' fails as ':' is used as delimiter in perms 
> > file.
> > Patch bellow escapes semicolon on producer side, anyone cares about 
> > consumer?
> > 
> > ladis
> > 
> > diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh 
> > b/scripts/lib/ptxd_make_xpkg_pkg.sh
> > index 5ba404e..8e6664b 100644
> > --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> > +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> > @@ -209,6 +209,7 @@ install directory:
> >  
> >  install -m "${mod_nfs}" -d "${ndirs[@]/%/${dir}}" &&
> >  install -m "${mod}" -o "${usr}" -g "${grp}" -d "${pdirs[@]/%/${dir}}" 
> > &&
> > +dir="$(echo ${dir} | sed -e 's/[:]/\\:/g')" &&
> 
> why do you need the brackets? Doesn't s/:/\\:/g have the same effect?

Yes, it is the same and I probably shouldn't do anything at late night.

> As this is a bash script I assume you might save a few forks by using:
> 
>   ${dir//:/\\:}
> 
> (untested) instead.

Tested, patch bellow.

> >  echo "f:${dir}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}" ||
> >  ptxd_install_error "install_dir failed!"
> > @@ -343,6 +344,9 @@ Usually, just remove the 6th parameter and everything 
> > works fine.
> >  # now change to requested user and group
> >  chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
> >  
> > +# escape semicolon
> 
> semicolon?

Oops, your right. Colon, actually.
So this fixes .perms files and now what about the other side? So far we have 
two concurent
implementations of 'make images'. Fix both, or drop one, fix another?

diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh 
b/scripts/lib/ptxd_make_xpkg_pkg.sh
index 5ba404e..630e085 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -210,7 +210,7 @@ install directory:
 install -m "${mod_nfs}" -d "${ndirs[@]/%/${dir}}" &&
 install -m "${mod}" -o "${usr}" -g "${grp}" -d "${pdirs[@]/%/${dir}}" &&
 
-echo "f:${dir}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}" ||
+echo "f:${dir//:/\\:}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}" ||
 ptxd_install_error "install_dir failed!"
 }
 export -f ptxd_install_dir
@@ -343,7 +343,7 @@ Usually, just remove the 6th parameter and everything works 
fine.
 # now change to requested user and group
 chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
 
-echo "f:${dst}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}"
+echo "f:${dst//:/\\:}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}"
 }
 export -f ptxd_install_file_impl
 
@@ -413,8 +413,9 @@ install device node:
mknod -m "${mod}" "${d}" "${type}" ${major} ${minor} || return
 done &&
 chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
+dst="$(echo ${dst} | sed -e 's/[:]/\\:/g')" &&
 
-echo "n:${dst}:${usr}:${grp}:${mod}:${type}:${major}:${minor}" >> 
"${pkg_xpkg_perms}"
+echo "n:${dst//:/\\:}:${usr}:${grp}:${mod}:${type}:${major}:${minor}" >> 
"${pkg_xpkg_perms}"
 }
 export -f ptxd_install_mknod
 

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] usb_modeswitch: udev helper

2016-01-22 Thread Ladislav Michl 
Install also udev helper and systemd service file

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/usb-modeswitch.in   | 20 +---
 rules/usb-modeswitch.make | 13 +
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in
index aaefd86..28ba777 100644
--- a/rules/usb-modeswitch.in
+++ b/rules/usb-modeswitch.in
@@ -1,11 +1,25 @@
 ## SECTION=shell_and_console
 
-config USB_MODESWITCH
-   tristate
-   prompt "usb-modeswitch"
+menuconfig USB_MODESWITCH
+   tristate "usb-modeswitch"
select LIBUSB
+   select TCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT
help
  USB_ModeSwitch is (surprise!) a mode switching tool
  for controlling 'multi-mode' USB devices.
 
+if USB_MODESWITCH
+
+config USB_MODESWITCH_UDEV_HELPER
+   bool "install udev helper"
+   default y
+   depends on UDEV
+
+config USB_MODESWITCH_SYSTEMD_UNIT
+   bool "install systemd unit file"
+   default y
+   depends on SYSTEMD
+
+endif
+
 # vim: set sw=8 ts=8 noet ft=kconfig:
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 4ebf0e8..3f558f7 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -51,6 +51,19 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
 
@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
/usr/sbin/usb_modeswitch)
+ifneq ($(or $(PTXCONF_USB_MODESWITCH_UDEV_HELPER) 
$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT)),)
+   @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
+   /usr/sbin/usb_modeswitch_dispatcher)
+endif
+ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
+   @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
+   /lib/udev/usb_modeswitch)
+endif
+ifdef PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT
+   @$(call install_copy, usb-modeswitch, 0, 0, 0644, \
+   $(USB_MODESWITCH_DIR)/usb_modeswitch@.service, \
+   /lib/systemd/system/usb_modeswitch@.service)
+endif
 
@$(call install_finish, usb-modeswitch)
 
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] usb_modeswitch: udev helper

2016-01-22 Thread Ladislav Michl 
Install also udev helper and systemd service file

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
Changelog:
 - select TCL also depends on RUNTIME
 - simplify 'or' in makefile's ifdef
 - targetinstall file from pkgdir, not srcdir
 (all above pointed by Michael Olbrich, thanks!)

 rules/usb-modeswitch.in   | 20 +---
 rules/usb-modeswitch.make | 24 
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in
index aaefd86..3ccf31f 100644
--- a/rules/usb-modeswitch.in
+++ b/rules/usb-modeswitch.in
@@ -1,11 +1,25 @@
 ## SECTION=shell_and_console
 
-config USB_MODESWITCH
-   tristate
-   prompt "usb-modeswitch"
+menuconfig USB_MODESWITCH
+   tristate "usb-modeswitch"
select LIBUSB
+   select TCL if (USB_MODESWITCH_UDEV_HELPER || 
USB_MODESWITCH_SYSTEMD_UNIT) && RUNTIME
help
  USB_ModeSwitch is (surprise!) a mode switching tool
  for controlling 'multi-mode' USB devices.
 
+if USB_MODESWITCH
+
+config USB_MODESWITCH_UDEV_HELPER
+   bool "install udev helper"
+   default y
+   depends on UDEV
+
+config USB_MODESWITCH_SYSTEMD_UNIT
+   bool "install systemd unit file"
+   default y
+   depends on SYSTEMD
+
+endif
+
 # vim: set sw=8 ts=8 noet ft=kconfig:
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 4ebf0e8..95149a3 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -37,6 +37,18 @@ USB_MODESWITCH_MAKE_ENV  := $(CROSS_ENV)
 USB_MODESWITCH_MAKE_OPT:= $(CROSS_ENV_PROGS)
 
 # 
+# Install
+# 
+
+$(STATEDIR)/usb-modeswitch.install:
+   @$(call targetinfo)
+   @$(call world/install, USB_MODESWITCH)
+   @mkdir -p $(USB_MODESWITCH_PKGDIR)/lib/systemd/system
+   @install -m 0644 $(USB_MODESWITCH_DIR)/usb_modeswitch@.service \
+   
$(USB_MODESWITCH_PKGDIR)/lib/systemd/system/usb_modeswitch@.service
+   @$(call touch)
+
+# 
 # Target-Install
 # 
 
@@ -51,6 +63,18 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
 
@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
/usr/sbin/usb_modeswitch)
+ifneq 
($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),)
+   @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
+   /usr/sbin/usb_modeswitch_dispatcher)
+endif
+ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
+   @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
+   /lib/udev/usb_modeswitch)
+endif
+ifdef PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT
+   @$(call install_copy, usb-modeswitch, 0, 0, 0644, -, \
+   /lib/systemd/system/usb_modeswitch@.service)
+endif
 
@$(call install_finish, usb-modeswitch)
 
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Check for specific libc version

2016-01-21 Thread Ladislav Michl 
On Mon, Sep 28, 2015 at 12:29:02PM +0200, Michael Olbrich wrote:
> On Tue, Aug 18, 2015 at 12:30:41PM +0200, Ladislav Michl wrote:
[...]
> > This problem has side effect: as it seems the only variable used from
> > Versions.make is PTXDIST_FULLVERSION composed from PTXDIST_VERSION_FULL and
> > PTXCONF_PROJECT_VERSION where PTXCONF_PROJECT_VERSION is dumped anyway,
> > what about:
> 
> Be careful with making such statements. We have many cases where variables
> names are generated like this:
> 
> base  :=GCC
> version_var   :=$(base)_VERSION
> major :=$($(version_var)_MAJOR)
> 
> This example is completely fabricated, but I think you can see how just
> searching for the variable names is not enough.
> 
> In this case, I think the variables aren't used, but I'll need to review
> the code carefully before applying such a patch.

Gentle ping... I'm still holding this patch in my tree and built quite few
projects with it. So, here it is again for your consideration

From: Ladislav Michl <la...@linux-mips.org>
Date: Tue, 18 Aug 2015 12:18:13 +0200
Subject: [PATCH] Remove unused Version.make

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/post/dump.make   |  2 +-
 rules/pre/Version.make | 27 ---
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 rules/pre/Version.make

diff --git a/rules/post/dump.make b/rules/post/dump.make
index 9931ee4..bba46d7 100644
--- a/rules/post/dump.make
+++ b/rules/post/dump.make
@@ -26,7 +26,7 @@ M2B_DUMP_VARIABLES := \
PTXCONF_CONFIGFILE_VERSION \
PTXCONFIG PTXCONF_SYSROOT_TARGET PTXCONF_PROJECT 
PTXCONF_PROJECT_VERSION \
PTXDIST_WORKSPACE PTXDIST_TOPDIR \
-   PTXDIST PTXDIST_FULLVERSION \
+   PTXDIST PTXDIST_VERSION_FULL \
RULESDIR SCRIPTSDIR STATEDIR SYSROOT WORKDIR \
PACKAGES- PACKAGES-y PACKAGES-m
 
diff --git a/rules/pre/Version.make b/rules/pre/Version.make
deleted file mode 100644
index 5ebc827..000
--- a/rules/pre/Version.make
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-bu...@gmx.de>
-#   (C) 2008 by Wolfram Sang <w.s...@pengutronix.de>
-#
-# 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.
-#
-
-GCC_VERSION:= $(call remove_quotes,$(PTXCONF_CROSSCHAIN_CHECK))
-_version_temp  := $(subst ., ,$(GCC_VERSION))
-GCC_VERSION_MAJOR  := $(word 1,$(_version_temp))
-GCC_VERSION_MINOR  := $(word 2,$(_version_temp))
-GCC_VERSION_MICRO  := $(word 3,$(_version_temp))
-
-GLIBC_VERSION  := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
-_version_temp  := $(subst ., ,$(GLIBC_VERSION))
-GLIBC_VERSION_MAJOR:= $(word 1,$(_version_temp))
-GLIBC_VERSION_MINOR:= $(word 2,$(_version_temp))
-GLIBC_VERSION_MICRO:= $(word 3,$(_version_temp))
-
-PTXDIST_FULLVERSION:= $(call 
remove_quotes,ptxdist-$(PTXDIST_VERSION_FULL)$(PTXCONF_PROJECT_VERSION))
-_version_temp  :=
-
-# vim: syntax=make
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0

2016-01-21 Thread Ladislav Michl 
Also update help to match official description.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/usb-modeswitch.in   | 3 ++-
 rules/usb-modeswitch.make | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in
index 555d8a7..aaefd86 100644
--- a/rules/usb-modeswitch.in
+++ b/rules/usb-modeswitch.in
@@ -5,6 +5,7 @@ config USB_MODESWITCH
prompt "usb-modeswitch"
select LIBUSB
help
- Activating switchable USB devices on Linux.
+ USB_ModeSwitch is (surprise!) a mode switching tool
+ for controlling 'multi-mode' USB devices.
 
 # vim: set sw=8 ts=8 noet ft=kconfig:
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index d6a0a82..4ebf0e8 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION := 2.2.1
-USB_MODESWITCH_MD5 := 46cd7fa937655ab2df616c1d5dfb121e
+USB_MODESWITCH_VERSION := 2.3.0
+USB_MODESWITCH_MD5 := 7faf7dccd50b3ca8aaa16fcb5bf0dc2f
 USB_MODESWITCH := usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX  := tar.bz2
 USB_MODESWITCH_URL := 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Semicolon in filenames

2016-01-21 Thread Ladislav Michl 
Now I'm going to be honest. Previous patch 'Add usb-modeswitch-data package'
break things - 'ptxdist images' fails as ':' is used as delimiter in perms file.
Patch bellow escapes semicolon on producer side, anyone cares about consumer?

ladis

diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh 
b/scripts/lib/ptxd_make_xpkg_pkg.sh
index 5ba404e..8e6664b 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -209,6 +209,7 @@ install directory:
 
 install -m "${mod_nfs}" -d "${ndirs[@]/%/${dir}}" &&
 install -m "${mod}" -o "${usr}" -g "${grp}" -d "${pdirs[@]/%/${dir}}" &&
+dir="$(echo ${dir} | sed -e 's/[:]/\\:/g')" &&
 
 echo "f:${dir}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}" ||
 ptxd_install_error "install_dir failed!"
@@ -343,6 +344,9 @@ Usually, just remove the 6th parameter and everything works 
fine.
 # now change to requested user and group
 chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
 
+# escape semicolon
+dst="$(echo ${dst} | sed -e 's/[:]/\\:/g')" &&
+
 echo "f:${dst}:${usr}:${grp}:${mod}" >> "${pkg_xpkg_perms}"
 }
 export -f ptxd_install_file_impl
@@ -413,6 +417,7 @@ install device node:
mknod -m "${mod}" "${d}" "${type}" ${major} ${minor} || return
 done &&
 chown "${usr}:${grp}" "${pdirs[@]/%/${dst}}" &&
+dst="$(echo ${dst} | sed -e 's/[:]/\\:/g')" &&
 
 echo "n:${dst}:${usr}:${grp}:${mod}:${type}:${major}:${minor}" >> 
"${pkg_xpkg_perms}"
 }

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] Add usb-modeswitch-data package

2016-01-21 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 rules/usb-modeswitch-data.in   | 10 ++
 rules/usb-modeswitch-data.make | 76 ++
 2 files changed, 86 insertions(+)
 create mode 100644 rules/usb-modeswitch-data.in
 create mode 100644 rules/usb-modeswitch-data.make

diff --git a/rules/usb-modeswitch-data.in b/rules/usb-modeswitch-data.in
new file mode 100644
index 000..ffaacda
--- /dev/null
+++ b/rules/usb-modeswitch-data.in
@@ -0,0 +1,10 @@
+## SECTION=shell_and_console
+
+config USB_MODESWITCH_DATA
+   tristate
+   prompt "usb-modeswitch-data"
+   depends on USB_MODESWITCH && UDEV
+   help
+ Device database and udev rules file for USB_ModeSwitch.
+
+# vim: set sw=8 ts=8 noet ft=kconfig:
diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
new file mode 100644
index 000..7b43f0f
--- /dev/null
+++ b/rules/usb-modeswitch-data.make
@@ -0,0 +1,76 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Ladislav Michl <la...@linux-mips.org>
+#
+# 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_USB_MODESWITCH_DATA) += usb-modeswitch-data
+
+#
+# Paths and names
+#
+USB_MODESWITCH_DATA_VERSION:= 20160112
+USB_MODESWITCH_DATA_MD5:= 040d11138fc0a61b980d704ac3b4547f
+USB_MODESWITCH_DATA:= 
usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
+USB_MODESWITCH_DATA_SUFFIX := tar.bz2
+USB_MODESWITCH_DATA_URL:= 
http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
+USB_MODESWITCH_DATA_SOURCE := 
$(SRCDIR)/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
+USB_MODESWITCH_DATA_DIR:= $(BUILDDIR)/$(USB_MODESWITCH_DATA)
+USB_MODESWITCH_DATA_LICENSE:= GPL-2.0
+
+# 
+# Nothing to Prepare
+# 
+$(STATEDIR)/usb-modeswitch-data.prepare:
+   @$(call targetinfo)
+   @$(call touch)
+
+# 
+# Nothing to Compile
+# 
+$(STATEDIR)/usb-modeswitch-data.compile:
+   @$(call targetinfo)
+   @$(call touch)
+
+# 
+# Nothing to Install
+# 
+$(STATEDIR)/usb-modeswitch-data.install:
+   @$(call targetinfo)
+   @$(call touch)
+
+# 
+# Target-Install
+# 
+$(STATEDIR)/usb-modeswitch-data.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, usb-modeswitch-data)
+   @$(call install_fixup, usb-modeswitch-data,PRIORITY,optional)
+   @$(call install_fixup, usb-modeswitch-data,SECTION,base)
+   @$(call install_fixup, usb-modeswitch-data,AUTHOR,"Ladislav Michl 
<la...@linux-mips.org>")
+   @$(call install_fixup, usb-modeswitch-data,DESCRIPTION,missing)
+
+   @$(call install_copy, usb-modeswitch-data, 0, 0, 0644, \
+   $(USB_MODESWITCH_DATA_DIR)/40-usb_modeswitch.rules, \
+/etc/udev/rules.d/40-usb_modeswitch.rules)
+
+   @find $(USB_MODESWITCH_DATA_DIR)/usb_modeswitch.d -type f -printf 
'%f\n' | \
+   while read file; do \
+   $(call install_copy, usb-modeswitch-data, 0, 0, 0644, \
+   $(USB_MODESWITCH_DATA_DIR)/usb_modeswitch.d/$$file, \
+   /usr/share/usb_modeswitch/$$file) \
+   done
+
+   @$(call install_finish, usb-modeswitch-data)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] NetworkManager: update to 1.0.10

2016-01-04 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
 
---
 networkmanager.make |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--- ptxdist/rules/networkmanager.make   2016-01-03 20:52:27.010362802 +0100
+++ ptxdist-2015.12.0/rules/networkmanager.make 2016-01-04 13:53:04.335182607 
+0100
@@ -17,8 +17,8 @@
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.0.8
-NETWORKMANAGER_MD5 := 968197dc881ffa36d45042214071baa6
+NETWORKMANAGER_VERSION := 1.0.10
+NETWORKMANAGER_MD5 := a8f54460a4708efd840358f32d0968fd
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
 NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] genimage: Add static UBI volumes support

2016-01-04 Thread Ladislav Michl 
Bare images (kernel, U-Boot, its environment) need to reside inside
static UBI volumes. Add read-only partition flag and use it for that
purpose. Also make partition's "image" voluntary as ubinize will yell
anyway. Once this behavior gets modified eventually, it will bring us
possibility to create empty volumes ready for runtime update.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
 genimage.c  |2 ++
 genimage.h  |1 +
 image-ubi.c |   26 --
 3 files changed, 19 insertions(+), 10 deletions(-)

diff -ur genimage-8.orig/genimage.c genimage-8/genimage.c
--- genimage-8/genimage.c   2015-09-23 12:11:20.732052910 +0200
+++ genimage-8/genimage.c   2016-01-04 03:55:17.304593713 +0100
@@ -87,6 +87,7 @@
CFG_STR("size", NULL, CFGF_NONE),
CFG_INT("partition-type", 0, CFGF_NONE),
CFG_BOOL("bootable", cfg_false, CFGF_NONE),
+   CFG_BOOL("read-only", cfg_false, CFGF_NONE),
CFG_STR("image", NULL, CFGF_NONE),
CFG_BOOL("autoresize", 0, CFGF_NONE),
CFG_BOOL("in-partition-table", cfg_true, CFGF_NONE),
@@ -294,6 +295,7 @@
part->offset = cfg_getint_suffix(partsec, "offset");
part->partition_type = cfg_getint(partsec, "partition-type");
part->bootable = cfg_getbool(partsec, "bootable");
+   part->read_only = cfg_getbool(partsec, "read-only");
part->image = cfg_getstr(partsec, "image");
part->autoresize = cfg_getbool(partsec, "autoresize");
part->in_partition_table = cfg_getbool(partsec, 
"in-partition-table");
diff -ur genimage-8.orig/genimage.h genimage-8/genimage.h
--- genimage-8/genimage.h   2015-09-23 12:11:20.752052590 +0200
+++ genimage-8/genimage.h   2016-01-04 03:55:17.304593713 +0100
@@ -32,6 +32,7 @@
unsigned char partition_type;
cfg_bool_t bootable;
cfg_bool_t extended;
+   cfg_bool_t read_only;
const char *image;
struct list_head list;
int autoresize;
diff -ur genimage-8.orig/image-ubi.c genimage-8/image-ubi.c
--- genimage-8/image-ubi.c  2013-04-16 15:28:57.133432239 +0200
+++ genimage-8/image-ubi.c  2016-01-04 03:55:17.308593713 +0100
@@ -47,21 +47,27 @@
}
 
list_for_each_entry(part, >partitions, list) {
-   struct image *child;
-   child = image_get(part->image);
-   if (!child) {
-   image_error(image, "could not find %s\n", part->image);
-   fclose(fini);
-   ret = -EINVAL;
-   goto err_free;
+   struct image *child = NULL;
+   unsigned long long size = part->size;
+   if (part->image)
+   child = image_get(part->image);
+   if (!size) {
+   if (!child) {
+   image_error(image, "could not find %s\n", 
part->image);
+   fclose(fini);
+   ret = -EINVAL;
+   goto err_free;
+   }
+   size = child->size;
}
 
fprintf(fini, "[%s]\n", part->name);
fprintf(fini, "mode=ubi\n");
-   fprintf(fini, "image=%s\n", imageoutfile(child));
+   if (child)
+   fprintf(fini, "image=%s\n", imageoutfile(child));
fprintf(fini, "vol_id=%d\n", i);
-   fprintf(fini, "vol_size=%lld\n", child->size);
-   fprintf(fini, "vol_type=dynamic\n");
+   fprintf(fini, "vol_size=%lld\n", size);
+   fprintf(fini, "vol_type=%s\n", part->read_only ? "static" : 
"dynamic");
fprintf(fini, "vol_name=%s\n", part->name);
if (part->autoresize)
fprintf(fini, "vol_flags=autoresize\n");

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] dosfstools: fix url and update to 3.0.28

2016-01-03 Thread Ladislav Michl 
Dosfstools moved to github. Once there, update to version 3.0.28

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 dosfstools.make |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/dosfstools.make b/rules/dosfstools.make
index 70d8237..4d77a63 100644
--- a/rules/dosfstools.make
+++ b/rules/dosfstools.make
@@ -17,12 +17,12 @@ PACKAGES-$(PTXCONF_DOSFSTOOLS) += dosfstools
 #
 # Paths and names
 #
-DOSFSTOOLS_VERSION := 3.0.26
-DOSFSTOOLS_MD5 := 45012f5f56f2aae3afcd62120b9e5a08
+DOSFSTOOLS_VERSION := 3.0.28
+DOSFSTOOLS_MD5 := 6a047a6c65186b9ebb1853709adb36db
 DOSFSTOOLS := dosfstools-$(DOSFSTOOLS_VERSION)
 DOSFSTOOLS_SUFFIX  := tar.xz
 DOSFSTOOLS_SRC := $(DOSFSTOOLS).$(DOSFSTOOLS_SUFFIX)
-DOSFSTOOLS_URL := 
http://www.daniel-baumann.ch/files/software/dosfstools/$(DOSFSTOOLS_SRC)
+DOSFSTOOLS_URL := 
https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)/$(DOSFSTOOLS_SRC)
 DOSFSTOOLS_SOURCE  := $(SRCDIR)/$(DOSFSTOOLS_SRC)
 DOSFSTOOLS_DIR := $(BUILDDIR)/$(DOSFSTOOLS)
 DOSFSTOOLS_LICENSE := GPL-3.0

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Future plans for uClibc-ng?

2016-01-03 Thread Ladislav Michl 
On Sun, Jan 03, 2016 at 10:27:52AM +0100, Alexander Dahl wrote:
> Hei hei,
> 
> On Sat, Jan 02, 2016 at 10:49:49PM +0100, Ladislav Michl wrote:
> > But are there any active uClibc users?
> 
> Do you mean in general or specifically with ptxdist? As far as ptxdist
> is concerned, we considered it once for a project with very few RAM,
> but didn't have time to evaluate it then. So no experience from my
> side for ptxdist with uclibc. 
> 
> However I use it on a day to day basis on other projects based on
> buildroot (namely fli4l).

I just checked my 10 years old project. Current kernel size is few
hundreds KiB greater than 2.6.12 plus uClibc size. That makes me feel
a bit hopeless. However I still think there is some value in pissing
against wind, just because all progress depends on unreasonable men.

It seems uClibc-ng didn't dump out anything present in uClibc, so
maintaining both does make little sense. I would not also rename
uclibc.make file and pretend uClibc is still alive in its uClibc-ng
incarnation as I hope it will end up the very same way as (e)glibc
story. Counterproposals?

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Future plans for uClibc-ng?

2016-01-02 Thread Ladislav Michl 
Hi,

On Thu, Dec 31, 2015 at 12:48:31PM -0800, Bryan Hundven wrote:
> Hello,
> 
> I'm curious to know if ptxdist/OSELAS.Toolchain plans to support
> uClibc-ng in the future?
> 
> http://www.uclibc-ng.org/

with half a year without commit to uClib git I'm considering it a dead
project (I failed to verify mailing list activity as neither Firefox
nor IE (!) allowed me to enter archives). uClibc-ng should be relatively
easy to support as config system remained the same... Just tried and
succeded. But are there any active uClibc users?

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 0/6] OSELAS.Toolchain host tool version bumps

2015-12-14 Thread Ladislav Michl 
On Sun, Dec 13, 2015 at 08:37:14PM +0100, Robert Schwebel wrote:
> Hi Clemens,
> 
> On Sun, Dec 13, 2015 at 04:34:43PM +0100, Clemens Gruber wrote:
> > the used host-xz version was not available anymore, I therefore updated
> > it and in the process, decided to update some of the other host
> > libraries as well.
> > 
> > In the next patch following these host tool version bumps, I made a
> > first attempt to move to current stable gcc, glibc, binutils and gdb.
> > (Just as a starting point, marked RFC)
> 
> Thanks for your patches, but Michael is already testing the toolchain
> for the new december release. Please stay tuned, a release is already
> being prepared based on the latest-and-greatest.

Hi Robert,

staying tunned is not enough ;-) Is there any preview available? I just
checked pengutronix' git and didn't find anything related.
I need this patch included: 
https://gcc.gnu.org/ml/gcc-patches/2012-07/msg01483.html
and will eventuely provide patch against OSELAS.Toolchain if needed.

Best regards,
ladis

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] NetworkManager: update to 1.0.8

2015-12-09 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index dc51188..61c4d28 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.0.6
-NETWORKMANAGER_MD5 := 00f5f9ec69725a9f9b99366853c6f73e
+NETWORKMANAGER_VERSION := 1.0.8
+NETWORKMANAGER_MD5 := 968197dc881ffa36d45042214071baa6
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
 NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] ModemManager: update to 1.4.12

2015-12-09 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---
diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index aa29358..8d343b8 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.4.8
-MODEMMANAGER_MD5   := 03242732a8dbaccd52100b7e7bb1998e
+MODEMMANAGER_VERSION   := 1.4.12
+MODEMMANAGER_MD5   := 66cc7266b15525cb366253e6639fc564
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.xz
 MODEMMANAGER_URL   := 
http://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] v2 networkmanager: enable ppp support

2015-10-21 Thread Ladislav Michl 
Changes since v1:
- Select also PPP_PLUGINS otherwise plugin option is unknown to pppd

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
   
---
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index b4af2b2..90c2680 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -19,6 +19,8 @@ menuconfig NETWORKMANAGER
select UDEV if RUNTIME
select LIBGUDEV
select MODEMMANAGER if NETWORKMANAGER_WWAN
+   select PPP  if NETWORKMANAGER_PPP
+   select PPP_PLUGINS  if NETWORKMANAGER_PPP
select WPA_SUPPLICANT   if NETWORKMANAGER_WIRELESS && RUNTIME
select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && 
RUNTIME
select DBUS_PYTHON  if NETWORKMANAGER_EXAMPLES && RUNTIME
@@ -64,6 +66,10 @@ config NETWORKMANAGER_WWAN
bool
prompt "enable WWAN support"
 
+config NETWORKMANAGER_PPP
+   bool
+   prompt "enable ppp support"
+
 config NETWORKMANAGER_EXAMPLES
bool
prompt "install examples for Network Manager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 842c4e2..e0d 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -47,7 +47,7 @@ NETWORKMANAGER_CONF_OPT := \
--disable-wimax \
--disable-polkit \
--disable-modify-system \
-   --disable-ppp \
+   --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
--disable-bluez5-dun \
--disable-concheck \
--enable-more-warnings \
@@ -76,6 +76,10 @@ NETWORKMANAGER_CONF_OPT := \
--without-valgrind \
--without-tests
 
+ifdef PTXCONF_NETWORKMANAGER_PPP
+NETWORKMANAGER_CONF_OPT += \
+   --with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH)
+endif
 
 ifdef PTXCONF_NETWORKMANAGER_WWAN
 NETWORKMANAGER_LDFLAGS := \
@@ -180,6 +184,9 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN
@$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-device-plugin-wwan)
@$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-wwan)
 endif
+ifdef PTXCONF_NETWORKMANAGER_PPP
+   @$(call install_copy, networkmanager, 0, 0, 0644, -, 
$(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
+endif
@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-util)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib)

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager: enable ppp support

2015-10-21 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
  
---
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index b4af2b2..e932547 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -19,6 +19,7 @@ menuconfig NETWORKMANAGER
select UDEV if RUNTIME
select LIBGUDEV
select MODEMMANAGER if NETWORKMANAGER_WWAN
+   select PPP  if NETWORKMANAGER_PPP
select WPA_SUPPLICANT   if NETWORKMANAGER_WIRELESS && RUNTIME
select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && 
RUNTIME
select DBUS_PYTHON  if NETWORKMANAGER_EXAMPLES && RUNTIME
@@ -64,6 +65,10 @@ config NETWORKMANAGER_WWAN
bool
prompt "enable WWAN support"
 
+config NETWORKMANAGER_PPP
+   bool
+   prompt "enable ppp support"
+
 config NETWORKMANAGER_EXAMPLES
bool
prompt "install examples for Network Manager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 842c4e2..e0d 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -47,7 +47,7 @@ NETWORKMANAGER_CONF_OPT := \
--disable-wimax \
--disable-polkit \
--disable-modify-system \
-   --disable-ppp \
+   --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
--disable-bluez5-dun \
--disable-concheck \
--enable-more-warnings \
@@ -76,6 +76,10 @@ NETWORKMANAGER_CONF_OPT := \
--without-valgrind \
--without-tests
 
+ifdef PTXCONF_NETWORKMANAGER_PPP
+NETWORKMANAGER_CONF_OPT += \
+   --with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH)
+endif
 
 ifdef PTXCONF_NETWORKMANAGER_WWAN
 NETWORKMANAGER_LDFLAGS := \
@@ -180,6 +184,9 @@ ifdef PTXCONF_NETWORKMANAGER_WWAN
@$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-device-plugin-wwan)
@$(call install_lib, networkmanager, 0, 0, 0644, 
NetworkManager/libnm-wwan)
 endif
+ifdef PTXCONF_NETWORKMANAGER_PPP
+   @$(call install_copy, networkmanager, 0, 0, 0644, -, 
$(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
+endif
@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-util)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib)

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager: add help text to WWAN option

2015-10-21 Thread Ladislav Michl 
It is not clear at first sight why selecting WWAN adds
--with-modem-manager-1 configure option.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
 
---
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index b4af2b2..6374deb 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -63,6 +63,9 @@ config NETWORKMANAGER_WIRELESS
 config NETWORKMANAGER_WWAN
bool
prompt "enable WWAN support"
+   help
+ Enable ModemManager interface support, wwan and bluetooth
+ plugins depend on it.
 
 config NETWORKMANAGER_EXAMPLES
bool


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] networkmanager: version bump 1.0.0 -> 1.0.6

2015-10-21 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
 
---
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 842c4e2..fcb523e 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION := 1.0.0
-NETWORKMANAGER_MD5 := 71cae8707a90fa92e28cafbc9262b548
+NETWORKMANAGER_VERSION := 1.0.6
+NETWORKMANAGER_MD5 := 00f5f9ec69725a9f9b99366853c6f73e
 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX  := tar.xz
 NETWORKMANAGER_URL := 
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] alsa: version bump 1.0.24 -> 1.0.29

2015-09-30 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

---

 b/rules/alsa-lib.make  
  |5 -
 b/rules/alsa-utils.make
  |4 -
 
patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch
 |   35 --
 patches/alsa-lib-1.0.24.1/series   
  |1
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git 
a/patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch
 
b/patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch
deleted file mode 100644
index fcc98e7..000
--- 
a/patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1720d30ad82ebb8b5f52fc08c6c610e51203fa89 Mon Sep 17 00:00:00 2001
-From: Alexander Stein <a.st...@systec-electronic.com>
-Date: Thu, 19 May 2011 15:16:36 +0200
-Subject: [PATCH] ctlparse: Respect softfloat configure option
-
-If we want softlfoat we can't use ceil which uses libm.
-
-Signed-off-by: Alexander Stein <a.st...@systec-electronic.com>
-Signed-off-by: Takashi Iwai <ti...@suse.de>

- src/control/ctlparse.c |9 +
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c
-index a929816..a16f96a 100644
 a/src/control/ctlparse.c
-+++ b/src/control/ctlparse.c
-@@ -33,8 +33,17 @@
- 
- /* Function to convert from percentage to volume. val = percentage */
- 
-+#ifdef HAVE_SOFT_FLOAT
-+static inline long int convert_prange1(long val, long min, long max)
-+{
-+  long temp = val * (max - min);
-+  return temp / 100 + min + ((temp % 100) == 0 ? 0 : 1);
-+}
-+#else
-+
- #define convert_prange1(val, min, max) \
-   ceil((val) * ((max) - (min)) * 0.01 + (min))
-+#endif
- 
- #define check_range(val, min, max) \
-   ((val < min) ? (min) : ((val > max) ? (max) : (val)))
diff --git a/patches/alsa-lib-1.0.24.1/series b/patches/alsa-lib-1.0.24.1/series
deleted file mode 100644
index fc771e0..000
--- a/patches/alsa-lib-1.0.24.1/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-ctlparse-Respect-softfloat-configure-option.patch
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index e949274..c53ad41 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
 ALSA_LIB_SUFFIX:= tar.bz2
 
 ifdef PTXCONF_ALSA_LIB_FULL
-ALSA_LIB_VERSION   := 1.0.24.1
-ALSA_LIB_MD5   := 7cc05f25e1d5b65da8fb3fdcd540f226
+ALSA_LIB_VERSION   := 1.0.29
+ALSA_LIB_MD5   := de67e0eca72474d6b1121037dafe1024
 ALSA_LIB   := alsa-lib-$(ALSA_LIB_VERSION)
 ALSA_LIB_URL   := \

http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
 \
@@ -51,7 +51,6 @@ ALSA_LIB_ENV  := $(CROSS_ENV)
 #
 ALSA_LIB_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
-   --enable-static \
--enable-shared \
--enable-fast-install \
--enable-libtool-lock \
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 4b06ab0..a0429f2 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils
 #
 # Paths and names
 #
-ALSA_UTILS_VERSION := 1.0.24.2
-ALSA_UTILS_MD5 := 8238cd57cb301d1c36bcf0ecb59ce6b2
+ALSA_UTILS_VERSION := 1.0.29
+ALSA_UTILS_MD5 := 6b289bf874c4c9a63f4b3973093dd404
 ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION)
 ALSA_UTILS_SUFFIX  := tar.bz2
 ALSA_UTILS_URL := \
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] mtd-utils: version bump 1.5.1 -> 1.5.2

2015-09-30 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl <la...@linux-mips.org>

 ---

diff --git a/patches/mtd-utils-1.5.1/0001-make-ubifs-optional.patch 
b/patches/mtd-utils-1.5.2/0001-make-ubifs-optional.patch
similarity index 100%
rename from patches/mtd-utils-1.5.1/0001-make-ubifs-optional.patch
rename to patches/mtd-utils-1.5.2/0001-make-ubifs-optional.patch
diff --git 
a/patches/mtd-utils-1.5.1/0002-Make-liblzo-optional-for-ubifs-tools.patch 
b/patches/mtd-utils-1.5.2/0002-Make-liblzo-optional-for-ubifs-tools.patch
similarity index 100%
rename from 
patches/mtd-utils-1.5.1/0002-Make-liblzo-optional-for-ubifs-tools.patch
rename to 
patches/mtd-utils-1.5.2/0002-Make-liblzo-optional-for-ubifs-tools.patch
diff --git 
a/patches/mtd-utils-1.5.1/0003-mkfs.ubifs-change-add_directory-argument-to-existing.patch
 
b/patches/mtd-utils-1.5.2/0003-mkfs.ubifs-change-add_directory-argument-to-existing.patch
similarity index 100%
rename from 
patches/mtd-utils-1.5.1/0003-mkfs.ubifs-change-add_directory-argument-to-existing.patch
rename to 
patches/mtd-utils-1.5.2/0003-mkfs.ubifs-change-add_directory-argument-to-existing.patch
diff --git 
a/patches/mtd-utils-1.5.1/0004-mkfs.ubifs-use-xmalloc-xzalloc-for-allocating-memory.patch
 
b/patches/mtd-utils-1.5.2/0004-mkfs.ubifs-use-xmalloc-xzalloc-for-allocating-memory.patch
similarity index 100%
rename from 
patches/mtd-utils-1.5.1/0004-mkfs.ubifs-use-xmalloc-xzalloc-for-allocating-memory.patch
rename to 
patches/mtd-utils-1.5.2/0004-mkfs.ubifs-use-xmalloc-xzalloc-for-allocating-memory.patch
diff --git 
a/patches/mtd-utils-1.5.1/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch
 
b/patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch
similarity index 100%
rename from 
patches/mtd-utils-1.5.1/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch
rename to 
patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch
diff --git 
a/patches/mtd-utils-1.5.1/0006-mkfs.ubifs-Add-extended-attribute-support.patch 
b/patches/mtd-utils-1.5.2/0006-mkfs.ubifs-Add-extended-attribute-support.patch
similarity index 100%
rename from 
patches/mtd-utils-1.5.1/0006-mkfs.ubifs-Add-extended-attribute-support.patch
rename to 
patches/mtd-utils-1.5.2/0006-mkfs.ubifs-Add-extended-attribute-support.patch
diff --git 
a/patches/mtd-utils-1.5.1/0007-mkfs.ubifs-Optionally-create-extended-attribute-with.patch
 
b/patches/mtd-utils-1.5.2/0007-mkfs.ubifs-Optionally-create-extended-attribute-with.patch
similarity index 100%
rename from 
patches/mtd-utils-1.5.1/0007-mkfs.ubifs-Optionally-create-extended-attribute-with.patch
rename to 
patches/mtd-utils-1.5.2/0007-mkfs.ubifs-Optionally-create-extended-attribute-with.patch
diff --git a/patches/mtd-utils-1.5.1/series b/patches/mtd-utils-1.5.2/series
similarity index 100%
rename from patches/mtd-utils-1.5.1/series
rename to patches/mtd-utils-1.5.2/series
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 83611c9..2a68abb 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils
 #
 # Paths and names
 #
-MTD_UTILS_VERSION  := 1.5.1
-MTD_UTILS_MD5  := 4ad1f758d49615efe14edb107eddac5c
+MTD_UTILS_VERSION  := 1.5.2
+MTD_UTILS_MD5  := 596bc7b20a6d4fb86d63fc9b8af674d6
 MTD_UTILS  := mtd-utils-$(MTD_UTILS_VERSION)
 MTD_UTILS_SUFFIX   := tar.bz2
 MTD_UTILS_URL  := 
ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Check for specific libc version

2015-09-30 Thread Ladislav Michl 
On Mon, Sep 28, 2015 at 12:29:02PM +0200, Michael Olbrich wrote:
> On Tue, Aug 18, 2015 at 12:30:41PM +0200, Ladislav Michl wrote:
> > Hi there!
> > 
> > 
> > PTXCONF_GLIBC_VERSION is used for check for specific toolchain. However 
> > when left
> > blank, compilation fails with:
> > ---
> > target: glibc.targetinstall
> > ---
> > 
> > ptxdist: error: ptxd_make_xpkg_init: please define _VERSION
> > ptxdist/rules/glibc.make:30: recipe for target 'glibc.targetinstall' failed
> > 
> > shouldn't we get libc version from toolchain in this case?
> 
> No. Reproducibility is one of the main goals of PTXdist. What we should
> actually do is check if PTXCONF_GLIBC_VERSION matches the actual glibc
> version, like we do for gcc.

Agree, but we are already selecting toolchains, which gives a clue about
glibc used. For gcclibs code reads:
ifeq ($(shell which $(CROSS_CC) 2>/dev/null),)
GCCLIBS_VERSION := unknown
else
GCCLIBS_VERSION := $(shell $(CROSS_CC) -dumpversion)
endif
and GCC version is verified earlier in check_compiler(). But leaving
GLIBC_VERSION blank does not make PTXdist complain. Everything is built
and it is targetinstall which fails. That a bit unexpected to me. I would
expect
a) glibc version picked from toolchain or
b) ptxdist bailing out early
when glibc version is not specified. But you already voted for b).
Also using the real glibc version in package name instead of some
random string makes more sense.

> However, I'm not sure, if there is a simple test for that. I see a
> libc-.so in my toolchains, but I\m not sure if that's always
> the case.

usr/bin/ldd from sysroot holds answer as well, also
strings  | grep "version [0-9]" could work.

ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Check for specific libc version

2015-08-18 Thread Ladislav Michl 
Hi there!


PTXCONF_GLIBC_VERSION is used for check for specific toolchain. However when 
left
blank, compilation fails with:
---
target: glibc.targetinstall
---

ptxdist: error: ptxd_make_xpkg_init: please define PKG_VERSION
ptxdist/rules/glibc.make:30: recipe for target 'glibc.targetinstall' failed

shouldn't we get libc version from toolchain in this case?

This problem has side effect: as it seems the only variable used from
Versions.make is PTXDIST_FULLVERSION composed from PTXDIST_VERSION_FULL and
PTXCONF_PROJECT_VERSION where PTXCONF_PROJECT_VERSION is dumped anyway,
what about:
---
 rules/post/dump.make   |  2 +-
 rules/pre/Version.make | 27 ---
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 rules/pre/Version.make

diff --git a/rules/post/dump.make b/rules/post/dump.make
index 9931ee4..bba46d7 100644
--- a/rules/post/dump.make
+++ b/rules/post/dump.make
@@ -26,7 +26,7 @@ M2B_DUMP_VARIABLES := \
PTXCONF_CONFIGFILE_VERSION \
PTXCONFIG PTXCONF_SYSROOT_TARGET PTXCONF_PROJECT 
PTXCONF_PROJECT_VERSION \
PTXDIST_WORKSPACE PTXDIST_TOPDIR \
-   PTXDIST PTXDIST_FULLVERSION \
+   PTXDIST PTXDIST_VERSION_FULL \
RULESDIR SCRIPTSDIR STATEDIR SYSROOT WORKDIR \
PACKAGES- PACKAGES-y PACKAGES-m
 
diff --git a/rules/pre/Version.make b/rules/pre/Version.make
deleted file mode 100644
index 5ebc827..000
--- a/rules/pre/Version.make
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003 by Marc Kleine-Budde kleine-bu...@gmx.de
-#   (C) 2008 by Wolfram Sang w.s...@pengutronix.de
-#
-# 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.
-#
-
-GCC_VERSION:= $(call remove_quotes,$(PTXCONF_CROSSCHAIN_CHECK))
-_version_temp  := $(subst ., ,$(GCC_VERSION))
-GCC_VERSION_MAJOR  := $(word 1,$(_version_temp))
-GCC_VERSION_MINOR  := $(word 2,$(_version_temp))
-GCC_VERSION_MICRO  := $(word 3,$(_version_temp))
-
-GLIBC_VERSION  := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
-_version_temp  := $(subst ., ,$(GLIBC_VERSION))
-GLIBC_VERSION_MAJOR:= $(word 1,$(_version_temp))
-GLIBC_VERSION_MINOR:= $(word 2,$(_version_temp))
-GLIBC_VERSION_MICRO:= $(word 3,$(_version_temp))
-
-PTXDIST_FULLVERSION:= $(call 
remove_quotes,ptxdist-$(PTXDIST_VERSION_FULL)$(PTXCONF_PROJECT_VERSION))
-_version_temp  :=
-
-# vim: syntax=make
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] [RFC] gammu: add new package

2013-02-05 Thread Ladislav Michl 
Any reason to add Gammu instead of Gnokii? Gammu is a Gnokii fork created to
add features faster. At that time gnokii developers didn't like to drop code
quality in the favour of more features. Well, it is possible that code
quality increased meantime. Just asking.

Thanks,
ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] configure.ac: Improve curses searching

2012-03-14 Thread Ladislav Michl 
On Mon, Mar 12, 2012 at 09:59:50AM +0100, Michael Olbrich wrote:
 On Thu, Mar 08, 2012 at 11:07:12AM +0100, Ladislav Michl wrote:
  This is a resend of an older patch: 
  http://www.mail-archive.com/ptxdist@pengutronix.de/msg03400.html
  
  Cygwin-1.7 places curses headers into /usr/include/ncurses.
  Tested on Debian, MinGW with pdcurses and Cygwin.
 
 any reason, why you changed the search order to look for curses first?
 
 Michael

I'm fine with dropping that change. For mconf, curses is fine. On systems with 
ncurses,
curses just symlinks to them. Changing order just allows mconf to link to 
default
curses-type library, whereas ncurses explicitely links to ncurses if it is 
installed.

ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] scripts/ipkg-push: return nonzero on error

2012-03-14 Thread Ladislav Michl 
ipkg-push returns zero when ipkg repository path does not exist causing make
continues ignoring error.

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 ipkg-push |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/ipkg-push b/scripts/ipkg-push
index 3f8c823..b8d5228 100755
--- a/scripts/ipkg-push
+++ b/scripts/ipkg-push
@@ -33,7 +33,7 @@ usage() {
echo   --dist distname  use this to make a dist release 
(optional)
echo   --type package type  specify package type (default: ipkg)
echo
-   exit 0
+   exit 1
 }
 
 IPKGDIR=

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] image_ipkg.make: create repository directory

2012-03-14 Thread Ladislav Michl 
Pushing ipks fails when top level repository directory does not exists.
Once here, use helper variables for repository paths.

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 image_ipkg.make |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
index 5449553..4989632 100644
--- a/rules/post/image_ipkg.make
+++ b/rules/post/image_ipkg.make
@@ -11,17 +11,21 @@
 
 SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push
 
-ipkg-push : $(STATEDIR)/ipkg-push
+ipkg-push: $(STATEDIR)/ipkg-push
+
+IPKG_DISTDIR   := $(call 
remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION))
+IPKG_REPODIR   := $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY))
 
 $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post 
$(STATEDIR)/world.targetinstall
@$(call targetinfo)
 ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH
-   rm  -rf 
$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)
+   rm  -rf $(IPKG_DISTDIR)
 endif
+   mkdir -p $(IPKG_REPODIR)
@echo pushing ipkg packages to ipkg-repository...
@$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \
--ipkgdir  $(call remove_quotes,$(PKGDIR)) \
-   --repodir  $(call 
remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \
+   --repodir  $(IPKG_REPODIR) \
--revision $(call remove_quotes,$(PTXDIST_VERSION_FULL)) \
--project  $(call remove_quotes,$(PTXCONF_PROJECT)) \
--dist $(call 
remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) \
@@ -30,12 +34,12 @@ endif
 ifdef PTXCONF_IMAGE_IPKG_SIGN_OPENSSL
@echo signing Packages...
openssl smime -sign \
-   -in 
$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)/Packages
 \
+   -in $(IPKG_DISTDIR)/Packages \
-text -binary \
-outform PEM \
-signer $(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_SIGNER) \
-inkey $(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_KEY) \
-   -out 
$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)/Packages.sig
+   -out $(IPKG_DISTDIR)/Packages.sig
@echo Packages.sig created
 endif
@touch $@

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] configure.ac: Improve curses searching

2012-03-08 Thread Ladislav Michl 
This is a resend of an older patch: 
http://www.mail-archive.com/ptxdist@pengutronix.de/msg03400.html

Cygwin-1.7 places curses headers into /usr/include/ncurses.
Tested on Debian, MinGW with pdcurses and Cygwin.

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 configure.ac |   23 +++
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index 00c2521..ec50a44
--- a/configure.ac
+++ b/configure.ac
@@ -36,25 +36,16 @@ AC_SEARCH_LIBS(regcomp, [regex gnuregex],,
 CONF_LIBS=${LIBS}
 AC_SUBST(CONF_LIBS)
 
-AC_SEARCH_LIBS(mvaddch, [ncurses curses pdcurses], [CURSES_LIB=$ac_lib],
-   [AC_MSG_ERROR([ncurses development library not found, please install 
libncurses-dev])])
+AC_SEARCH_LIBS(mvaddch, [curses ncurses pdcurses], [CURSES_LIB=$ac_lib],
+   [AC_MSG_ERROR([curses development library not found, please install 
libncurses-dev])])
 MCONF_LIBS=${LIBS}
 AC_SUBST(MCONF_LIBS)
 
-if test $CURSES_LIB = ncurses
-then
-   AC_CHECK_HEADER(
-   [ncurses.h],
-   [CURSES_LOC='ncurses.h'],
-   AC_MSG_ERROR([Cannot find ncurses.h.])
-   )
-else
-   AC_CHECK_HEADER(
-   [curses.h],
-   [CURSES_LOC='curses.h'],
-   AC_MSG_ERROR([Cannot find curses.h.])
-   )
-fi
+AC_CHECK_HEADERS(
+   [curses.h ncurses.h ncurses/curses.h ncurses/ncurses.h pdcurses.h 
pdcurses/curses.h pdcurses/pdcurses.h],
+   [CURSES_LOC=$ac_header;found_curses_headers=yes; break;])
+AS_IF([test x$CURSES_LOC = x],
+   [AC_MSG_ERROR([curses headers not found])])
 AC_SUBST(CURSES_LOC)
 
 AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses],[Include path to the 
ncurses headers]),

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] Busybox-1.18.5

2011-07-19 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 config/busybox/Config.in   |   73 +++
 config/busybox/archival/Config.in  |4 +-
 config/busybox/console-tools/Config.in |   13 ++
 config/busybox/coreutils/Config.in |9 +-
 config/busybox/e2fsprogs/Config.in |1 +
 config/busybox/editors/Config.in   |   12 +-
 config/busybox/init/Config.in  |   57 +
 config/busybox/libbb/Config.in |   16 ++-
 config/busybox/loginutils/Config.in|  100 ---
 config/busybox/miscutils/Config.in |   54 +++-
 config/busybox/modutils/Config.in  |1 +
 config/busybox/networking/Config.in|   47 +++-
 config/busybox/networking/udhcp/Config.in  |4 +-
 config/busybox/procps/Config.in|   24 -
 config/busybox/shell/Config.in |  139 +++-
 config/busybox/sysklogd/Config.in  |   16 +++
 config/busybox/util-linux/Config.in|   55 ++--
 ...ild-system-make-3.82-fix.-Closes-bug-2323.patch |   46 ---
 .../0001-reactivate-check-for-tty.patch|0 
 ...nstant-unsigned-to-avoid-integer-overflow.patch |6 +-
 patches/{busybox-1.17.1 = busybox-1.18.5}/series  |1 -
 rules/busybox.make |4 +-
 22 files changed, 430 insertions(+), 252 deletions(-)
 delete mode 100644 
patches/busybox-1.17.1/0003-build-system-make-3.82-fix.-Closes-bug-2323.patch
 rename patches/{busybox-1.17.1 = 
busybox-1.18.5}/0001-reactivate-check-for-tty.patch (100%)
 rename patches/{busybox-1.17.1 = 
busybox-1.18.5}/0002-make-constant-unsigned-to-avoid-integer-overflow.patch 
(86%)
 rename patches/{busybox-1.17.1 = busybox-1.18.5}/series (77%)

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index 2cc9d9e..eafe8de 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -47,6 +47,17 @@ config BUSYBOX_USE_PORTABLE_CODE
  compiler other than gcc.
  If you do use gcc, this option may needlessly increase code size.
 
+config BUSYBOX_PLATFORM_LINUX
+   bool Enable Linux-specific applets and features
+   default y
+   help
+ For the most part, busybox requires only POSIX compatibility
+ from the target system, but some applets and features use
+ Linux-specific interfaces.
+
+ Answering 'N' here will disable such applets and hide the
+ corresponding configuration options.
+
 choice
prompt Buffer allocation policy
default BUSYBOX_FEATURE_BUFFERS_USE_MALLOC
@@ -112,6 +123,14 @@ config BUSYBOX_FEATURE_INSTALLER
  busybox at runtime to create hard links or symlinks for all the
  applets that are compiled into busybox.
 
+config BUSYBOX_INSTALL_NO_USR
+   bool Don't use /usr
+   default n
+   help
+ Disable use of /usr. busybox --install and make install
+ will install applets only to /bin and /sbin,
+ never to /usr/bin or /usr/sbin.
+
 config BUSYBOX_LOCALE_SUPPORT
bool Enable locale support (system needs locale for this to work)
default n
@@ -264,15 +283,6 @@ config BUSYBOX_FEATURE_CLEAN_UP
  Don't enable this unless you have a really good reason to clean
  things up manually.
 
-config BUSYBOX_FEATURE_UTMP
-   bool Support utmp file
-   default y
-   help
- The file /var/run/utmp is used to track who is currently logged in.
- With this option on, certain applets (getty, login, telnetd etc)
- will create and delete entries there.
- who applet requires this option.
-
 config BUSYBOX_FEATURE_WTMP
bool Support wtmp file
default y
@@ -284,6 +294,15 @@ config BUSYBOX_FEATURE_WTMP
  will append new entries there.
  last applet requires this option.
 
+config BUSYBOX_FEATURE_UTMP
+   bool Support utmp file
+   default y
+   help
+ The file /var/run/utmp is used to track who is currently logged in.
+ With this option on, certain applets (getty, login, telnetd etc)
+ will create and delete entries there.
+ who applet requires this option.
+
 config BUSYBOX_FEATURE_PIDFILE
bool Support writing pidfiles
default y
@@ -296,14 +315,19 @@ config BUSYBOX_FEATURE_SUID
default y
help
  With this option you can install the busybox binary belonging
- to root with the suid bit set, and it will automatically drop
- priviledges for applets that don't need root access.
+ to root with the suid bit set, enabling some applets to perform
+ root-level operations even when run by ordinary users
+ (for example, mounting of user mounts in fstab needs this).
+
+ Busybox will automatically drop priviledges

Re: [ptxdist] [PATCH] pass PTXCONF_TARGET_EXTRA_CFLAGS to QT4

2011-07-10 Thread Ladislav Michl 
Pass PTXDists' CROSS_{CPP,C,CXX}FLAGS to QT4 build

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch |   
14 ++
 rules/qt4.make   |
2 +
 2 files changed, 11 insertions(+), 5 deletions(-)
diff --git 
a/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch 
b/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch
index 5b8c665..4db0b9f 100644
--- a/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch
+++ b/patches/qt-everywhere-opensource-src-4.7.3/0001-mkspec-for-ptxdist.patch
@@ -10,11 +10,11 @@ Add a mkspec for ptxdist:
 
 Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de
 ---
- mkspecs/linux-ptx-g++/qmake.conf.in   |   38 +
+ mkspecs/linux-ptx-g++/qmake.conf.in   |   40 
++
  mkspecs/linux-ptx-g++/qplatformdefs.h |2 +
- mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   29 ++
+ mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   31 +
  mkspecs/qws/linux-ptx-g++/qplatformdefs.h |2 +
- 4 files changed, 71 insertions(+), 0 deletions(-)
+ 4 files changed, 75 insertions(+), 0 deletions(-)
  create mode 100644 mkspecs/linux-ptx-g++/qmake.conf.in
  create mode 100644 mkspecs/linux-ptx-g++/qplatformdefs.h
  create mode 100644 mkspecs/qws/linux-ptx-g++/qmake.conf.in
@@ -25,7 +25,7 @@ new file mode 100644
 index 000..495c53e
 --- /dev/null
 +++ b/mkspecs/linux-ptx-g++/qmake.conf.in
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,40 @@
 +#
 +# qmake configuration for linux-ptx-g++
 +#
@@ -42,7 +42,9 @@ index 000..495c53e
 +
 +# modifications to g++.conf
 +QMAKE_CC= @COMPILER_PREFIX@gcc
++QMAKE_CFLAGS= -pipe @CPPFLAGS@ @CFLAGS@
 +QMAKE_CXX   = @COMPILER_PREFIX@g++
++QMAKE_CXXFLAGS  = -pipe @CPPFLAGS@ @CXXFLAGS@
 +QMAKE_INCDIR= @INCDIR@
 +QMAKE_LIBDIR= @LIBDIR@
 +
@@ -77,7 +79,7 @@ new file mode 100644
 index 000..6b5c824
 --- /dev/null
 +++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,31 @@
 +#
 +# qmake configuration for linux-ptx-g++
 +#
@@ -89,7 +91,9 @@ index 000..6b5c824
 +
 +# modifications to g++.conf
 +QMAKE_CC= @COMPILER_PREFIX@gcc
++QMAKE_CFLAGS= -pipe @CPPFLAGS@ @CFLAGS@
 +QMAKE_CXX   = @COMPILER_PREFIX@g++
++QMAKE_CXXFLAGS  = -pipe @CPPFLAGS@ @CXXFLAGS@
 +QMAKE_INCDIR= @INCDIR@
 +QMAKE_LIBDIR= @LIBDIR@
 +
diff --git a/rules/qt4.make b/rules/qt4.make
index efeb016..8473e98 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -38,6 +38,9 @@ $(STATEDIR)/qt4.extract:
@$(call patchin, QT4)
@for file in $(QT4_DIR)/mkspecs/{qws/,}linux-ptx-g++/*.in; do \
sed -e s,@COMPILER_PREFIX@,$(COMPILER_PREFIX),g \
+   -e s,@CPPFLAGS@,$(CROSS_CPPFLAGS),g \
+   -e s,@CFLAGS@,$(CROSS_CFLAGS),g \
+   -e s,@CXXFLAGS@,$(CROSS_CXXFLAGS),g \
-e s,@INCDIR@,$(SYSROOT)/include $(SYSROOT)/usr/include,g 
\
-e s,@LIBDIR@,$(SYSROOT)/lib $(SYSROOT)/usr/lib,g \
-e s#@LDFLAGS@#$(strip $(CROSS_LDFLAGS))#g \

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Error getting host packages

2011-07-06 Thread Ladislav Michl 
On Wed, Jul 06, 2011 at 09:37:15AM +0200, Michael Olbrich wrote:
 On Tue, Jul 05, 2011 at 07:06:22PM +0200, Ladislav Michl wrote:
  PTXdist fails to get host packages and ends with:
  error: empty parameter to 'ptxd_make_get'
  
  that's because we expand arguments to ptxd_make_get
  this way: ptxd_make_get $($(strip $(1))_SOURCE) $($(strip $(1))_URL)
  see rules/post/ptxd_make_world_get.make
  
  Here for example QT4_HOST_URL is undefined and build fails.
  What should suggested fix look like?
 
 Have you tried the latest version? I've pushed a fix for this sometime
 yesterday.

Today's version indeed works, thank you.

Now QT$ compilation ends with
Error: selected processor does not support `ldrex r3,[r2]'
It seems PTXdist does not pass -march=armv6 to QT4 build. I'll look at it.

Best regards,
ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] pass PTXCONF_TARGET_EXTRA_CFLAGS to QT4

2011-07-06 Thread Ladislav Michl 
On Wed, Jul 06, 2011 at 01:23:33PM +0200, Ladislav Michl wrote:
 PTXDists' CFLAGS are not passed to QT4 build resulting in following error
 when builing with ARM6 toolchains
 Error: selected processor does not support `ldrex r3,[r2]'
 Passing -march=armv6 fixes this problem.

With OSELAS.Toolchain 
arm-1136jfs-linux-gnueabi_gcc-4.5.2_glibc-2.13_binutils-2.21_kernel-2.6.36-sanitized
there is no need to pass -march=armv6, but I still think this patch is valid
anyway, because we should honour PTXCONF_TARGET_EXTRA_CFLAGS for all
packages.

ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Error getting host packages

2011-07-05 Thread Ladislav Michl 
Hi there,

PTXdist fails to get host packages and ends with:
error: empty parameter to 'ptxd_make_get'

that's because we expand arguments to ptxd_make_get
this way: ptxd_make_get $($(strip $(1))_SOURCE) $($(strip $(1))_URL)
see rules/post/ptxd_make_world_get.make

Here for example QT4_HOST_URL is undefined and build fails.
What should suggested fix look like?

Thanks,
ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] environment too large

2010-09-15 Thread Ladislav Michl 
On Wed, Sep 15, 2010 at 02:51:40PM +0200, Michael Olbrich wrote:
 - some of the scripts provide functions used by other scripts. The
   dependencies have to be checked carefully.
 - not everything are function definitions. There might be unexpected side
   effects if the scripts are sourced later or multiple times.
 
 And will this be enough? Is the 32k limit for exec only or for running
 shells as well? Some of scripts are quite large.

I'll check, however size of exported functions is currently 45k, which is
quite a lot.

 This should be transparent for the make files. maybe wrapper functions:
 
 foo() {
   source /foo.sh # provies 'real' foo()
   foo $@
 }
 
 or something like that?

Could be. My idea was to leave functions needed for both makefiles
and scripts as they are and modify those used in get, prepare, extract,
compile, install and targetinstall stages as they occupy wast majority
of environment space. Then makefile rules can remain untouched, only
scrips patch will be added to $PATH (eventually modify makefiles to
contain absolute path).

Currently these functions are stored one per file anyway and exceptions
can be handled by adding helper function with parameter, for example
scripts/lib/ptxd_make_world_install.sh contains
ptxd_make_world_install
ptxd_make_world_install_unpack
ptxd_make_world_install_pack
ptxd_make_world_install_post

which could be then called as

ptxd_make_world_install
ptxd_make_world_install unpack
ptxd_make_world_install pack
ptxd_make_world_install post

ladis

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] configure: look for curses also in include/ncurses

2010-09-09 Thread Ladislav Michl 
Cygwin-1.7 places curses headers into /usr/include/ncurses.
Tested on Debian, MinGW with pdcurses and Cygwin.

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 configure.ac |   20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index e662040..b2b4021 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,33 +30,19 @@ dnl
 AC_HEADER_STDC
 
 AC_CHECK_HEADER([regex.h], [], AC_MSG_ERROR([Cannot find regex.h.]))
-
 AC_SEARCH_LIBS(regcomp, [regex gnuregex],,
AC_MSG_ERROR([POSIX regex required.]))
 CONF_LIBS=${LIBS}
 AC_SUBST(CONF_LIBS)
 
+AC_CHECK_HEADERS(ncurses/ncurses.h ncurses/curses.h ncurses.h curses.h 
pdcurses/pdcurses.h pdcurses/curses.h pdcurses.h,
+   [CURSES_LOC=$ac_header; break])
+AC_SUBST(CURSES_LOC)
 AC_SEARCH_LIBS(mvaddch, [ncurses curses pdcurses], [CURSES_LIB=$ac_lib],
[AC_MSG_ERROR([ncurses development library not found, please install 
libncurses-dev])])
 MCONF_LIBS=${LIBS}
 AC_SUBST(MCONF_LIBS)
 
-if test $CURSES_LIB = ncurses
-then
-   AC_CHECK_HEADER(
-   [ncurses.h],
-   [CURSES_LOC='ncurses.h'],
-   AC_MSG_ERROR([Cannot find ncurses.h.])
-   )
-else
-   AC_CHECK_HEADER(
-   [curses.h],
-   [CURSES_LOC='curses.h'],
-   AC_MSG_ERROR([Cannot find curses.h.])
-   )
-fi
-AC_SUBST(CURSES_LOC)
-
 AC_SYS_INTERPRETER
 if test $interpval != yes ; then
AC_MSG_WARN([no


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] mtd-utils: make mkubifs optional

2010-08-03 Thread Ladislav Michl 
Compile libuuid only when needed - mkfs.ubifs selected.

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 .../mtd-utils-1.3.1/make-mkubifs-optional.patch|   24 
 patches/mtd-utils-1.3.1/series |1 +
 rules/mtd-utils.in |2 +-
 rules/mtd-utils.make   |4 +++
 4 files changed, 30 insertions(+), 1 deletions(-)
 create mode 100644 patches/mtd-utils-1.3.1/make-mkubifs-optional.patch

diff --git a/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch 
b/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch
new file mode 100644
index 000..ec99f13
--- /dev/null
+++ b/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch
@@ -0,0 +1,24 @@
+From: Ladislav Michl la...@linux-mips.org
+Date: Tue, 3 Aug 2010 13:00:00 +0200
+Subject: [PATCH] make mkubifs optional
+
+Signed-off-by: Ladislav Michl la...@linux-mips.org
+---
+ Makefile |6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/Makefile 2010-08-03 14:55:20.0 +0200
 b/Makefile 2010-08-03 14:24:39.0 +0200
+@@ -11,7 +11,11 @@
+   CPPFLAGS += -DWITHOUT_LZO
+ endif
+ 
+-SUBDIRS = ubi-utils mkfs.ubifs
++SUBDIRS = ubi-utils
++
++ifneq ($(WITHOUT_MKUBIFS), 1)
++  SUBDIRS += mkfs.ubifs
++endif
+ 
+ TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+   ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \
diff --git a/patches/mtd-utils-1.3.1/series b/patches/mtd-utils-1.3.1/series
index 32f7cf1..44806a8 100644
--- a/patches/mtd-utils-1.3.1/series
+++ b/patches/mtd-utils-1.3.1/series
@@ -1 +1,2 @@
 make-liblzo-optional.patch
+make-mkubifs-optional.patch
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 4d33954..ad550e1 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -4,7 +4,7 @@ menuconfig MTD_UTILS
tristate
prompt mtd-utils 
select ZLIB
-   select LIBUUID
+   select LIBUUID if MTD_UTILS_MKFS_UBIFS
select LIBLZO if MTD_UTILS_USE_LIBLZO
help
  Memory Technology Device Utilities
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 1bb471e..1797f41 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -47,6 +47,10 @@ ifndef PTXCONF_MTD_UTILS_USE_LIBLZO
 MTD_UTILS_COMPILE_ENV += WITHOUT_LZO=1
 endif
 
+ifndef PTXCONF_MTD_UTILS_MKFS_UBIFS
+MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1
+endif
+
 MTD_UTILS_MAKEVARS := BUILDDIR=$(MTD_UTILS_DIR)
 MTD_UTILS_MAKE_PAR := NO
 
-- 
1.5.3.8


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Busybox-1.17.1

2010-07-27 Thread Ladislav Michl 
On Tue, Jul 27, 2010 at 12:06:11AM +0200, Marc Kleine-Budde wrote:
 Hey Ladis,
 
 Ladislav Michl wrote:
  Update Busybox to 1.17.1
  0002-silence-errors-on-BE-platforms.patch was dropped as it no longer 
  applies.
  I'll try to fix it upstream first and backport accepted solution.
 
 Thanks for the patch!
 
 How did you import the new busybox Kconfig? The current importer has
 problems with comments. I fixed it in the meantime :)

I'm still keeping 'Extract' script from busybox-1.4 era and it still works...

 I'm going to re-run with the fixed importer and squash it into your
 patch. I'll talk with Michael tomorrow if we're going to take the new
 busybox version into the upcoming release.

That would be nice, but no need to push it hard. For time of being
I backported needed functionality into 1.16...

l.

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] Eliminate PERL dependency

2010-04-07 Thread Ladislav Michl 
From: Ladislav Michl la...@linux-mips.org

Signed-off-by: Ladislav Michl la...@linux-mips.org
---
 configure.ac   |6 --
 rules/apache2.make |2 +-
 rules/fltk.make|2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 77b86d7..1ce01c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,12 +267,6 @@ if test -z $SORT; then
AC_MSG_ERROR([sort could not be found, please install])
 fi
 
-dnl Check for perl
-AC_PATH_PROGS(PERL, perl,, $PATH)
-if test -z $PERL; then
-   AC_MSG_ERROR([perl could not be found, please install])
-fi
-
 dnl Check for expect
 AC_PATH_PROGS(EXPECT, expect,, $PATH)
 if test -z $EXPECT; then
diff --git a/rules/apache2.make b/rules/apache2.make
index 253bf08..c34c121 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -85,7 +85,7 @@ $(STATEDIR)/apache2.prepare:
 #  # The original object files are also used for other binaries, so
 #  # we generate a dummy dependency here
 #  #
-   perl -i -p -e s/^gen_test_char_OBJECTS =.*$$/gen_test_char_OBJECTS = 
dummy.lo/g $(APACHE2_DIR)/server/Makefile
+   sed -i -e s/^gen_test_char_OBJECTS =.*$$/gen_test_char_OBJECTS = 
dummy.lo/g $(APACHE2_DIR)/server/Makefile
 
@$(call touch)
 
diff --git a/rules/fltk.make b/rules/fltk.make
index 6414241..c47abd5 100644
--- a/rules/fltk.make
+++ b/rules/fltk.make
@@ -73,7 +73,7 @@ $(STATEDIR)/fltk.prepare:
@$(call targetinfo)
@$(call clean, $(FLTK_BUILDDIR))
 ifndef PTXCONF_FLTK_FLUID
-   perl -p -i -e 's/src fluid test documentation/src/'  
$(FLTK_DIR)/Makefile
+   sed -i -e 's/src fluid test documentation/src/g' $(FLTK_DIR)/Makefile
 endif
cd $(FLTK_DIR)  \
$(FLTK_PATH) $(FLTK_ENV) \

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 10/20] [gcc-4.4.1] Added GCC 4.4.1 patchstack

2010-02-04 Thread Ladislav Michl 
On Thu, Feb 04, 2010 at 09:53:24AM +0100, Carsten Schlote wrote:
  http://sourceware.org/ml/crossgcc/2009-11/msg00094.html
  This bug seems to be fixed in gcc-4.4.3 and is not present in gcc-
  4.3.4.
 
 Is this a general problem or an ARM GCC issue? For powerpc-603 and i686
 toolchains I can't see any problems. But due to some lack of working ARM
 platform I haven't checked that out.

It is ARM problem as ARM cannot do unaligned acess without causing aligment
trap. It is up to exception code if it decides to fixup, ignore or terminate
offending process. As ignoring might lead to unexpected behaviour and fixups
are time consuming I always choose to kill problematic program (SIGBUS) and
fix the code.

  Patches for both are pending, so someone please apply.
 
 What patches?

For gcc-4.3.4 and gcc-4.4.3 (based on you patch) which also update
ptxconfigs. It was meant as mere reminder to someone at pengutronix
to wake up and apply :-)

ladis

--
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 17/17] [udev] Updated to version 150 and updated targetinstall

2010-01-24 Thread Ladislav Michl 
On Tue, Jan 19, 2010 at 05:08:43PM +0100, Carsten Schlote wrote:
 From: Carsten Schlote c.schl...@konzeptpark.de
 
 Updated to 150 as proposed on ptxdist mailinglist. Compiles
 and works (tested with upstart initmethod).

Very nice! You can read it as:
Tested-by: Ladislav Michl la...@linux-mips.org
However to hit Reviewed-by there is one minor improvement to be done.

 Added new config options for all files installed in package
 dir.
 
 Added 'install_copy' lines for all files found in package dir
 and as well some more obscure ones not installed by default.
 
 Added comments and reviews
 
 Crosscompile Patches:
 - commented out checks for pci.ids and provide link to file directly.
 
 Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
 ---
  patches/udev-150/autogen.sh |1 +
  patches/udev-150/fix-crosscompile.patch |   29 +
  patches/udev-150/series |1 +

All above could be probably dropped, see bellow.

  rules/udev.in   |  203 
 +++
  rules/udev.make |  160 ++---
  5 files changed, 329 insertions(+), 65 deletions(-)
  create mode 12 patches/udev-150/autogen.sh
  create mode 100644 patches/udev-150/fix-crosscompile.patch
  create mode 100644 patches/udev-150/series
 
 diff --git a/patches/udev-150/autogen.sh b/patches/udev-150/autogen.sh
 new file mode 12
 index 000..9f8a4cb
 --- /dev/null
 +++ b/patches/udev-150/autogen.sh
 @@ -0,0 +1 @@
 +../autogen.sh
 \ No newline at end of file
 diff --git a/patches/udev-150/fix-crosscompile.patch 
 b/patches/udev-150/fix-crosscompile.patch
 new file mode 100644
 index 000..5a811eb
 --- /dev/null
 +++ b/patches/udev-150/fix-crosscompile.patch
 @@ -0,0 +1,29 @@
 +From: Carsten Schlote c.schl...@konzeptpark.de
 +Subject: Remove checks for pci.ids to allow cross-compilation.
 +
 +These checks for pci.ids seem to fail. So commented out and
 +path to pci.ids is provided with by commandline option on
 +configure.
 +
 +Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
 +---
 + configure.ac |6 +++---
 + 1 file changed, 3 insertions(+), 3 deletions(-)
 +
 +Index: udev-146/configure.ac
 +===
 +--- udev-146.orig/configure.ac   2009-08-10 03:37:42.0 +0200
  udev-146/configure.ac2009-12-09 10:11:53.0 +0100
 +@@ -69,9 +69,9 @@
 + PKG_CHECK_MODULES(USBUTILS, usbutils = 0.82)
 + AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
 + 
 +-AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
 +-AC_CHECK_FILES([/usr/share/hwdata/pci.ids], 
 [pciids=/usr/share/hwdata/pci.ids])
 +-AC_CHECK_FILES([/usr/share/misc/pci.ids], 
 [pciids=/usr/share/misc/pci.ids])
 ++#   AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
 ++#   AC_CHECK_FILES([/usr/share/hwdata/pci.ids], 
 [pciids=/usr/share/hwdata/pci.ids])
 ++#   AC_CHECK_FILES([/usr/share/misc/pci.ids], 
 [pciids=/usr/share/misc/pci.ids])
 + AC_ARG_WITH(pci-ids-path,
 + AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
 + [PCI_DATABASE=${withval}],

Since corresponding defines (HAVE__USR_SHARE_PCI_IDS,
HAVE__USR_SHARE_HWDATA_PCI_IDS, HAVE__USR_SHARE_MISC_PCI_IDS) for commented out
tests do not appear to be used anywhere, it is safe to do something like this:
UDEV_ENV:= \
$(CROSS_ENV) \
ac_cv_file__usr_share_pci_ids=no \
ac_cv_file__usr_share_hwdata_pci_ids=no \
ac_cv_file__usr_share_misc_pci_ids=no
to make configure happy (untested). I have to admit, that checking for
pci-ids-path _after_ failing to find this file because of crosscompilation
is a bit dumb and should be fixed upstream.

ladis

--
ptxdist mailing list
ptxdist@pengutronix.de

<    1   2   3   4   5   6   >