date:20170928

Re: [ptxdist] Can packages be build w/o installing them on the rootfs?

2017-09-28 Thread Juergen Borleis

Hi Andreas,

On Thursday 28 September 2017 15:12:34 Ian Abbott wrote:
> > We have a platform application and one to three dynamic libraries
> > that, if present, are loaded into the platform to extend its
> > functionality. The finished product with be sold in three grades, base
> > advanced and full. The base version should only contain the platform
> > application, and base dynlib, the advanced version should only contain
> > the platform application, and base + advanced dynlibs, ...
> >
> > Our idea now is to have three ptxdist packages that depend on the
> > platform application package:
> > - base pkg: contains only the base dynlib
> > - advanced pkg: contains only the base + adv dynlibs
> > - full pkg: contains only the base + adv + full dynlibs
> >
> > When we compile the rootfs we want all three packages built, but
> > initially none installed on the rootfs. Is this possible somehow?
>
> Perhaps you could use the "collections" feature.

Sounds like a job for LAZY_PACKAGES instead: Define three lazy packages with 
different library content and then create three different filesystem 
images, each includes one of the three lazy packages. Lazy packages are no 
regular rootfs content. They need to be explicitly listed in the package 
list for an filesystem image.

Unfortunately the LAZY_PACKAGES feature isn't documented yet. I'm working on 
it, but its not finished yet.

Cheers,
Juergen

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

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Can packages be build w/o installing them on the rootfs?

2017-09-28 Thread Ian Abbott


On 28/09/17 11:49, Andreas Glatz wrote:

Hi

We have a platform application and one to three dynamic libraries
that, if present, are loaded into the platform to extend its
functionality. The finished product with be sold in three grades, base
advanced and full. The base version should only contain the platform
application, and base dynlib, the advanced version should only contain
the platform application, and base + advanced dynlibs, ...

Our idea now is to have three ptxdist packages that depend on the
platform application package:
- base pkg: contains only the base dynlib
- advanced pkg: contains only the base + adv dynlibs
- full pkg: contains only the base + adv + full dynlibs

When we compile the rootfs we want all three packages built, but
initially none installed on the rootfs. Is this possible somehow?


Perhaps you could use the "collections" feature.

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

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] cryptsetup: new package

2017-09-28 Thread Sascha Hauer

This adds support for the cryptsetup tools to ptxdist.

Cryptsetup is a utility used to conveniently setup disk encryption based
on DMCrypt kernel module.

Signed-off-by: Sascha Hauer 
---

changes since v1:
- Make crypto backend configurable
- Remove configure options that are default anyway

 rules/cryptsetup.in   | 42 +++
 rules/cryptsetup.make | 94 +++
 2 files changed, 136 insertions(+)
 create mode 100644 rules/cryptsetup.in
 create mode 100644 rules/cryptsetup.make

diff --git a/rules/cryptsetup.in b/rules/cryptsetup.in
new file mode 100644
index 0..551280d50
--- /dev/null
+++ b/rules/cryptsetup.in
@@ -0,0 +1,42 @@
+## SECTION=disk_and_file
+
+menuconfig CRYPTSETUP
+   select LVM2
+   select LIBUUID
+   select LIBPOPT
+   select LIBGCRYPT if CRYPTSETUP_CRYPT_BACKEND_GCRYPT
+   select OPENSSL if CRYPTSETUP_CRYPT_BACKEND_OPENSSL
+   select NETTLE if CRYPTSETUP_CRYPT_BACKEND_NETTLE
+   tristate
+   prompt "cryptsetup"
+   help
+ Cryptsetup is a utility used to conveniently setup disk encryption
+ based on DMCrypt kernel module.
+
+if CRYPTSETUP
+
+choice
+   prompt "Crypto backend"
+
+   config CRYPTSETUP_CRYPT_BACKEND_KERNEL
+   bool "kernel"
+
+   config CRYPTSETUP_CRYPT_BACKEND_GCRYPT
+   bool "gcrypt"
+
+   config CRYPTSETUP_CRYPT_BACKEND_OPENSSL
+   bool "openssl"
+
+   config CRYPTSETUP_CRYPT_BACKEND_NETTLE
+   bool "nettle"
+endchoice
+
+config CRYPTSETUP_CRYPTSETUP
+   bool
+   prompt "install cryptsetup"
+
+config CRYPTSETUP_VERITYSETUP
+   bool
+   prompt "install veritysetup"
+
+endif
diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
new file mode 100644
index 0..c1e2f23fd
--- /dev/null
+++ b/rules/cryptsetup.make
@@ -0,0 +1,94 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Sascha Hauer 
+#
+# 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_CRYPTSETUP) += cryptsetup
+
+#
+# Paths and names
+#
+CRYPTSETUP_VERSION := 1.7.5
+CRYPTSETUP_MD5 := dde798a883b06a2903379dcd593480e1
+CRYPTSETUP := cryptsetup-$(CRYPTSETUP_VERSION)
+CRYPTSETUP_SUFFIX  := tar.gz
+CRYPTSETUP_URL := 
https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7//$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
+CRYPTSETUP_SOURCE  := $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
+CRYPTSETUP_DIR := $(BUILDDIR)/$(CRYPTSETUP)
+CRYPTSETUP_LICENSE := GPL-2.0+
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+CRYPTSETUP_CONF_TOOL   := autoconf
+CRYPTSETUP_CONF_OPT:= \
+   $(CROSS_AUTOCONF_USR) \
+   $(GLOBAL_LARGE_FILE_OPTION) \
+   --disable-nls \
+   --disable-rpath \
+   --disable-pwquality \
+   --disable-static-cryptsetup \
+   --enable-veritysetup \
+   --enable-cryptsetup-reencrypt \
+   --disable-selinux \
+   --enable-udev \
+   --enable-dev-random \
+   --disable-python
+
+ifdef PTXCONF_CRYPTSETUP_CRYPT_BACKEND_GCRYPT
+CRYPTSETUP_CONF_OPT += --with-crypto_backend=gcrypt \
+   --enable-gcrypt-pbkdf2
+endif
+
+ifdef PTXCONF_CRYPTSETUP_CRYPT_BACKEND_OPENSSL
+CRYPTSETUP_CONF_OPT += --with-crypto_backend=openssl
+endif
+
+ifdef PTXCONF_CRYPTSETUP_CRYPT_BACKEND_KERNEL
+CRYPTSETUP_CONF_OPT += --with-crypto_backend=kernel \
+   --enable-kernel_crypto
+endif
+
+ifdef PTXCONF_CRYPTSETUP_CRYPT_BACKEND_NETTLE
+CRYPTSETUP_CONF_OPT += --with-crypto_backend=nettle
+endif
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/cryptsetup.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, cryptsetup)
+   @$(call install_fixup, cryptsetup,PRIORITY,optional)
+   @$(call install_fixup, cryptsetup,SECTION,base)
+   @$(call install_fixup, cryptsetup,AUTHOR,"Sascha Hauer 
")
+   @$(call install_fixup, cryptsetup,DESCRIPTION,missing)
+
+   @$(call install_lib, cryptsetup, 0, 0, 0644, libcryptsetup)
+
+ifdef PTXCONF_CRYPTSETUP_VERITYSETUP
+   @$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/veritysetup)
+endif
+ifdef PTXCONF_CRYPTSETUP_CRYPTSETUP
+   @$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/cryptsetup)
+endif
+
+   @$(call install_finish, cryptsetup)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Can packages be build w/o installing them on the rootfs?

2017-09-28 Thread Andreas Glatz

Hi

We have a platform application and one to three dynamic libraries
that, if present, are loaded into the platform to extend its
functionality. The finished product with be sold in three grades, base
advanced and full. The base version should only contain the platform
application, and base dynlib, the advanced version should only contain
the platform application, and base + advanced dynlibs, ...

Our idea now is to have three ptxdist packages that depend on the
platform application package:
- base pkg: contains only the base dynlib
- advanced pkg: contains only the base + adv dynlibs
- full pkg: contains only the base + adv + full dynlibs

When we compile the rootfs we want all three packages built, but
initially none installed on the rootfs. Is this possible somehow?

Cheers,

Andreas

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] timezone: remove legacy '/etc/timezone' file

2017-09-28 Thread Juergen Borleis

This file and its content is deprecated since '/usr' and its content is
mandatory. Thus, the replacement '/etc/localtime' works always and is
used and manipulated by the systemd tools.

Signed-off-by: Juergen Borleis 
---
 rules/timezone.make | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rules/timezone.make b/rules/timezone.make
index c2dc71893..ba287247d 100644
--- a/rules/timezone.make
+++ b/rules/timezone.make
@@ -115,9 +115,6 @@ $(STATEDIR)/timezone.targetinstall:
 ifneq ($(call remove_quotes,$(PTXCONF_TIMEZONE_LOCALTIME)),)
@$(call install_link, timezone, ..$(TIMEZONE_LOCALTIME_FILE), \
/etc/localtime)
-   @$(call install_alternative, timezone, 0, 0, 0644, /etc/timezone)
-   @$(call install_replace, timezone, /etc/timezone, @TIMEZONE@, \
-   $(PTXCONF_TIMEZONE_LOCALTIME))
 endif
 
@$(call install_finish, timezone)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/2] luaexpat: Add license information.

2017-09-28 Thread Denis OSTERLAND

README tells luaexpact use Lua license, so use license information from Lua.

Signed-off-by: Denis Osterland 
---
 rules/luaexpat.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/luaexpat.make b/rules/luaexpat.make
index c06f2fd..47b12e6 100644
--- a/rules/luaexpat.make
+++ b/rules/luaexpat.make
@@ -23,7 +23,7 @@ LUAEXPAT_SUFFIX   := tar.gz
 LUAEXPAT_URL   := 
http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
 LUAEXPAT_SOURCE:= $(SRCDIR)/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
 LUAEXPAT_DIR   := $(BUILDDIR)/$(LUAEXPAT)
-LUAEXPAT_LICENSE   := unknown
+LUAEXPAT_LICENSE   = $(LUA_LICENSE)
 
 # 
 # Prepare
-- 
2.7.4


Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner 
(Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 
620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – 
Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr 
Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), 
Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, 
Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) 
Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail 
enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten 
haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form 
der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation 
dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail 
contains confidential and/or legally protected information. Please inform us if 
you have received this e-mail by mistake and delete it in such a case. Each 
unauthorized reproduction, disclosure, alteration, distribution and/or 
publication of this e-mail is strictly prohibited.

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/2] luaexpat: version bump 1.2.0 -> 1.3.0

2017-09-28 Thread Denis OSTERLAND

Remove -ansi flag from Makefile, because lua 5.3.4 is not configured for C89.
Update makefile variables.

Signed-off-by: Denis Osterland 
---
 rules/luaexpat.make | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/rules/luaexpat.make b/rules/luaexpat.make
index caccbb6..c06f2fd 100644
--- a/rules/luaexpat.make
+++ b/rules/luaexpat.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LUAEXPAT) += luaexpat
 #
 # Paths and names
 #
-LUAEXPAT_VERSION   := 1.2.0
-LUAEXPAT_MD5   := 03efe50c7f30a34580701e6527d7bfee
+LUAEXPAT_VERSION   := 1.3.0
+LUAEXPAT_MD5   := 3c20b5795e7107f847f8da844fbfe2da
 LUAEXPAT   := luaexpat-$(LUAEXPAT_VERSION)
 LUAEXPAT_SUFFIX:= tar.gz
 LUAEXPAT_URL   := 
http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
@@ -33,14 +33,14 @@ LUAEXPAT_CONF_TOOL := NO
 
 LUAEXPAT_MAKE_OPT := \
$(CROSS_ENV_CC) \
-   LUA_VERSION_NUM=501 \
-   LUA_INC=. \
-   EXPAT_INC=.
+   LUA_VERSION_NUM=503 \
+   LUA_INC="-I." \
+   EXPAT_INC="-I."
 
 LUAEXPAT_INSTALL_OPT := \
$(LUAEXPAT_MAKE_OPT) \
-   LUA_LIBDIR=$(LUAEXPAT_PKGDIR)/usr/lib/lua/5.1 \
-   LUA_DIR=$(LUAEXPAT_PKGDIR)/usr/share/lua/5.1 \
+   LUA_LIBDIR=$(LUAEXPAT_PKGDIR)/usr/lib/lua/5.3 \
+   LUA_DIR=$(LUAEXPAT_PKGDIR)/usr/share/lua/5.3 \
install
 
 # 
@@ -56,8 +56,8 @@ $(STATEDIR)/luaexpat.targetinstall:
@$(call install_fixup, luaexpat,AUTHOR,"Joerg Platte 
")
@$(call install_fixup, luaexpat,DESCRIPTION,missing)
 
-   @$(call install_copy, luaexpat, 0, 0, 0644, -, 
/usr/share/lua/5.1/lxp/lom.lua)
-   @$(call install_lib, luaexpat, 0, 0, 0644, lua/5.1/lxp)
+   @$(call install_copy, luaexpat, 0, 0, 0644, -, 
/usr/share/lua/5.3/lxp/lom.lua)
+   @$(call install_lib, luaexpat, 0, 0, 0644, lua/5.3/lxp)
@$(call install_finish, luaexpat)
 
@$(call touch)
-- 
2.7.4


Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner 
(Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 
620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – 
Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr 
Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), 
Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, 
Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) 
Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail 
enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten 
haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form 
der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation 
dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail 
contains confidential and/or legally protected information. Please inform us if 
you have received this e-mail by mistake and delete it in such a case. Each 
unauthorized reproduction, disclosure, alteration, distribution and/or 
publication of this e-mail is strictly prohibited.

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 0/2] luaexpat: version bump 1.2.0 -> 1.3.0

2017-09-28 Thread Denis OSTERLAND


v2:
 - Adapt install directory form 5.1 to 5.3
 - Adapt LUA_VERSION define from 501 to 503

Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner 
(Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 
620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – 
Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr 
Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), 
Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, 
Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) 
Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail 
enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten 
haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form 
der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation 
dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail 
contains confidential and/or legally protected information. Please inform us if 
you have received this e-mail by mistake and delete it in such a case. Each 
unauthorized reproduction, disclosure, alteration, distribution and/or 
publication of this e-mail is strictly prohibited.

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] iptables: fix large file support

2017-09-28 Thread Juergen Borleis

The configure script handles the "--*-largefile" parameter badly. It
defaults to large file support if not given and always disables largefile
support if given (and it doesn't matter if 'enable' or 'disable' was used)

Signed-off-by: Juergen Borleis 
---
 ...d-xtables-config-parser.h-to-BUILT_SOURCE.patch | 34 --
 patches/iptables-1.6.0/series  |  4 ---
 ...fine-macros-if-large-file-feature-is-enab.patch | 28 ++
 .../{iptables-1.6.0 => iptables-1.6.1}/autogen.sh  |  0
 patches/iptables-1.6.1/series  |  4 +++
 rules/iptables.make|  4 +--
 6 files changed, 34 insertions(+), 40 deletions(-)
 delete mode 100644 
patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
 delete mode 100644 patches/iptables-1.6.0/series
 create mode 100644 
patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
 rename patches/{iptables-1.6.0 => iptables-1.6.1}/autogen.sh (100%)
 create mode 100644 patches/iptables-1.6.1/series

diff --git 
a/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
 
b/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
deleted file mode 100644
index 20dab363c..0
--- 
a/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Gustavo Zacarias 
-Date: Wed, 30 Dec 2015 14:51:30 -0300
-Subject: [PATCH] iptables: add xtables-config-parser.h to BUILT_SOURCES
-
-Otherwise other sources that use it might be built before it's ready leading
-to build failure, for example by iptables/nft.c
-
-Signed-off-by: Gustavo Zacarias 
-Signed-off-by: Pablo Neira Ayuso 

- iptables/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/iptables/Makefile.am b/iptables/Makefile.am
-index 3c0faa5a54df..c3eb8a81a445 100644
 a/iptables/Makefile.am
-+++ b/iptables/Makefile.am
-@@ -4,6 +4,8 @@ AM_CFLAGS= ${regular_CFLAGS}
- AM_CPPFLAGS  = ${regular_CPPFLAGS} -I${top_builddir}/include 
-I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} 
${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
- AM_YFLAGS = -d
- 
-+BUILT_SOURCES =
-+
- xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
- xtables_multi_CFLAGS   = ${AM_CFLAGS}
- xtables_multi_LDADD= ../extensions/libext.a
-@@ -27,6 +29,7 @@ xtables_multi_LDADD   += ../libxtables/libxtables.la -lm
- 
- # nftables compatibility layer
- if ENABLE_NFTABLES
-+BUILT_SOURCES += xtables-config-parser.h
- xtables_compat_multi_SOURCES  = xtables-compat-multi.c iptables-xml.c
- xtables_compat_multi_CFLAGS   = ${AM_CFLAGS}
- xtables_compat_multi_LDADD= ../extensions/libext.a 
../extensions/libext_ebt.a
diff --git a/patches/iptables-1.6.0/series b/patches/iptables-1.6.0/series
deleted file mode 100644
index 5237a6efd..0
--- a/patches/iptables-1.6.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch
-# e834e669cfa6ff965112ccc3771de5a0  - git-ptx-patches magic
diff --git 
a/patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
 
b/patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
new file mode 100644
index 0..857e3e7e1
--- /dev/null
+++ 
b/patches/iptables-1.6.1/0001-iptables-define-macros-if-large-file-feature-is-enab.patch
@@ -0,0 +1,28 @@
+From: Juergen Borleis 
+Date: Fri, 25 Aug 2017 14:31:45 +0200
+Subject: [PATCH] iptables: define macros if large file feature is enabled
+
+Currently the feature is enabled by default, but always disabled when
+the large file parameter is defined.
+
+Signed-off-by: Juergen Borleis 
+---
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index eda7871405b3..30445d7deda8 100644
+--- a/configure.ac
 b/configure.ac
+@@ -42,8 +42,9 @@ AC_ARG_ENABLE([ipv6],
+ AC_ARG_ENABLE([largefile],
+   AS_HELP_STRING([--disable-largefile], [Do not build largefile support]),
+   [enable_largefile="$enableval"],
+-  [enable_largefile="yes";
+-  largefile_cppflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES 
-D_FILE_OFFSET_BITS=64'])
++  [enable_largefile="yes"])
++AS_IF([test "$enable_largefile" = "yes"], 
[largefile_cppflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES 
-D_FILE_OFFSET_BITS=64'])
++
+ AC_ARG_ENABLE([devel],
+   AS_HELP_STRING([--enable-devel],
+   [Install Xtables development headers]),
diff --git a/patches/iptables-1.6.0/autogen.sh 
b/patches/iptables-1.6.1/autogen.sh
similarity index 100%
rename from patches/iptables-1.6.0/autogen.sh
rename to patches/iptables-1.6.1/autogen.sh
diff

[ptxdist] [PATCH 3/3] sudo: force the system zlib

2017-09-28 Thread Juergen Borleis

'sudo' uses zlib compression for its logs. It brings its own local version
of zlib, but prefers the system zlib if present. This change forces the
presence of the system zlib to avoid the internal variant by accident
depending on the build order.

Signed-off-by: Juergen Borleis 
---
 rules/sudo.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/sudo.in b/rules/sudo.in
index 154be73d0..480c90cd9 100644
--- a/rules/sudo.in
+++ b/rules/sudo.in
@@ -5,6 +5,7 @@ menuconfig SUDO
select LIBC_CRYPT
select LIBC_UTIL
select LIBC_DL
+   select ZLIB
help
  Sudo is a program designed to allow a sysadmin
  to give limited root privileges to users and log
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] sudo: add missing run-time dependencies

2017-09-28 Thread Juergen Borleis

libutil and libdl must be present at run-time.

Signed-off-by: Juergen Borleis 
---
 rules/sudo.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/sudo.in b/rules/sudo.in
index f3531425f..154be73d0 100644
--- a/rules/sudo.in
+++ b/rules/sudo.in
@@ -3,6 +3,8 @@ menuconfig SUDO
tristate
prompt "sudo  "
select LIBC_CRYPT
+   select LIBC_UTIL
+   select LIBC_DL
help
  Sudo is a program designed to allow a sysadmin
  to give limited root privileges to users and log
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/3] sudo: provide 'sudoers.d' for individual user files

2017-09-28 Thread Juergen Borleis

The 'sudoers.d' provides a more flexible way to install individual and
independent permission files without using a shared single '/etc/sudoers'
file.

Signed-off-by: Juergen Borleis 
---
 projectroot/etc/sudoers | 3 +++
 rules/sudo.make | 1 +
 2 files changed, 4 insertions(+)

diff --git a/projectroot/etc/sudoers b/projectroot/etc/sudoers
index c57a3ef44..b04419c9d 100644
--- a/projectroot/etc/sudoers
+++ b/projectroot/etc/sudoers
@@ -31,3 +31,6 @@ root  ALL=(ALL) ALL
 # Samples
 # %users  ALL=/sbin/mount /cdrom,/sbin/umount /cdrom
 # %users  localhost=/sbin/shutdown -h now
+
+# include other dedicated settings
+#includedir /etc/sudoers.d
diff --git a/rules/sudo.make b/rules/sudo.make
index 6fedc232a..87ebd2c14 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -113,6 +113,7 @@ $(STATEDIR)/sudo.targetinstall:
 
 ifdef PTXCONF_SUDO_INSTALL_ETC_SUDOERS
@$(call install_alternative, sudo, 0, 0, 0440, /etc/sudoers, n)
+   @$(call install_copy, sudo, 0, 0, 755, /etc/sudoers.d)
 endif
 
 ifdef PTXCONF_SUDO_INSTALL_VISUDO
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] screen: Fix ptxdist error message.

2017-09-28 Thread Denis OSTERLAND

Copy from causes this error message:
ptxdist: error: file 'BSP/platform-Name/packages/screen-4.5.0/usr/bin/screen' 
is a link

Install it from link target, to avoid error message.

Signed-off-by: Denis Osterland 
---
 rules/screen.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/screen.make b/rules/screen.make
index 82a00cd..64cc7f5 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -53,7 +53,9 @@ $(STATEDIR)/screen.targetinstall:
@$(call install_fixup, screen,AUTHOR,"Robert Schwebel 
")
@$(call install_fixup, screen,DESCRIPTION,missing)
 
-   @$(call install_copy, screen, 0, 0, 0755, -, /usr/bin/screen)
+   @$(call install_copy, screen, 0, 0, 0755, \
+   $(SCREEN_PKGDIR)/usr/bin/screen-$(SCREEN_VERSION), \
+   /usr/bin/screen)
 
 ifdef PTXCONF_SCREEN_ETC_SCREENRC
@$(call install_alternative, screen, 0, 0, 0644, /etc/screenrc, n)
-- 
2.7.4


Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner 
(Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 
620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – 
Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr 
Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), 
Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, 
Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) 
Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail 
enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten 
haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form 
der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation 
dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail 
contains confidential and/or legally protected information. Please inform us if 
you have received this e-mail by mistake and delete it in such a case. Each 
unauthorized reproduction, disclosure, alteration, distribution and/or 
publication of this e-mail is strictly prohibited.

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Can packages be build w/o installing them on the rootfs?

Re: [ptxdist] Can packages be build w/o installing them on the rootfs?

[ptxdist] [PATCH v2] cryptsetup: new package

[ptxdist] Can packages be build w/o installing them on the rootfs?

[ptxdist] [PATCH] timezone: remove legacy '/etc/timezone' file

[ptxdist] [PATCH v2 2/2] luaexpat: Add license information.

[ptxdist] [PATCH v2 1/2] luaexpat: version bump 1.2.0 -> 1.3.0

[ptxdist] [PATCH v2 0/2] luaexpat: version bump 1.2.0 -> 1.3.0

[ptxdist] [PATCH] iptables: fix large file support

[ptxdist] [PATCH 3/3] sudo: force the system zlib

[ptxdist] [PATCH 2/3] sudo: add missing run-time dependencies

[ptxdist] [PATCH 1/3] sudo: provide 'sudoers.d' for individual user files

[ptxdist] [PATCH] screen: Fix ptxdist error message.

13 matches

Site Navigation

Mail list logo

Footer information