[ptxdist] [PATCH] barebox.in: fix typos & complement list of HABv4 SoC's
Signed-off-by: Ulrich Ölmann --- platforms/barebox.in | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platforms/barebox.in b/platforms/barebox.in index 11b346c07aab..8297f13a8306 100644 --- a/platforms/barebox.in +++ b/platforms/barebox.in @@ -135,16 +135,17 @@ config BAREBOX_NEEDS_HOST_IMX_CST prompt "barebox needs imx-cst" bool help - The imx "CST" is the propretary "Code Signing Tool" by + The imx "CST" is the proprietary "Code Signing Tool" by freescale, that is needed to sign the bootloader with a - cryptographic signature. This part of freescale's high + cryptographic signature. This is part of freescale's high assurance boot (HAB) scenario where only correctly signed images can be started. - Barebox currently supports HABv4 for i.MX6 only. + Barebox currently supports HABv4 for i.MX6, i.MX8MM, 8MN, + 8MQ & 8MP. - This options does not do the signing, it just creates the - correct dependencies so that the proprieraty "cst" program - is installed before barebox is compiled. THe signing is done + This option does not do the signing, it just creates the + correct dependencies so that the proprietary "cst" program + is installed before barebox is compiled. The signing is done in barebox and needs special configuration for your board. config BAREBOX_NEEDS_KEYS -- 2.39.2
[ptxdist] [PATCH] nodejs: link libnode to an external libuv
Backport upstream commit [1] on top of node-v12.16.1 to allow the configure flag
"--shared-libuv" to work again (libuv was statically linked into libnode
before).
[1] f65d748f5805 ("build: uvwasi honours node_shared_libuv")
Signed-off-by: Ulrich Ölmann
---
...ild-uvwasi-honours-node_shared_libuv.patch | 42 +++
patches/node-v12.16.1/series | 3 +-
2 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644
patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
diff --git
a/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
b/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
new file mode 100644
index ..a0f92ba15dbc
--- /dev/null
+++ b/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?=
+Date: Mon, 5 Jul 2021 00:22:46 +0200
+Subject: [PATCH] build: uvwasi honours node_shared_libuv
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix #39248.
+
+PR-URL: https://github.com/nodejs/node/pull/39260
+Reviewed-By: Richard Lau
+Reviewed-By: Tobias Nießen
+Reviewed-By: Colin Ihrig
+Reviewed-By: James M Snell
+---
+ deps/uvwasi/uvwasi.gyp | 10 +++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/deps/uvwasi/uvwasi.gyp b/deps/uvwasi/uvwasi.gyp
+index c07b07b608b7..3ff3daf3a11e 100644
+--- a/deps/uvwasi/uvwasi.gyp
b/deps/uvwasi/uvwasi.gyp
+@@ -14,12 +14,16 @@
+ 'src/uv_mapping.c',
+ 'src/uvwasi.c',
+ ],
+- 'dependencies': [
+-'../uv/uv.gyp:libuv',
+- ],
+ 'direct_dependent_settings': {
+ 'include_dirs': ['include']
+ },
++ 'conditions': [
++[ 'node_shared_libuv=="false"', {
++ 'dependencies': [
++'../uv/uv.gyp:libuv',
++ ],
++}],
++ ],
+ }
+ ]
+ }
diff --git a/patches/node-v12.16.1/series b/patches/node-v12.16.1/series
index f0162c556ddc..ff8057d57a58 100644
--- a/patches/node-v12.16.1/series
+++ b/patches/node-v12.16.1/series
@@ -5,4 +5,5 @@
0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
0004-HACK-don-t-add-LD_LIBRARY_PATH-for-external-tools.patch
0005-HACK-run-configure-directly-with-python2.patch
-# c39d7fdc79e6b2f672a807f38ade396e - git-ptx-patches magic
+0006-build-uvwasi-honours-node_shared_libuv.patch
+# c8720e3d38a736f9877911821bd3e666 - git-ptx-patches magic
--
2.30.2
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] krb5: install libs only when needed
The 'kinit' admin tool is the only installable executable linked against libkdb5, hence this library is solely needed in that case. Similarly now only admin libs depend on libgssrpc, therefore restrict its installation accordingly. Signed-off-by: Ulrich Ölmann --- rules/krb5.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/krb5.make b/rules/krb5.make index 10240a289598..412433c4e869 100644 --- a/rules/krb5.make +++ b/rules/krb5.make @@ -91,15 +91,15 @@ $(STATEDIR)/krb5.targetinstall: @$(call install_fixup, krb5,DESCRIPTION,missing) @$(call install_lib, krb5, 0, 0, 0644, libgssapi_krb5) - @$(call install_lib, krb5, 0, 0, 0644, libgssrpc) @$(call install_lib, krb5, 0, 0, 0644, libk5crypto) - @$(call install_lib, krb5, 0, 0, 0644, libkdb5) @$(call install_lib, krb5, 0, 0, 0644, libkrb5) @$(call install_lib, krb5, 0, 0, 0644, libkrb5support) ifdef PTXCONF_KRB5_ADMIN_LIBS + @$(call install_lib, krb5, 0, 0, 0644, libgssrpc) @$(call install_lib, krb5, 0, 0, 0644, libkadm5clnt_mit) @$(call install_lib, krb5, 0, 0, 0644, libkadm5srv_mit) + @$(call install_lib, krb5, 0, 0, 0644, libkdb5) endif ifdef PTXCONF_KRB5_CLIENT_TOOLS -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] krb5: only install libkdb5 when needed
This patch was a little bit premature... there is another library now which needs to be installed conditionally only, as well. Please discard this patch, I'll send a successor in a minute. Best regards Ulrich On Thu, Jan 13 2022 at 21:35 +0100, Ulrich Ölmann wrote: > Only the 'kinit' admin tool is linked against libkdb5, hence that library is > solely needed in that case. > > Signed-off-by: Ulrich Ölmann > --- > rules/krb5.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/krb5.make b/rules/krb5.make > index 10240a289598..41de2b7fdd4f 100644 > --- a/rules/krb5.make > +++ b/rules/krb5.make > @@ -93,13 +93,13 @@ $(STATEDIR)/krb5.targetinstall: > @$(call install_lib, krb5, 0, 0, 0644, libgssapi_krb5) > @$(call install_lib, krb5, 0, 0, 0644, libgssrpc) > @$(call install_lib, krb5, 0, 0, 0644, libk5crypto) > - @$(call install_lib, krb5, 0, 0, 0644, libkdb5) > @$(call install_lib, krb5, 0, 0, 0644, libkrb5) > @$(call install_lib, krb5, 0, 0, 0644, libkrb5support) > > ifdef PTXCONF_KRB5_ADMIN_LIBS > @$(call install_lib, krb5, 0, 0, 0644, libkadm5clnt_mit) > @$(call install_lib, krb5, 0, 0, 0644, libkadm5srv_mit) > + @$(call install_lib, krb5, 0, 0, 0644, libkdb5) > endif > > ifdef PTXCONF_KRB5_CLIENT_TOOLS -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] krb5: only install libkdb5 when needed
Only the 'kinit' admin tool is linked against libkdb5, hence that library is solely needed in that case. Signed-off-by: Ulrich Ölmann --- rules/krb5.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/krb5.make b/rules/krb5.make index 10240a289598..41de2b7fdd4f 100644 --- a/rules/krb5.make +++ b/rules/krb5.make @@ -93,13 +93,13 @@ $(STATEDIR)/krb5.targetinstall: @$(call install_lib, krb5, 0, 0, 0644, libgssapi_krb5) @$(call install_lib, krb5, 0, 0, 0644, libgssrpc) @$(call install_lib, krb5, 0, 0, 0644, libk5crypto) - @$(call install_lib, krb5, 0, 0, 0644, libkdb5) @$(call install_lib, krb5, 0, 0, 0644, libkrb5) @$(call install_lib, krb5, 0, 0, 0644, libkrb5support) ifdef PTXCONF_KRB5_ADMIN_LIBS @$(call install_lib, krb5, 0, 0, 0644, libkadm5clnt_mit) @$(call install_lib, krb5, 0, 0, 0644, libkadm5srv_mit) + @$(call install_lib, krb5, 0, 0, 0644, libkdb5) endif ifdef PTXCONF_KRB5_CLIENT_TOOLS -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] samba: fix missing dependency
The 'smbtree' tool is linked against libsmbclient, hence that library needs to be installed, too, when the client components of the Samba suite are installed. Signed-off-by: Ulrich Ölmann --- rules/samba.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/samba.in b/rules/samba.in index c01b28c10921..e8eec97a07d8 100644 --- a/rules/samba.in +++ b/rules/samba.in @@ -52,6 +52,7 @@ config SAMBA_SERVER config SAMBA_CLIENT bool select SAMBA_COMMON + select SAMBA_LIBCLIENT prompt "Samba client" help Installs some client components of the Samba suite. -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] qt5: fix typo
Signed-off-by: Ulrich Ölmann --- rules/qt5.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/qt5.in b/rules/qt5.in index b0673efdf3d1..39bf5bd6f221 100644 --- a/rules/qt5.in +++ b/rules/qt5.in @@ -3,7 +3,7 @@ menuconfig QT5 tristate select HOST_SYSTEM_PERL - # python2 or python3 works for QtDeclarative but QtWebengine need python2 + # python2 or python3 works for QtDeclarative but QtWebengine needs python2 select HOST_SYSTEM_PYTHON3 if QT5_MODULE_QTDECLARATIVE && !QT5_MODULE_QTWEBENGINE select HOST_SYSTEM_PYTHON if QT5_MODULE_QTWEBENGINE select LIBC_PTHREAD -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] nodejs: version bump 12.14.1 LTS -> 12.16.1 LTS
Signed-off-by: Ulrich Ölmann
---
.../0001-Disable-running-gyp-on-shared-deps.patch| 2 +-
.../0002-Install-both-binaries-and-use-libdir.patch | 12 ++--
...not-explicitely-set-an-rpath-in-make-genera.patch | 0
patches/{node-v12.14.1 => node-v12.16.1}/series | 0
rules/nodejs.make| 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
rename patches/{node-v12.14.1 =>
node-v12.16.1}/0001-Disable-running-gyp-on-shared-deps.patch (94%)
rename patches/{node-v12.14.1 =>
node-v12.16.1}/0002-Install-both-binaries-and-use-libdir.patch (90%)
rename patches/{node-v12.14.1 =>
node-v12.16.1}/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
(100%)
rename patches/{node-v12.14.1 => node-v12.16.1}/series (100%)
diff --git
a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
similarity index 94%
rename from patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
rename to patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
index b41095a20e97..f1d6bb737198 100644
--- a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
+++ b/patches/node-v12.16.1/0001-Disable-running-gyp-on-shared-deps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Disable running gyp on shared deps
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 56f53582d1f4..f289f258df6f 100644
+index 05eaa73abbe0..965e4f8560e6 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ test-code-cache: with-code-cache
diff --git
a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
similarity index 90%
rename from
patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
rename to patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
index 38c3c96503f1..b9dc62bb493f 100644
--- a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
+++ b/patches/node-v12.16.1/0002-Install-both-binaries-and-use-libdir.patch
@@ -12,10 +12,10 @@ Signed-off-by: Elliott Sales de Andrade
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/configure.py b/configure.py
-index 20cce214dbb1..e2d78a2a51ef 100755
+index 14f5665e0299..36a8a413713a 100755
--- a/configure.py
+++ b/configure.py
-@@ -559,6 +559,12 @@ parser.add_option('--shared',
+@@ -572,6 +572,12 @@ parser.add_option('--shared',
help='compile shared library for embedding node in another project. ' +
'(This mode is not officially supported for regular applications)')
@@ -28,14 +28,14 @@ index 20cce214dbb1..e2d78a2a51ef 100755
parser.add_option('--without-v8-platform',
action='store_true',
dest='without_v8_platform',
-@@ -1103,6 +1109,7 @@ def configure_node(o):
- if o['variables']['want_separate_host_toolset'] == 0:
- o['variables']['node_code_cache'] = 'yes' # For testing
+@@ -1121,6 +1127,7 @@ def configure_node(o):
+ o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
+
o['variables']['node_shared'] = b(options.shared)
+ o['variables']['libdir'] = options.libdir
node_module_version = getmoduleversion.get_version()
- if sys.platform == 'darwin':
+ if options.dest_os == 'android':
diff --git a/tools/install.py b/tools/install.py
index 655802980a6e..fe4723bf1501 100755
--- a/tools/install.py
diff --git
a/patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
b/patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
similarity index 100%
rename from
patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
rename to
patches/node-v12.16.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
diff --git a/patches/node-v12.14.1/series b/patches/node-v12.16.1/series
similarity index 100%
rename from patches/node-v12.14.1/series
rename to patches/node-v12.16.1/series
diff --git a/rules/nodejs.make b/rules/nodejs.make
index a9433bd0687a..26335200cfb4 100644
--- a/rules/nodejs.make
+++ b/rules/nodejs.make
@@ -17,8 +17,8 @@ endif
#
# Paths and names
#
-NODEJS_VERSION := v12.14.1
-NODEJS_MD5 := 1c78a75f5c95321f533ea695e814
+NODEJS_VERSION := v12.16.1
+NODEJS_MD5 := 549582c075072c689c245ba12ecac54a
NODEJS := node-$(NODEJS_VERSION)
NODEJS_SUFFIX := tar.xz
NODEJS_URL :=
http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
--
2.26.0.rc2
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] samba: do not unconditionally build with systemd support
Introduced by PTXdist's commit [1] the build time configuration option
"--with-systemd" has been used unconditionally. Amend that by explicitly
depending on a configuration variable.
[1] 93fce3eef4fc ("samba: version bump 3.0.37 -> 4.9.4")
Signed-off-by: Ulrich Ölmann
---
rules/samba.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/samba.make b/rules/samba.make
index 71832137a5b3..43fe4c597150 100644
--- a/rules/samba.make
+++ b/rules/samba.make
@@ -67,7 +67,7 @@ SAMBA_CONF_OPT:= \
--disable-glusterfs \
--disable-cephfs \
--disable-spotlight \
- --with-systemd \
+ --$(call ptx/wwo, PTXCONF_SAMBA_SYSTEMD_UNIT)-systemd \
--without-lttng \
--accel-aes=$(call ptx/ifdef,PTXCONF_ARCH_X86_64,intelaesni,none) \
--enable-pthreadpool \
@@ -86,7 +86,7 @@ SAMBA_CONF_OPT:= \
--enable-fhs \
--with-piddir=/run/samba \
--with-lockdir=/var/lib/samba/lock \
- --systemd-install-services \
+ $(call
ptx/ifdef,PTXCONF_SAMBA_SYSTEMD_UNIT,--systemd-install-services,) \
--with-systemddir=/usr/lib/systemd/system
$(STATEDIR)/samba.prepare:
--
2.25.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v6 2/3] host-yarn: new package
From: Björn Esser
Fast, reliable, and secure dependency management for Node.js.
We use Yarn to generate an offline cache and a lock-file to be able to install
all needed Node.js-packages reproducibly. This works even in environments
without internet-connectivity, as long as the cache and the lock-file are in
reach.
Signed-off-by: Björn Esser
[uol: adjusted commit message, dropped CREDITS line, added Yarn's license,
wrapped install into call of world/execute and made it more verbose]
Signed-off-by: Ulrich Ölmann
---
v3 --> v4: adjusted commit message
v4 --> v5: adjusted commit message, dropped CREDIT line & wrapped install into
call of world/execute
v5 --> v6: adjusted commit message & added Yarn's license
Detailed range-diff of v6 against v5:
2: 8b898ee41bae ! 2: f06e0754037b host-yarn: new package
@@ Commit message
reach.
Signed-off-by: Björn Esser
-[uol: adjusted commit message, dropped CREDIT line & wrapped install
into call
-of world/execute]
+[uol: adjusted commit message, dropped CREDITS line, added Yarn's
license,
+wrapped install into call of world/execute and made it more verbose]
Signed-off-by: Ulrich Ölmann
## rules/host-yarn.in (new) ##
@@ rules/host-yarn.make (new)
+HOST_YARN_SUFFIX := js
+HOST_YARN_URL :=
https://github.com/yarnpkg/yarn/releases/download/v$(HOST_YARN_VERSION)/$(HOST_YARN).$(HOST_YARN_SUFFIX)
+HOST_YARN_SOURCE := $(SRCDIR)/$(HOST_YARN).$(HOST_YARN_SUFFIX)
++HOST_YARN_LICENSE := BSD-2-Clause
+
+#
+# Extract (nothing to be done here)
rules/host-yarn.in | 6 +
rules/host-yarn.make | 62
2 files changed, 68 insertions(+)
create mode 100644 rules/host-yarn.in
create mode 100644 rules/host-yarn.make
diff --git a/rules/host-yarn.in b/rules/host-yarn.in
new file mode 100644
index ..d98dd6c34620
--- /dev/null
+++ b/rules/host-yarn.in
@@ -0,0 +1,6 @@
+## SECTION=hosttools_noprompt
+
+config HOST_YARN
+ tristate
+ default y if ALLYES
+ select HOST_NODEJS
diff --git a/rules/host-yarn.make b/rules/host-yarn.make
new file mode 100644
index ..3669970e552e
--- /dev/null
+++ b/rules/host-yarn.make
@@ -0,0 +1,62 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Juergen Borleis
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+# 2019-May-05, Daniel Arnold, Updated to yarn 1.15.2
+# 2020-January-09, Björn Esser, Updated to yarn 1.21.1
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_YARN) += host-yarn
+
+#
+# Paths and names
+#
+HOST_YARN_VERSION := 1.21.1
+HOST_YARN_MD5 := cf49e663e0f56aa15f1740c77354ebe2
+HOST_YARN := yarn-$(HOST_YARN_VERSION)
+HOST_YARN_SUFFIX := js
+HOST_YARN_URL :=
https://github.com/yarnpkg/yarn/releases/download/v$(HOST_YARN_VERSION)/$(HOST_YARN).$(HOST_YARN_SUFFIX)
+HOST_YARN_SOURCE := $(SRCDIR)/$(HOST_YARN).$(HOST_YARN_SUFFIX)
+HOST_YARN_LICENSE := BSD-2-Clause
+
+#
+# Extract (nothing to be done here)
+#
+
+$(STATEDIR)/host-yarn.extract:
+ @$(call targetinfo)
+ @$(call touch)
+
+#
+# Prepare (nothing to be done here)
+#
+
+$(STATEDIR)/host-yarn.prepare:
+ @$(call targetinfo)
+ @$(call touch)
+
+#
+# Compile (nothing to be done here)
+#
+
+$(STATEDIR)/host-yarn.compile:
+ @$(call targetinfo)
+ @$(call touch)
+
+#
+# Install
+#
+
+$(STATEDIR)/host-yarn.install:
+ @$(call targetinfo)
+ @$(call world/execute, HOST_YARN, \
+ install -vDm 0755 $(HOST_YARN_SOURCE) \
+ $(HOST_YARN_PKGDIR)/bin/yarn)
+ @$(call touch)
+
+# vim: syntax=make
--
2.25.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v6 3/3] nodejs_packages: new package
From: Björn Esser
This is a dummy package to specify and install required Node.js packages for the
target system.
The management of those packages and their dependencies is handled with
Yarn (run through host-nodejs) to maintain a reproducible offline cache that is
stored in local_src/nodejs_packages.
Signed-off-by: Björn Esser
[uol: adjusted commit message and Kconfig menu file's help texts, integrated
Kconfig symbol NODEJS_PACKAGES_LICENSE, made NODEJS_PACKAGES_CACHE and YARN_LOCK
aware of PTXdist's concept of layers, made yarn, mkdir, install & cp more
verbose, suppressed echoing of diverse commands, removed one square bracket in a
shell test, let PTXdist bail out if yarn's frozen lock file does not exist at
all and wrapped install/cp into call of execute and world/execute]
Signed-off-by: Ulrich Ölmann
---
v3 --> v4: adjusted commit message and Kconfig menu file's help texts & fixed
NODEJS_PACKAGES_URL
v4 --> v5: adjusted commit message and Kconfig menu file's help texts,
integrated Kconfig symbol NODEJS_PACKAGES_LICENSE, removed one square
bracket in a shell test and wrapped install/cp into call of execute
and world/execute
v5 --> v6: adjusted commit message, reverted "fix" of NODEJS_PACKAGES_URL
applied in v4, made NODEJS_PACKAGES_CACHE and YARN_LOCK aware of
PTXdist's concept of layers, made yarn, mkdir, install & cp more
verbose, suppressed echoing of diverse commands and let PTXdist bail
out if yarn's frozen lock file does not exist at all
Detailed range-diff of v6 against v5:
3: 1a73ebbd6e7e ! 3: ffc71b434eda nodejs_packages: new package
@@ Commit message
Signed-off-by: Björn Esser
[uol: adjusted commit message and Kconfig menu file's help texts,
integrated
-Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL,
removed one
-square bracket in a shell test and wrapped install/cp into call of
execute and
-world/execute]
+Kconfig symbol NODEJS_PACKAGES_LICENSE, made NODEJS_PACKAGES_CACHE and
YARN_LOCK
+aware of PTXdist's concept of layers, made yarn, mkdir, install & cp
more
+verbose, suppressed echoing of diverse commands, removed one square
bracket in a
+shell test, let PTXdist bail out if yarn's frozen lock file does not
exist at
+all and wrapped install/cp into call of execute and world/execute]
Signed-off-by: Ulrich Ölmann
## rules/nodejs_packages.in (new) ##
@@ rules/nodejs_packages.make (new)
+NODEJS_PACKAGES_VERSION := 0.0.1
+NODEJS_PACKAGES := nodejs_packages-$(NODEJS_PACKAGES_VERSION)
+NODEJS_PACKAGES_LOCAL := local_src/nodejs_packages
-+NODEJS_PACKAGES_URL :=
lndir://$(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)
++NODEJS_PACKAGES_URL := lndir://$(NODEJS_PACKAGES_LOCAL)
+NODEJS_PACKAGES_DIR := $(BUILDDIR)/$(NODEJS_PACKAGES)
-+NODEJS_PACKAGES_CACHE :=
$(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn_cache
++NODEJS_PACKAGES_CACHE := $(call ptx/in-path, PTXDIST_PATH_LAYERS,
$(NODEJS_PACKAGES_LOCAL))/yarn_cache
+NODEJS_PACKAGES_LICENSE := $(call remove_quotes,
$(PTXCONF_NODEJS_PACKAGES_LICENSE))
+
+NODEJS_PACKAGES_LIST := $(call remove_quotes,
$(PTXCONF_NODEJS_PACKAGES_LIST))
+
-+YARN_LOCK := $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn.lock
++YARN_LOCK := $(call ptx/in-path, PTXDIST_PATH_LAYERS,
$(NODEJS_PACKAGES_LOCAL))/yarn.lock
+YARN_OPTS := \
+ --cwd "$(NODEJS_PACKAGES_DIR)" \
+ --cache-folder "$(NODEJS_PACKAGES_CACHE)" \
+ --link-duplicates \
-+ --production=true
++ --production=true \
++ --verbose
+
+ifdef PTXCONF_NODEJS_PACKAGES_OFFLINE
+YARN_OPTS += \
@@ rules/nodejs_packages.make (new)
+
+$(STATEDIR)/nodejs_packages.compile:
+ @$(call targetinfo)
-+ mkdir -p $(NODEJS_PACKAGES_CACHE)
-+ printf "{ \
++ @mkdir -vp $(NODEJS_PACKAGES_CACHE)
++ @printf "{ \
+ \"name\": \"nodejs_packages\", \
+ \"version\": \"$(NODEJS_PACKAGES_VERSION)\", \
+ \"license\": \"UNLICENSED\", \
+ \"private\": true \
+ }" > $(NODEJS_PACKAGES_DIR)/package.json
-+ if [ ! -f $(YARN_LOCK) ]; then \
++ @if [ ! -f $(YARN_LOCK) ]; then \
++ if [ $(PTXCONF_NODEJS_PACKAGES_OFFLINE) = y ]; then \
++ ptxd_bailout "Offline cache locked without existing
'yarn.lock'! \
++ Please unlock and compile before locking
again."; \
++ fi; \
+ touch $(YARN_LOCK); \
+ ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \
+ fi
+ yarn $(YARN_OPTS) add $(NODEJS_P
[ptxdist] [PATCH v6 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
From: Björn Esser
We also need to build a host-nodejs package first, as there
are some tools needed to be executable on the host system
during the intermediate cross-build process.
This package drops support for NPM, as we will be managing
Node.js packages with Yarn, which will be implemented in the
following commits.
The patches that are shipped along with this version of the
package have been taken from the SRPM of the Node.js-package
in Fedora. See:
https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master
Signed-off-by: Björn Esser
[uol: fixed whitespace issues in first patch, added patch to get rid of the
non-existing rpath, dropped CREDITS lines, switched from menuconfig entry for
NODEJS back to config entry because of the removal of all sub-menu entries,
removed shell usage & inserted line break in build command]
Signed-off-by: Ulrich Ölmann
---
v1 --> v2: fix configure flags for host-nodejs
v2 --> v3: add missing patches, remove obsolete patches
v4 --> v5: adjusted commit message, dropped CREDIT lines, removed shell usage &
inserted line break in build command
v5 --> v6: adjusted commit message, fixed whitespace issues in '0001-Disable-
running-gyp-on-shared-deps.patch', added patch to get rid of the
non-existing rpath & switched from menuconfig entry for NODEJS back
to config entry because of the removal of all sub-menu entries
Detailed range-diff of v6 against v5:
1: 440fed72eaf9 ! 1: cbe9e2c1c31e nodejs: version bump 6.9.5 -> 12.14.1 LTS
@@ Commit message
https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master
Signed-off-by: Björn Esser
-[uol: adjusted commit message, dropped CREDIT lines, removed shell
usage &
-inserted line break in build command]
+[uol: fixed whitespace issues in first patch, added patch to get rid
of the
+non-existing rpath, dropped CREDITS lines, switched from menuconfig
entry for
+NODEJS back to config entry because of the removal of all sub-menu
entries,
+removed shell usage & inserted line break in build command]
Signed-off-by: Ulrich Ölmann
## patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
(new) ##
@@ patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch (new)
+Subject: [PATCH] Disable running gyp on shared deps
+
+---
-+ Makefile | 6 +++---
-+ 1 file changed, 3 insertions(+), 3 deletions(-)
++ Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
-+index 56f53582d1f4..2fb80e742637 100644
++index 56f53582d1f4..f289f258df6f 100644
+--- a/Makefile
b/Makefile
-+@@ -141,9 +141,9 @@ test-code-cache: with-code-cache
++@@ -141,7 +141,7 @@ test-code-cache: with-code-cache
+ echo "'test-code-cache' target is a noop"
+
+ out/Makefile: config.gypi common.gypi node.gyp \
+- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
-+- tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
-+- tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
-++ deps/http_parser/http_parser.gyp \
-++ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
-++ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+++ deps/http_parser/http_parser.gyp \
++ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
++ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+ $(PYTHON) tools/gyp_node.py -f make
-+
-+ # node_version.h is listed because the N-API version is taken from there
## patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
(new) ##
@@
@@ -121,26 +121,23 @@ def subdir_files(path, dest, action):
+ if 'true' == variables.get('node_use_dtrace'):
+ action(['out/Release/node.d'], 'lib/dtrace/node.d')
+ ##
patches/node-v12.14.1/0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
(new) ##
+@@
++From: =?UTF-8?q?Ulrich=20=C3=96lmann?=
++Date: Fri, 13 Mar 2020 12:36:49 +0100
++Subject: [PATCH] tools: do not explicitely set an rpath in make generator
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++This is not necessary as the library is installed into the standard path.
++
++Signed-off-by: Ulrich Ölmann
++---
++ tools/gyp/pylib/gyp/generator/make.py | 4
++ 1 file changed, 4 deletions(-)
++
++diff --git a/tools/gyp/pylib/gyp/generator/make.py
b/tools/gyp/pylib/gyp/generator/make.py
++index 91a119c5a576..c109b2b488ec 100644
++--- a/tools/gyp/pylib/gyp/generator/make.py
+ b/tools/gyp/pylib/gyp/generator/make.py
++@@ -1474,11 +1474,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s
FORC
Re: [ptxdist] [PATCH v5 3/3] nodejs_packages: new package
On Fri, Feb 14 2020 at 13:46 +0100, Michael Olbrich wrote: > On Tue, Feb 04, 2020 at 08:53:59AM +0100, Ulrich Ölmann wrote: >> From: Björn Esser >> >> This is a dummy package to specify and install required Node.js packages for >> the >> target system. >> >> The management of those packages and their dependencies is handled with >> Yarn (run through host-nodejs) to maintain a reproducible offline cache that >> is >> stored in local_src/nodejs_packages. >> >> Signed-off-by: Björn Esser >> [uol: adjusted commit message and Kconfig menu file's help texts, integrated >> Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL, removed >> one >> square bracket in a shell test and wrapped install/cp into call of execute >> and >> world/execute] >> Signed-off-by: Ulrich Ölmann >> --- >> v3 --> v4: adjusted commit message and Kconfig menu file's help texts & fixed >>NODEJS_PACKAGES_URL >> Range-diff of v5 against v4: >> 3: ccd2b44a8d92 ! 3: 1a73ebbd6e7e nodejs_packages: new package >> @@ Commit message >> stored in local_src/nodejs_packages. >> >> Signed-off-by: Björn Esser >> -[uol: adjusted commit message and Kconfig menu file's help texts & >> fixed >> -NODEJS_PACKAGES_URL] >> +[uol: adjusted commit message and Kconfig menu file's help texts, >> integrated >> +Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL, >> removed one >> +square bracket in a shell test and wrapped install/cp into call of >> execute and >> +world/execute] >> Signed-off-by: Ulrich Ölmann >> >> ## rules/nodejs_packages.in (new) ## >> @@ rules/nodejs_packages.in (new) >> + >> + [1] https://legacy.yarnpkg.com/en/docs/dependency-versions/ >> + >> ++config NODEJS_PACKAGES_LICENSE >> ++ string >> ++ prompt "Licenses of to be installed Node.js packages" >> ++ default "unknown" >> ++ help >> ++ Manually compiled list of licenses that the to be installed >> Node.js >> ++ packages are distributed under, see description of the >> variable >> ++ *_LICENSE in [1]. >> ++ >> ++ ATTENTION: be aware of the fact that Node.js packages usually >> depend >> ++ on additional Node.js packages that Yarn installs as well and >> that >> ++ this propagates recursively resulting in an unknown number of >> Node.js >> ++ packages on the target with an unknown set of licenses that >> they may >> ++ be utilized under. Hence you carefully need to examine all of >> them >> ++ individually to create a reliable list of licenses. >> ++ >> ++ [1] >> https://www.ptxdist.org/doc/dev_manual.html#some-notes-about-licenses >> ++ >> +config NODEJS_PACKAGES_OFFLINE >> + bool >> -+ prompt "lock offline cache for offline/production use" >> ++ prompt "Lock offline cache for offline/production use" >> + help >> -+ This option locks the offline cache for installing the nodejs >> packages >> -+ and allows their installation during the build of the BSP >> without any >> -+ need for internet connectivity. >> ++ This option locks the offline cache for installing the Node.js >> ++ packages and allows their installation during the build of >> the BSP >> ++ without any need for internet connectivity. >> + >> + Enabling this option is highly recommended for production use. >> + >> @@ rules/nodejs_packages.make (new) >> +NODEJS_PACKAGES_URL:= >> lndir://$(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL) >> +NODEJS_PACKAGES_DIR:= $(BUILDDIR)/$(NODEJS_PACKAGES) >> +NODEJS_PACKAGES_CACHE := >> $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn_cache >> -+NODEJS_PACKAGES_LICENSE:= unknown >> ++NODEJS_PACKAGES_LICENSE:= $(call remove_quotes, >> $(PTXCONF_NODEJS_PACKAGES_LICENSE)) >> + >> +NODEJS_PACKAGES_LIST := $(call remove_quotes, >> $(PTXCONF_NODEJS_PACKAGES_LIST)) >> + >> @@ rules/nodejs_packages.make (new) >> + \"license\": \"UNLICENSED\
Re: [ptxdist] [PATCH v5 2/3] host-yarn: new package
On Fri, Feb 21 2020 at 09:26 +0100, Juergen Borleis wrote: > Am Dienstag, den 04.02.2020, 08:53 +0100 schrieb Ulrich Ölmann: >> […] >> diff --git a/rules/host-yarn.make b/rules/host-yarn.make >> new file mode 100644 >> index ..16e04c05aee8 >> --- /dev/null >> +++ b/rules/host-yarn.make >> @@ -0,0 +1,61 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2017 by Juergen Borleis >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> +# 2019-May-05, Daniel Arnold, Updated to yarn 1.15.2 >> +# 2020-January-09, Björn Esser, Updated to yarn 1.21.1 >> + >> +# >> +# We provide this package >> +# >> +HOST_PACKAGES-$(PTXCONF_HOST_YARN) += host-yarn >> + >> +# >> +# Paths and names >> +# >> +HOST_YARN_VERSION := 1.21.1 >> +HOST_YARN_MD5 := cf49e663e0f56aa15f1740c77354ebe2 >> +HOST_YARN := yarn-$(HOST_YARN_VERSION) >> +HOST_YARN_SUFFIX:= js >> +HOST_YARN_URL := >> https://github.com/yarnpkg/yarn/releases/download/v$(HOST_YARN_VERSION)/$(HOST_YARN).$(HOST_YARN_SUFFIX) >> +HOST_YARN_SOURCE:= $(SRCDIR)/$(HOST_YARN).$(HOST_YARN_SUFFIX) > > Don't forget the: > > HOST_YARN_LICENSE := BSD-2-Clause Added the license in v6 of the patch series. Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
On Fri, Feb 21 2020 at 09:22 +0100, Juergen Borleis wrote: > Am Dienstag, den 04.02.2020, 08:53 +0100 schrieb Ulrich Ölmann: >> […] >> diff --git a/rules/nodejs.in b/rules/nodejs.in >> index e4ac11568bcc..6d23f94ef8b7 100644 >> --- a/rules/nodejs.in >> +++ b/rules/nodejs.in >> @@ -1,48 +1,20 @@ >> -## SECTION=staging >> -## old section: >> -### SECTION=bytecode_engines >> +## SECTION=bytecode_engines >> >> menuconfig NODEJS >> tristate >> -prompt "nodejs" >> +prompt "Node.js " >> select HOST_NODEJS >> +select C_ARES >> +select LIBUV >> select OPENSSL >> select ZLIB >> help >> - evented I/O for V8 javascript >> - >> - Node.js is a platform built on Chrome's JavaScript runtime >> - for easily building fast, scalable network >> - applications. Node.js uses an event-driven, non-blocking I/O >> - model that makes it lightweight and efficient, perfect for >> - data-intensive real-time applications that run across >> - distributed devices. >> - >> - STAGING: remove in ptxdist-2020.06.0 >> - Old version that need to be updated. Fails to build with gcc >= 7.x. >> - >> - >> -if NODEJS >> - >> -config NODEJS_NPM >> -bool >> -prompt "install npm on target" >> […] > > Since you remove all sub-menu entries, you should switch the whole entry from > "menuconfig" to "config" as well. Switched to "config" in v6 of the patch series. Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
On Mon, Feb 17 2020 at 10:40 +0100, Michael Olbrich wrote: > On Tue, Feb 04, 2020 at 08:53:57AM +0100, Ulrich Ölmann wrote: >> From: Björn Esser >> >> We also need to build a host-nodejs package first, as there >> are some tools needed to be executable on the host system >> during the intermediate cross-build process. >> >> This package drops support for NPM, as we will be managing >> Node.js packages with Yarn, which will be implemented in the >> following commits. >> >> The patches that are shipped along with this version of the >> package have been taken from the SRPM of the Node.js-package >> in Fedora. See: >> >> https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master >> >> Signed-off-by: Björn Esser >> [uol: adjusted commit message, dropped CREDIT lines, removed shell usage & >> inserted line break in build command] >> Signed-off-by: Ulrich Ölmann > > /usr/bin/node has an rpath that does not exist: /usr/bin/lib.target Added a corresponding patch in v6 of the patch series. Best regards Ulrich > Michael > >> --- >> v1 --> v2: fix configure flags for host-nodejs >> v2 --> v3: add missing patches, remove obsolete patches >> Range-diff of v5 against v4: >> 1: e08d21cc0be1 ! 1: 440fed72eaf9 nodejs: version bump 6.9.5 -> 12.14.1 LTS >> @@ Commit message >> >> https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master >> >> Signed-off-by: Björn Esser >> +[uol: adjusted commit message, dropped CREDIT lines, removed shell >> usage & >> +inserted line break in build command] >> +Signed-off-by: Ulrich Ölmann >> >> ## patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch >> (new) ## >> @@ >> @@ rules/host-nodejs.make >> # >> # Copyright (C) 2015 by Michael Grzeschik >> +# Copyright (C) 2019 by Björn Esser >> -+# >> -+# 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. >> @@ rules/nodejs.make >> # >> # Copyright (C) 2015 by Michael Grzeschik >> +# Copyright (C) 2019 by Björn Esser >> -+# >> -+# 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. >> @@ rules/nodejs.make: NODEJS_ARM_FLOAT_ABI = $(shell ptxd_cross_cc_v | >> sed -n "s/CO >> +# # to the pre-built host tool binaries, which are different for >> +# # each individual checkout of a BSP. -_- >> + $(foreach f,$(NODEJS_HOST_TOOLS), \ >> -+ $(shell sed -i -e >> "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" >> $(NODEJS_DIR)/node.gyp $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp) \ >> -+ ) >> ++ sed -i -e >> "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" >> \ >> ++ $(NODEJS_DIR)/node.gyp >> $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp $(ptx/nl)) >> + >> + @$(call world/prepare, NODEJS) >> + >> >> ...1-Disable-running-gyp-on-shared-deps.patch | 25 >> ...Install-both-binaries-and-use-libdir.patch | 83 >> patches/node-v12.14.1/series | 5 + >> ...build-from-source-option-to-npmunbox.patch | 31 - >> patches/npmbox-2.6.1/series | 4 - >> rules/host-nodejs.in | 2 + >> rules/host-nodejs.make| 39 +++--- >> rules/nodejs.in | 54 ++-- >> rules/nodejs.make | 119 ++ >> 9 files changed, 185 insertions(+), 177 deletions(-) >> create mode 100644 >> patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch >> create mode 100644 >> patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch >> create mode 100644 patches/node-v12.14.1/series >> delete mode 100644 >> patches/npmbox-2.6.1/0001-npmbox-add-build-from-source-option-to-npmunbox.patch >> delete mode 100644 patches/npmbox-2.6.1/series >> >> diff --git >> a/
[ptxdist] [PATCH v7 1/4] libssh2: version bump 1.8.1 -> 1.9.0
The current release 1.9.0 includes commit [1] that fixes the choice of the TLS
library. This allows the following PTXdist commit to introduce mbed TLS as an
alternative to OpenSSL without having to fear that libssh2 is now erroneously
built against the former.
[1] e70e71a3b18b ("configure.ac: Add --with-crypto= instead of many different
--with-$backend")
Signed-off-by: Ulrich Ölmann
---
Notes:
v5 --> v6: added this version bump
rules/libssh2.make | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/rules/libssh2.make b/rules/libssh2.make
index 205d1a9c74b4..51c5c4e55df9 100644
--- a/rules/libssh2.make
+++ b/rules/libssh2.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSSH2) += libssh2
#
# Paths and names
#
-LIBSSH2_VERSION:= 1.8.1
-LIBSSH2_MD5:= 338f36a8bb7f5ef55715ac1864cc788c
+LIBSSH2_VERSION:= 1.9.0
+LIBSSH2_MD5:= 1beefafe8963982adc84b408b2959927
LIBSSH2:= libssh2-$(LIBSSH2_VERSION)
LIBSSH2_SUFFIX := tar.gz
LIBSSH2_URL:= http://www.libssh2.org/download/$(LIBSSH2).$(LIBSSH2_SUFFIX)
@@ -43,9 +43,8 @@ LIBSSH2_AUTOCONF := \
--enable-debug \
--enable-hidden-symbols \
--enable-examples-build \
- --with-openssl \
- --without-wincng \
- --without-mbedtls \
+ --disable-werror \
+ --with-crypto=openssl \
--with-libz \
--with-libssl-prefix=$(SYSROOT)/usr \
--with-libz-prefix=$(SYSROOT)/usr
--
2.25.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v7 4/4] open62541: new package
From: Björn Esser
The open62541 project is an open source implementation of the OPC UA
communication infrastructure which is used in industrial control.
Signed-off-by: Björn Esser
[uol: adjusted commit message, added "select HOST_SYSTEM_PYTHON3" to Kconfig's
menu file, added OPEN62541_MDNSD{,_SUFFIX} and removed comment in the makefile]
Signed-off-by: Ulrich Ölmann
---
Notes:
v2 --> v3: adjusted commit message
v5 --> v6: added "select HOST_SYSTEM_PYTHON3" to Kconfig's menu file, added
OPEN62541_MDNSD{,_SUFFIX} and removed comment in the makefile
v6 --> v7: adjusted commit message
...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
patches/open62541-1.0/series | 4 +
rules/host-open62541.in | 7 +
rules/host-open62541.make | 50
rules/open62541.in| 13 +
rules/open62541.make | 141 +++
6 files changed, 439 insertions(+)
create mode 100644
patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
create mode 100644 patches/open62541-1.0/series
create mode 100644 rules/host-open62541.in
create mode 100644 rules/host-open62541.make
create mode 100644 rules/open62541.in
create mode 100644 rules/open62541.make
diff --git
a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
new file mode 100644
index ..0dfd003518ed
--- /dev/null
+++
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
@@ -0,0 +1,224 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 2 Dec 2019 14:38:38 +0100
+Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This makes it easier for developers to keep all ua-nodesets XML
+definitions in a common location.
+
+Backported from: https://github.com/open62541/open62541/pull/3310
+
+Signed-off-by: Björn Esser
+---
+ CMakeLists.txt| 14 +-
+ doc/nodeset_compiler.rst | 22 +++---
+ examples/CMakeLists.txt | 4
+ examples/nodeset/CMakeLists.txt | 6 +++---
+ tests/nodeset-compiler/CMakeLists.txt | 14 +++---
+ tools/cmake/macros_public.cmake | 2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d426e1da66fe..fbbafd8f2791 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -15,7 +15,6 @@ include(GNUInstallDirs)
+
+ # Set when installed via make install
+ set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
+-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+
+ include(macros_internal)
+ include(macros_public)
+@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
(uses mbedTLS)" OFF)
+ option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
Device Server Profile" OFF)
+ option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
+
++if(NOT UA_NODESET_DIR)
++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
++endif()
++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
++
+ # Namespace Zero
+ set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
namespace zero (minimal/reduced/full)")
+ SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
"FULL")
+@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
+
+ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ if(NOT UA_FILE_NS0)
+-set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+ endif()
+ set(UA_FILE_NODESETS "${UA_FILE_NS0}")
+
+@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ endif()
+
+
+-set(UA_FILE_NODEIDS
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
+-set(UA_FILE_STATUSCODES
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
+-set(UA_FILE_TYPES_BSD
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+ else()
+ if(NOT UA_FILE_NS0)
+ set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
+diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
+index dd752ccd70a9..34fc8f800480 100644
+--- a/doc/nodeset_compiler.rst
b/doc/nodeset_compiler.rst
+@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpe
[ptxdist] [PATCH v7 2/4] mbedtls: new package
From: Björn Esser mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint. Unfortunately the upcoming open62541 package cannot be built against OpenSSL. To enable its SSL functionality mbed TLS is needed. Signed-off-by: Björn Esser [uol: adjusted commit message] Signed-off-by: Ulrich Ölmann --- Notes: v2 --> v3: adjusted commit message rules/mbedtls.in | 13 + rules/mbedtls.make | 66 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/mbedtls.in create mode 100644 rules/mbedtls.make diff --git a/rules/mbedtls.in b/rules/mbedtls.in new file mode 100644 index ..a0d58dbd5468 --- /dev/null +++ b/rules/mbedtls.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config MBEDTLS + tristate + prompt "mbedtls" + select HOST_CMAKE + select LIBC_PTHREAD + select ZLIB + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS capabilities + in their (embedded) products, facilitating this functionality + with a minimal coding footprint. diff --git a/rules/mbedtls.make b/rules/mbedtls.make new file mode 100644 index ..0086492fc029 --- /dev/null +++ b/rules/mbedtls.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls + +# +# Paths and names +# +MBEDTLS_VERSION:= 2.16.3 +MBEDTLS_MD5:= 90ce7c7a001d2514410280706b3ab1a7 +MBEDTLS:= mbedtls-$(MBEDTLS_VERSION) +MBEDTLS_SUFFIX := tgz +MBEDTLS_URL:= https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) +MBEDTLS_DIR:= $(BUILDDIR)/$(MBEDTLS) +MBEDTLS_LICENSE:= Apache-2.0 +MBEDTLS_LICENSE_FILES := file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +# +# cmake +# +MBEDTLS_CONF_TOOL := cmake +MBEDTLS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DLINK_WITH_PTHREAD=ON \ + -DUNSAFE_BUILD=OFF \ + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF + +# +# Target-Install +# + +$(STATEDIR)/mbedtls.targetinstall: + @$(call targetinfo) + + @$(call install_init, mbedtls) + @$(call install_fixup, mbedtls,PRIORITY,optional) + @$(call install_fixup, mbedtls,SECTION,base) + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, mbedtls,DESCRIPTION,missing) + + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) + + @$(call install_finish, mbedtls) + + @$(call touch) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v7 3/4] host-ua-nodeset: new package
From: Björn Esser The OPC Foundation's UA NodeSets and other normative files which are released with an OPC UA specification (for details see [1]). Needed to build open62541. [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files Signed-off-by: Björn Esser [uol: adjusted commit message & Kconfig menu file's help text, added default y to HOST_UA_NODESET, wrapped mkdir & cp into world/execute & execute and made them more verbose] Signed-off-by: Ulrich Ölmann --- Notes: v1 --> v2: adjusted commit message and Kconfig menu file's help text v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t v3 --> v4: adjusted commit message and added default y in Kconfig menu file v4 --> v5: adjusted commit message and re-replaced install -D -t by mkdir/cp wrapped into world/execute and execute v6 --> v7: adjusted commit message and made mkdir & cp more verbose rules/host-ua-nodeset.in | 11 + rules/host-ua-nodeset.make | 46 ++ 2 files changed, 57 insertions(+) create mode 100644 rules/host-ua-nodeset.in create mode 100644 rules/host-ua-nodeset.make diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in new file mode 100644 index ..ba10ae26c36c --- /dev/null +++ b/rules/host-ua-nodeset.in @@ -0,0 +1,11 @@ +## SECTION=hosttools_noprompt + +config HOST_UA_NODESET + tristate + default y if ALLYES + help + The OPC Foundation's UA NodeSets and other normative files which are + released with an OPC UA specification (for details see [1]). Needed to + build open62541. + + [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make new file mode 100644 index ..4e8eec5dd5a6 --- /dev/null +++ b/rules/host-ua-nodeset.make @@ -0,0 +1,46 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset + +# +# Paths and names +# +HOST_UA_NODESET_VERSION:= 1.04.4-2020-01-08 +HOST_UA_NODESET_MD5:= ce7b39c7f2d65617f76e0301f654a9ea +HOST_UA_NODESET:= ua-nodeset-$(HOST_UA_NODESET_VERSION) +HOST_UA_NODESET_SUFFIX := tar.gz +HOST_UA_NODESET_URL:= https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_SOURCE := $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_DIR:= $(HOST_BUILDDIR)/$(HOST_UA_NODESET) + +# +# Compile +# + +$(STATEDIR)/host-ua-nodeset.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-ua-nodeset.install: + @$(call targetinfo) + + @$(call world/execute, HOST_UA_NODESET, \ + mkdir -vp $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset) + @$(call execute, HOST_UA_NODESET, \ + cp -va $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ + $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset) + + @$(call touch) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v6 3/4] host-ua-nodeset: new package
From: Björn Esser The OPC Foundation's UA NodeSets and other normative files which are released with an OPC UA specification (for details see [1]). Needed to build open62541. [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files Signed-off-by: Björn Esser [uol: adjusted commit message and Kconfig menu file, wrapped mkdir/cp into world/execute and execute] Signed-off-by: Ulrich Ölmann --- Notes: v1 --> v2: adjusted commit message and Kconfig menu file's help text v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t v3 --> v4: adjusted commit message and added default y in Kconfig menu file v4 --> v5: adjusted commit message and re-replaced install -D -t by mkdir/cp wrapped into world/execute and execute rules/host-ua-nodeset.in | 11 + rules/host-ua-nodeset.make | 46 ++ 2 files changed, 57 insertions(+) create mode 100644 rules/host-ua-nodeset.in create mode 100644 rules/host-ua-nodeset.make diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in new file mode 100644 index ..ba10ae26c36c --- /dev/null +++ b/rules/host-ua-nodeset.in @@ -0,0 +1,11 @@ +## SECTION=hosttools_noprompt + +config HOST_UA_NODESET + tristate + default y if ALLYES + help + The OPC Foundation's UA NodeSets and other normative files which are + released with an OPC UA specification (for details see [1]). Needed to + build open62541. + + [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make new file mode 100644 index ..172dafbf3a68 --- /dev/null +++ b/rules/host-ua-nodeset.make @@ -0,0 +1,46 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset + +# +# Paths and names +# +HOST_UA_NODESET_VERSION:= 1.04.4-2020-01-08 +HOST_UA_NODESET_MD5:= ce7b39c7f2d65617f76e0301f654a9ea +HOST_UA_NODESET:= ua-nodeset-$(HOST_UA_NODESET_VERSION) +HOST_UA_NODESET_SUFFIX := tar.gz +HOST_UA_NODESET_URL:= https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_SOURCE := $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_DIR:= $(HOST_BUILDDIR)/$(HOST_UA_NODESET) + +# +# Compile +# + +$(STATEDIR)/host-ua-nodeset.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-ua-nodeset.install: + @$(call targetinfo) + + @$(call world/execute, HOST_UA_NODESET, \ + mkdir -p $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset) + @$(call execute, HOST_UA_NODESET, \ + cp -a $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ + $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset) + + @$(call touch) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v6 4/4] open62541: new package
From: Björn Esser
The open62541 project is an open source implementation of the OPC UA
communication infrastructure which is used in industrial control.
Signed-off-by: Björn Esser
[uol: adjusted commit message]
Signed-off-by: Ulrich Ölmann
---
Notes:
v2 --> v3: adjusted commit message
v5 --> v6: added "select HOST_SYSTEM_PYTHON3" to Kconfig's menu file, added
OPEN62541_MDNSD{,_SUFFIX} and removed comment in the makefile
...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
patches/open62541-1.0/series | 4 +
rules/host-open62541.in | 7 +
rules/host-open62541.make | 50
rules/open62541.in| 13 +
rules/open62541.make | 141 +++
6 files changed, 439 insertions(+)
create mode 100644
patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
create mode 100644 patches/open62541-1.0/series
create mode 100644 rules/host-open62541.in
create mode 100644 rules/host-open62541.make
create mode 100644 rules/open62541.in
create mode 100644 rules/open62541.make
diff --git
a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
new file mode 100644
index ..0dfd003518ed
--- /dev/null
+++
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
@@ -0,0 +1,224 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 2 Dec 2019 14:38:38 +0100
+Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This makes it easier for developers to keep all ua-nodesets XML
+definitions in a common location.
+
+Backported from: https://github.com/open62541/open62541/pull/3310
+
+Signed-off-by: Björn Esser
+---
+ CMakeLists.txt| 14 +-
+ doc/nodeset_compiler.rst | 22 +++---
+ examples/CMakeLists.txt | 4
+ examples/nodeset/CMakeLists.txt | 6 +++---
+ tests/nodeset-compiler/CMakeLists.txt | 14 +++---
+ tools/cmake/macros_public.cmake | 2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d426e1da66fe..fbbafd8f2791 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -15,7 +15,6 @@ include(GNUInstallDirs)
+
+ # Set when installed via make install
+ set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
+-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+
+ include(macros_internal)
+ include(macros_public)
+@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
(uses mbedTLS)" OFF)
+ option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
Device Server Profile" OFF)
+ option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
+
++if(NOT UA_NODESET_DIR)
++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
++endif()
++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
++
+ # Namespace Zero
+ set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
namespace zero (minimal/reduced/full)")
+ SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
"FULL")
+@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
+
+ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ if(NOT UA_FILE_NS0)
+-set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+ endif()
+ set(UA_FILE_NODESETS "${UA_FILE_NS0}")
+
+@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ endif()
+
+
+-set(UA_FILE_NODEIDS
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
+-set(UA_FILE_STATUSCODES
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
+-set(UA_FILE_TYPES_BSD
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+ else()
+ if(NOT UA_FILE_NS0)
+ set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
+diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
+index dd752ccd70a9..34fc8f800480 100644
+--- a/doc/nodeset_compiler.rst
b/doc/nodeset_compiler.rst
+@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen``
nodesets::
+ # Generate types and namespace for DI
+ ua_generate_nodeset_and_datatypes(
+ NAME "di"
+-FILE_CSV "${PROJECT_SOURCE_DI
[ptxdist] [PATCH v6 2/4] mbedtls: new package
From: Björn Esser mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint. Unfortunately the upcoming open62541 package cannot be built against OpenSSL. To enable its SSL functionality mbed TLS is needed. Signed-off-by: Björn Esser [uol: adjusted commit message] Signed-off-by: Ulrich Ölmann --- Notes: v2 --> v3: adjusted commit message rules/mbedtls.in | 13 + rules/mbedtls.make | 66 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/mbedtls.in create mode 100644 rules/mbedtls.make diff --git a/rules/mbedtls.in b/rules/mbedtls.in new file mode 100644 index ..a0d58dbd5468 --- /dev/null +++ b/rules/mbedtls.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config MBEDTLS + tristate + prompt "mbedtls" + select HOST_CMAKE + select LIBC_PTHREAD + select ZLIB + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS capabilities + in their (embedded) products, facilitating this functionality + with a minimal coding footprint. diff --git a/rules/mbedtls.make b/rules/mbedtls.make new file mode 100644 index ..0086492fc029 --- /dev/null +++ b/rules/mbedtls.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls + +# +# Paths and names +# +MBEDTLS_VERSION:= 2.16.3 +MBEDTLS_MD5:= 90ce7c7a001d2514410280706b3ab1a7 +MBEDTLS:= mbedtls-$(MBEDTLS_VERSION) +MBEDTLS_SUFFIX := tgz +MBEDTLS_URL:= https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) +MBEDTLS_DIR:= $(BUILDDIR)/$(MBEDTLS) +MBEDTLS_LICENSE:= Apache-2.0 +MBEDTLS_LICENSE_FILES := file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +# +# cmake +# +MBEDTLS_CONF_TOOL := cmake +MBEDTLS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DLINK_WITH_PTHREAD=ON \ + -DUNSAFE_BUILD=OFF \ + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF + +# +# Target-Install +# + +$(STATEDIR)/mbedtls.targetinstall: + @$(call targetinfo) + + @$(call install_init, mbedtls) + @$(call install_fixup, mbedtls,PRIORITY,optional) + @$(call install_fixup, mbedtls,SECTION,base) + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, mbedtls,DESCRIPTION,missing) + + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) + + @$(call install_finish, mbedtls) + + @$(call touch) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v6 1/4] libssh2: version bump 1.8.1 -> 1.9.0
The current release 1.9.0 includes commit [1] that fixes the choice of the TLS
library. This allows the following PTXdist commit to introduce mbed TLS as an
alternative to OpenSSL without having to fear that libssh2 is now erroneously
built against the former.
[1] e70e71a3b18b ("configure.ac: Add --with-crypto= instead of many different
--with-$backend")
Signed-off-by: Ulrich Ölmann
---
rules/libssh2.make | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/rules/libssh2.make b/rules/libssh2.make
index 205d1a9c74b4..51c5c4e55df9 100644
--- a/rules/libssh2.make
+++ b/rules/libssh2.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSSH2) += libssh2
#
# Paths and names
#
-LIBSSH2_VERSION:= 1.8.1
-LIBSSH2_MD5:= 338f36a8bb7f5ef55715ac1864cc788c
+LIBSSH2_VERSION:= 1.9.0
+LIBSSH2_MD5:= 1beefafe8963982adc84b408b2959927
LIBSSH2:= libssh2-$(LIBSSH2_VERSION)
LIBSSH2_SUFFIX := tar.gz
LIBSSH2_URL:= http://www.libssh2.org/download/$(LIBSSH2).$(LIBSSH2_SUFFIX)
@@ -43,9 +43,8 @@ LIBSSH2_AUTOCONF := \
--enable-debug \
--enable-hidden-symbols \
--enable-examples-build \
- --with-openssl \
- --without-wincng \
- --without-mbedtls \
+ --disable-werror \
+ --with-crypto=openssl \
--with-libz \
--with-libssl-prefix=$(SYSROOT)/usr \
--with-libz-prefix=$(SYSROOT)/usr
--
2.25.1
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Mon, Feb 17 2020 at 11:32 +0100, Michael Olbrich wrote: > On Mon, Feb 17, 2020 at 10:50:12AM +0100, Roland Hieber wrote: >> On Fri, Feb 14, 2020 at 01:50:23PM +0100, Michael Olbrich wrote: >> > On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote: >> >> [...] >> >> > > diff --git a/rules/open62541.make b/rules/open62541.make >> > > new file mode 100644 >> > > index ..62e030ed3752 >> > > --- /dev/null >> > > +++ b/rules/open62541.make >> > > @@ -0,0 +1,140 @@ >> > > +# -*-makefile-*- >> > > +# >> > > +# Copyright (C) 2018 by Robert Schwebel >> > > +# Copyright (C) 2019 by Bjoern Esser >> > > +# >> > > +# 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_OPEN62541) += open62541 >> > > + >> > > +# >> > > +# Paths and names >> > > +# >> > > +OPEN62541_VERSION := 1.0 >> > > +OPEN62541_MD5 := b8e02d7310e8b48faf52efc539fa9496 >> > > +OPEN62541 := open62541-$(OPEN62541_VERSION) >> > > +OPEN62541_SUFFIX:= tar.gz >> > > +OPEN62541_URL := >> > > https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) >> > > +OPEN62541_SOURCE:= >> > > $(SRCDIR)/$(OPEN62541).$(OPEN62541_SUFFIX) >> > > +OPEN62541_DIR := $(BUILDDIR)/$(OPEN62541) >> > > +OPEN62541_LICENSE := MPL-2.0 >> > > +OPEN62541_LICENSE_FILES := >> > > file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad >> > > + >> > > +OPEN62541_MDNSD_VERSION := >> > > 4bd993e0fdd06d54c8fd0b8f416cda6a8db18585 >> > > +OPEN62541_MDNSD_MD5 := 0961fc8dc253753ec8ea157104671498 >> > > +OPEN62541_MDNSD_URL := >> > > https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz >> > > +OPEN62541_MDNSD_SOURCE := >> > > $(SRCDIR)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz >> > >> > The suffix deserves a separate variable. >> >> I'm curious why, is it used by anything other than the URL? > > Well, having a _VERSION makes the diff for updates easier to read. > _SOURCE and _URL and _MD5 are always needed. > And now that I look closer, OPEN62541_MDNSD should be set as well. This and > _SUFFIX make it clearer that _SOURCE and URL are in sync. Done in the next iteration of the series. Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Fri, Feb 14 2020 at 13:50 +0100, Michael Olbrich wrote: > On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote: >> From: Björn Esser >> >> The open62541 project is an open source implementation of the OPC UA >> communication infrastructure which is used in industrial control. >> >> Signed-off-by: Björn Esser >> [uol: adjusted commit message] >> Signed-off-by: Ulrich Ölmann >> --- >> v2 --> v3: adjusted commit message >> >> [...] >> >> diff --git a/rules/open62541.make b/rules/open62541.make >> new file mode 100644 >> index ..62e030ed3752 >> --- /dev/null >> +++ b/rules/open62541.make >> @@ -0,0 +1,140 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2018 by Robert Schwebel >> +# Copyright (C) 2019 by Bjoern Esser >> +# >> +# 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_OPEN62541) += open62541 >> + >> +# >> +# Paths and names >> +# >> +OPEN62541_VERSION := 1.0 >> +OPEN62541_MD5 := b8e02d7310e8b48faf52efc539fa9496 >> +OPEN62541 := open62541-$(OPEN62541_VERSION) >> +OPEN62541_SUFFIX:= tar.gz >> +OPEN62541_URL := >> https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) >> +OPEN62541_SOURCE:= $(SRCDIR)/$(OPEN62541).$(OPEN62541_SUFFIX) >> +OPEN62541_DIR := $(BUILDDIR)/$(OPEN62541) >> +OPEN62541_LICENSE := MPL-2.0 >> +OPEN62541_LICENSE_FILES := >> file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad >> + >> +OPEN62541_MDNSD_VERSION := >> 4bd993e0fdd06d54c8fd0b8f416cda6a8db18585 >> +OPEN62541_MDNSD_MD5 := 0961fc8dc253753ec8ea157104671498 >> +OPEN62541_MDNSD_URL := >> https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz >> +OPEN62541_MDNSD_SOURCE := >> $(SRCDIR)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > The suffix deserves a separate variable. Okay. >> +$(OPEN62541_MDNSD_SOURCE) := OPEN62541_MDNSD >> +OPEN62541_MDNSD_DIR := $(OPEN62541_DIR)/deps/mdnsd >> +OPEN62541_MDNSD_LICENSE := BSD-3-Clause >> +OPEN62541_MDNSD_LICENSE_FILES := >> file://LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0 >> + >> +# open62541-mdnsd needs the source dir. >> +OPEN62541_DEVPKG:= NO > > Right now open62541-mdnsd is part of the same package, so the comment > makes no sense. Removed in the next iteration of the series. Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Sat, Feb 15 2020 at 10:58 +0100, Michael Olbrich wrote: > On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote: >> From: Björn Esser >> >> The open62541 project is an open source implementation of the OPC UA >> communication infrastructure which is used in industrial control. >> >> Signed-off-by: Björn Esser >> [uol: adjusted commit message] >> Signed-off-by: Ulrich Ölmann >> --- >> v2 --> v3: adjusted commit message >> >> [...] >> >> diff --git a/rules/host-open62541.in b/rules/host-open62541.in >> new file mode 100644 >> index ..8a432080ed34 >> --- /dev/null >> +++ b/rules/host-open62541.in >> @@ -0,0 +1,6 @@ >> +## SECTION=hosttools_noprompt >> + >> +config HOST_OPEN62541 >> +tristate >> +select HOST_CMAKE >> +select HOST_UA_NODESET > > needs > select HOST_SYSTEM_PYTHON3 > > with ptxdist master. Added in the next iteration of the series. Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 1/3] mbedtls: new package
On Mon, Feb 17 2020 at 10:39 +0100, Michael Olbrich wrote: > On Wed, Feb 05, 2020 at 11:42:39AM +0100, Ulrich Ölmann wrote: >> From: Björn Esser >> >> mbed TLS (formerly known as PolarSSL) makes it trivially easy >> for developers to include cryptographic and SSL/TLS capabilities >> in their (embedded) products, facilitating this functionality >> with a minimal coding footprint. >> >> Unfortunately the upcoming open62541 package cannot be built >> against OpenSSL. To enable its SSL functionality mbed TLS is >> needed. >> >> Signed-off-by: Björn Esser >> [uol: adjusted commit message] >> Signed-off-by: Ulrich Ölmann >> --- >> v2 --> v3: adjusted commit message > > Not your fault, but needs to be fixed: > > libssh2 now uses /usr/lib/libmbedcrypto.so.3 without depending on it :-/ Fixed in the next iteration of the series (to be sent in a few minutes) by a version bump to a fixed release of libssh2. Best regards Ulrich > Michael > >> >> rules/mbedtls.in | 13 + >> rules/mbedtls.make | 66 ++ >> 2 files changed, 79 insertions(+) >> create mode 100644 rules/mbedtls.in >> create mode 100644 rules/mbedtls.make >> >> diff --git a/rules/mbedtls.in b/rules/mbedtls.in >> new file mode 100644 >> index ..a0d58dbd5468 >> --- /dev/null >> +++ b/rules/mbedtls.in >> @@ -0,0 +1,13 @@ >> +## SECTION=system_libraries >> + >> +config MBEDTLS >> +tristate >> +prompt "mbedtls" >> +select HOST_CMAKE >> +select LIBC_PTHREAD >> +select ZLIB >> +help >> + mbed TLS (formerly known as PolarSSL) makes it trivially easy >> + for developers to include cryptographic and SSL/TLS capabilities >> + in their (embedded) products, facilitating this functionality >> + with a minimal coding footprint. >> diff --git a/rules/mbedtls.make b/rules/mbedtls.make >> new file mode 100644 >> index ..0086492fc029 >> --- /dev/null >> +++ b/rules/mbedtls.make >> @@ -0,0 +1,66 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2019 by Bjoern Esser >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +# >> +# We provide this package >> +# >> +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls >> + >> +# >> +# Paths and names >> +# >> +MBEDTLS_VERSION := 2.16.3 >> +MBEDTLS_MD5 := 90ce7c7a001d2514410280706b3ab1a7 >> +MBEDTLS := mbedtls-$(MBEDTLS_VERSION) >> +MBEDTLS_SUFFIX := tgz >> +MBEDTLS_URL := >> https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) >> +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) >> +MBEDTLS_DIR := $(BUILDDIR)/$(MBEDTLS) >> +MBEDTLS_LICENSE := Apache-2.0 >> +MBEDTLS_LICENSE_FILES := >> file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 >> + >> +# >> >> +# Prepare >> +# >> >> + >> +# >> +# cmake >> +# >> +MBEDTLS_CONF_TOOL := cmake >> +MBEDTLS_CONF_OPT:= \ >> +$(CROSS_CMAKE_USR) \ >> +-DENABLE_PROGRAMS=OFF \ >> +-DENABLE_TESTING=OFF \ >> +-DENABLE_ZLIB_SUPPORT=ON \ >> +-DINSTALL_MBEDTLS_HEADERS=ON \ >> +-DLINK_WITH_PTHREAD=ON \ >> +-DUNSAFE_BUILD=OFF \ >> +-DUSE_PKCS11_HELPER_LIBRARY=OFF \ >> +-DUSE_SHARED_MBEDTLS_LIBRARY=ON \ >> +-DUSE_STATIC_MBEDTLS_LIBRARY=OFF >> + >> +# >> >> +# Target-Install >> +# >> >> + >> +$(STATEDIR)/mbedtls.targetinstall: >> +@$(call targetinfo) >> + >> +@$(call install_init, mbedtls) >> +@$(call install_fixup, mbedtls,PRIORITY,optional) >> +@$(call install_fixup, mbedtls,SECTION,base) >> +@$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser >> ") >> +@$(call install_fixup, mbedtls,DESCRIPTION,missing) >> + >> +@$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) >> +@$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) >> +@$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) >> + >> +@$(call install_finish, mbedtls) >> + >> +@$(call touch) >> -- >> 2.25.0 >> >> >> ___ >> ptxdist mailing list >> ptxdist@pengutronix.de -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] networkmanager: version bump 1.20.8-> 1.22.6
On Fri, Feb 14 2020 at 09:36 +0100, Michael Olbrich wrote: > On Wed, Feb 12, 2020 at 09:30:29PM +0100, Uwe Kleine-König wrote: >> On Wed, Feb 12, 2020 at 11:11:12AM +0100, Ulrich Ölmann wrote: >> > Two new config options have been added in the meantime (see NetworkManager >> > commits [1] & [2]) which are both set to their reasonable default values. >> > >> > The license did not change, but its text was adjusted - citing from >> > NetworkManagers's commit [3]: >> > >> > The update to the GPL text is purely cosmetic. However, shipping the >> > exact >> > same file as GNU publishes may help distros that deduplicate the license >> > texts >> > or hardlink duplicates. >> > >> > [1] >> > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/69f048bf0ca387d2dc4683cfdfe9d170bfceb52b >> > [2] >> > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/d27fcd07541ae6f524115d5b0f36e14673135ca3 >> > [3] >> > https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/e9f2ea6c22f36cb7986d2228763629ed44b9e76b >> > >> > Signed-off-by: Ulrich Ölmann >> > --- >> > rules/networkmanager.make | 10 ++ >> > 1 file changed, 6 insertions(+), 4 deletions(-) >> > >> > diff --git a/rules/networkmanager.make b/rules/networkmanager.make >> > index de0e755b3a5d..86542b6f74e1 100644 >> > --- a/rules/networkmanager.make >> > +++ b/rules/networkmanager.make >> > @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager >> > # >> > # Paths and names >> > # >> > -NETWORKMANAGER_VERSION:= 1.20.8 >> > -NETWORKMANAGER_MD5:= c0ceb5ab14bfdfeee07536d94cc5c548 >> > +NETWORKMANAGER_VERSION:= 1.22.6 >> > +NETWORKMANAGER_MD5:= 0f4b493cc0c67f94a2ad3573363eb3b2 >> > NETWORKMANAGER:= NetworkManager-$(NETWORKMANAGER_VERSION) >> > NETWORKMANAGER_SUFFIX := tar.xz >> > -NETWORKMANAGER_URL:= >> > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) >> > +NETWORKMANAGER_URL:= >> > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.22/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) >> >> I wonder if it would make sense to use some make magic to derive the >> directory name (1.22) from NETWORKMANAGER_VERSION. >> >> Hmm, this is more complicated than I thought, the following works: >> >> EMPTY = >> SPACE = $(EMPTY) $(EMPTY) >> NETWORKMANAGER_MAJOR := $(subst $(SPACE),.,$(wordlist 1, 2, $(subst ., >> ,$(NETWORKMANAGER_VERSION >> >> or >> >> NETWORKMANAGER_V1 = $(word 1, $(subst ., ,$(NETWORKMANAGER_VERSION))) >> NETWORKMANAGER_V2 = $(word 2, $(subst ., ,$(NETWORKMANAGER_VERSION))) >> NETWORKMANAGER_MAJOR = $(NETWORKMANAGER_V1).$(NETWORKMANAGER_V2) >> >> Unless someone can come up with something easier, probably not worth the >> effort? > > There is a much simpler way to do this: > > NETWORKMANAGER_URL := > https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename > $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) Just sent an implicit v2 bumping NetworkManager's version up to 1.22.8 which has been released yesterday. Ulrich > We already use this in several other packages. This does not work when a > '0' for the patchlevel version is omitted but that's not the case here. > > Michael -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] networkmanager: version bump 1.20.8-> 1.22.6
Two new config options have been added in the meantime (see NetworkManager commits [1] & [2]) which are both set to their reasonable default values. The license did not change, but its text was adjusted - citing from NetworkManagers's commit [3]: The update to the GPL text is purely cosmetic. However, shipping the exact same file as GNU publishes may help distros that deduplicate the license texts or hardlink duplicates. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/69f048bf0ca387d2dc4683cfdfe9d170bfceb52b [2] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/d27fcd07541ae6f524115d5b0f36e14673135ca3 [3] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/e9f2ea6c22f36cb7986d2228763629ed44b9e76b Signed-off-by: Ulrich Ölmann --- rules/networkmanager.make | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index de0e755b3a5d..86542b6f74e1 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.20.8 -NETWORKMANAGER_MD5 := c0ceb5ab14bfdfeee07536d94cc5c548 +NETWORKMANAGER_VERSION := 1.22.6 +NETWORKMANAGER_MD5 := 0f4b493cc0c67f94a2ad3573363eb3b2 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.22/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later -NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=cbbffd568227ada506640fe950a4823b +NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # # Prepare @@ -67,9 +67,11 @@ NETWORKMANAGER_CONF_OPT = \ -Dnetconfig=false \ -Dnmcli=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMCLI) \ -Dnmtui=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMTUI) \ + -Dnm_cloud_setup=false \ -Dofono=false \ -Dovs=false \ -Dpolkit=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_POLKIT) \ + -Dconfig_auth_polkit_default=default \ -Dpolkit_agent=false \ -Dppp=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_PPP) \ -Dpppd=/usr/sbin/pppd \ -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v5 2/3] host-ua-nodeset: new package
From: Björn Esser The OPC Foundation's UA NodeSets and other normative files which are released with an OPC UA specification (for details see [1]). Needed to build open62541. [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files Signed-off-by: Björn Esser [uol: adjusted commit message and Kconfig menu file, wrapped mkdir/cp into world/execute and execute] Signed-off-by: Ulrich Ölmann --- v1 --> v2: adjusted commit message and Kconfig menu file's help text v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t v3 --> v4: adjusted commit message and added default y in Kconfig menu file v4 --> v5: adjusted commit message and re-replaced install -D -t by mkdir/cp wrapped into world/execute and execute rules/host-ua-nodeset.in | 11 + rules/host-ua-nodeset.make | 46 ++ 2 files changed, 57 insertions(+) create mode 100644 rules/host-ua-nodeset.in create mode 100644 rules/host-ua-nodeset.make diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in new file mode 100644 index ..ba10ae26c36c --- /dev/null +++ b/rules/host-ua-nodeset.in @@ -0,0 +1,11 @@ +## SECTION=hosttools_noprompt + +config HOST_UA_NODESET + tristate + default y if ALLYES + help + The OPC Foundation's UA NodeSets and other normative files which are + released with an OPC UA specification (for details see [1]). Needed to + build open62541. + + [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make new file mode 100644 index ..172dafbf3a68 --- /dev/null +++ b/rules/host-ua-nodeset.make @@ -0,0 +1,46 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset + +# +# Paths and names +# +HOST_UA_NODESET_VERSION:= 1.04.4-2020-01-08 +HOST_UA_NODESET_MD5:= ce7b39c7f2d65617f76e0301f654a9ea +HOST_UA_NODESET:= ua-nodeset-$(HOST_UA_NODESET_VERSION) +HOST_UA_NODESET_SUFFIX := tar.gz +HOST_UA_NODESET_URL:= https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_SOURCE := $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_DIR:= $(HOST_BUILDDIR)/$(HOST_UA_NODESET) + +# +# Compile +# + +$(STATEDIR)/host-ua-nodeset.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-ua-nodeset.install: + @$(call targetinfo) + + @$(call world/execute, HOST_UA_NODESET, \ + mkdir -p $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset) + @$(call execute, HOST_UA_NODESET, \ + cp -a $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ + $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v5 1/3] mbedtls: new package
From: Björn Esser mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint. Unfortunately the upcoming open62541 package cannot be built against OpenSSL. To enable its SSL functionality mbed TLS is needed. Signed-off-by: Björn Esser [uol: adjusted commit message] Signed-off-by: Ulrich Ölmann --- v2 --> v3: adjusted commit message rules/mbedtls.in | 13 + rules/mbedtls.make | 66 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/mbedtls.in create mode 100644 rules/mbedtls.make diff --git a/rules/mbedtls.in b/rules/mbedtls.in new file mode 100644 index ..a0d58dbd5468 --- /dev/null +++ b/rules/mbedtls.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config MBEDTLS + tristate + prompt "mbedtls" + select HOST_CMAKE + select LIBC_PTHREAD + select ZLIB + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS capabilities + in their (embedded) products, facilitating this functionality + with a minimal coding footprint. diff --git a/rules/mbedtls.make b/rules/mbedtls.make new file mode 100644 index ..0086492fc029 --- /dev/null +++ b/rules/mbedtls.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls + +# +# Paths and names +# +MBEDTLS_VERSION:= 2.16.3 +MBEDTLS_MD5:= 90ce7c7a001d2514410280706b3ab1a7 +MBEDTLS:= mbedtls-$(MBEDTLS_VERSION) +MBEDTLS_SUFFIX := tgz +MBEDTLS_URL:= https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) +MBEDTLS_DIR:= $(BUILDDIR)/$(MBEDTLS) +MBEDTLS_LICENSE:= Apache-2.0 +MBEDTLS_LICENSE_FILES := file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +# +# cmake +# +MBEDTLS_CONF_TOOL := cmake +MBEDTLS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DLINK_WITH_PTHREAD=ON \ + -DUNSAFE_BUILD=OFF \ + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF + +# +# Target-Install +# + +$(STATEDIR)/mbedtls.targetinstall: + @$(call targetinfo) + + @$(call install_init, mbedtls) + @$(call install_fixup, mbedtls,PRIORITY,optional) + @$(call install_fixup, mbedtls,SECTION,base) + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, mbedtls,DESCRIPTION,missing) + + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) + + @$(call install_finish, mbedtls) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v5 3/3] open62541: new package
From: Björn Esser
The open62541 project is an open source implementation of the OPC UA
communication infrastructure which is used in industrial control.
Signed-off-by: Björn Esser
[uol: adjusted commit message]
Signed-off-by: Ulrich Ölmann
---
v2 --> v3: adjusted commit message
...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
patches/open62541-1.0/series | 4 +
rules/host-open62541.in | 6 +
rules/host-open62541.make | 50
rules/open62541.in| 13 +
rules/open62541.make | 140 +++
6 files changed, 437 insertions(+)
create mode 100644
patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
create mode 100644 patches/open62541-1.0/series
create mode 100644 rules/host-open62541.in
create mode 100644 rules/host-open62541.make
create mode 100644 rules/open62541.in
create mode 100644 rules/open62541.make
diff --git
a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
new file mode 100644
index ..0dfd003518ed
--- /dev/null
+++
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
@@ -0,0 +1,224 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 2 Dec 2019 14:38:38 +0100
+Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This makes it easier for developers to keep all ua-nodesets XML
+definitions in a common location.
+
+Backported from: https://github.com/open62541/open62541/pull/3310
+
+Signed-off-by: Björn Esser
+---
+ CMakeLists.txt| 14 +-
+ doc/nodeset_compiler.rst | 22 +++---
+ examples/CMakeLists.txt | 4
+ examples/nodeset/CMakeLists.txt | 6 +++---
+ tests/nodeset-compiler/CMakeLists.txt | 14 +++---
+ tools/cmake/macros_public.cmake | 2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d426e1da66fe..fbbafd8f2791 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -15,7 +15,6 @@ include(GNUInstallDirs)
+
+ # Set when installed via make install
+ set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
+-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+
+ include(macros_internal)
+ include(macros_public)
+@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
(uses mbedTLS)" OFF)
+ option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
Device Server Profile" OFF)
+ option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
+
++if(NOT UA_NODESET_DIR)
++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
++endif()
++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
++
+ # Namespace Zero
+ set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
namespace zero (minimal/reduced/full)")
+ SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
"FULL")
+@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
+
+ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ if(NOT UA_FILE_NS0)
+-set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+ endif()
+ set(UA_FILE_NODESETS "${UA_FILE_NS0}")
+
+@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ endif()
+
+
+-set(UA_FILE_NODEIDS
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
+-set(UA_FILE_STATUSCODES
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
+-set(UA_FILE_TYPES_BSD
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+ else()
+ if(NOT UA_FILE_NS0)
+ set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
+diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
+index dd752ccd70a9..34fc8f800480 100644
+--- a/doc/nodeset_compiler.rst
b/doc/nodeset_compiler.rst
+@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen``
nodesets::
+ # Generate types and namespace for DI
+ ua_generate_nodeset_and_datatypes(
+ NAME "di"
+-FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv"
+-FILE_BSD
"${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd"
++FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDi
Re: [ptxdist] [PATCH v4 2/3] host-ua-nodeset: new package
On Sat, Feb 01 2020 at 10:58 +0100, Ulrich Ölmann wrote: > From: Björn Esser > > The OPC Foundation's UA NodeSets and other normative files which are released > with an OPC UA specification (for details see [1]). Needed to build open62541. > > [1] > https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files > > Signed-off-by: Björn Esser > [uol: adjusted commit message and Kconfig menu file, replaced mkdir/cp by > install -D -t] > Signed-off-by: Ulrich Ölmann > --- > v1 --> v2: adjusted commit message and Kconfig menu file's help text > v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t > v3 --> v4: adjusted commit message and added default y in Kconfig menu file > > rules/host-ua-nodeset.in | 11 ++ > rules/host-ua-nodeset.make | 44 ++ > 2 files changed, 55 insertions(+) > create mode 100644 rules/host-ua-nodeset.in > create mode 100644 rules/host-ua-nodeset.make > > diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in > new file mode 100644 > index ..ba10ae26c36c > --- /dev/null > +++ b/rules/host-ua-nodeset.in > @@ -0,0 +1,11 @@ > +## SECTION=hosttools_noprompt > + > +config HOST_UA_NODESET > + tristate > + default y if ALLYES > + help > + The OPC Foundation's UA NodeSets and other normative files which are > + released with an OPC UA specification (for details see [1]). Needed to > + build open62541. > + > + [1] > https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files > diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make > new file mode 100644 > index ..5bc3da18f48e > --- /dev/null > +++ b/rules/host-ua-nodeset.make > @@ -0,0 +1,44 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Bjoern Esser > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset > + > +# > +# Paths and names > +# > +HOST_UA_NODESET_VERSION := 1.04.4-2020-01-08 > +HOST_UA_NODESET_MD5 := ce7b39c7f2d65617f76e0301f654a9ea > +HOST_UA_NODESET := ua-nodeset-$(HOST_UA_NODESET_VERSION) > +HOST_UA_NODESET_SUFFIX := tar.gz > +HOST_UA_NODESET_URL := > https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) > +HOST_UA_NODESET_SOURCE := > $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) > +HOST_UA_NODESET_DIR := $(HOST_BUILDDIR)/$(HOST_UA_NODESET) > + > +# > > +# Compile > +# > > + > +$(STATEDIR)/host-ua-nodeset.compile: > + @$(call targetinfo) > + @$(call touch) > + > +# > > +# Install > +# > > + > +$(STATEDIR)/host-ua-nodeset.install: > + @$(call targetinfo) > + > + @$(call world/execute, HOST_UA_NODESET, \ > + install -vD -t $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset \ > + $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/*) Need to revert v2 --> v3 and instead wrap the mkdir/cp combination into a call of world/execute and execute respectively as we have a directory hierarchy to copy here. Will send a v5 of this series! Ulrich > + > + @$(call touch) -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v5 2/3] host-yarn: new package
From: Björn Esser Fast, reliable, and secure dependency management for Node.js. We use Yarn to generate an offline cache and a lock-file to be able to install all needed Node.js-packages reproducibly. This works even in environments without internet-connectivity, as long as the cache and the lock-file are in reach. Signed-off-by: Björn Esser [uol: adjusted commit message, dropped CREDIT line & wrapped install into call of world/execute] Signed-off-by: Ulrich Ölmann --- v3 --> v4: adjusted commit message Range-diff of v5 against v4: 2: c78fde2a6233 ! 2: 8b898ee41bae host-yarn: new package @@ Commit message reach. Signed-off-by: Björn Esser -[uol: adjusted commit message] +[uol: adjusted commit message, dropped CREDIT line & wrapped install into call +of world/execute] Signed-off-by: Ulrich Ölmann ## rules/host-yarn.in (new) ## @@ rules/host-yarn.make (new) +# +# Copyright (C) 2017 by Juergen Borleis +# -+# 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. +# @@ rules/host-yarn.make (new) + +$(STATEDIR)/host-yarn.install: + @$(call targetinfo) -+ @install -pm 0755 $(HOST_YARN_SOURCE) $(PTXDIST_SYSROOT_HOST)/bin/yarn ++ @$(call world/execute, HOST_YARN, \ ++ install -vDm 0755 $(HOST_YARN_SOURCE) \ ++ $(HOST_YARN_PKGDIR)/bin/yarn) + @$(call touch) + +# vim: syntax=make rules/host-yarn.in | 6 + rules/host-yarn.make | 61 2 files changed, 67 insertions(+) create mode 100644 rules/host-yarn.in create mode 100644 rules/host-yarn.make diff --git a/rules/host-yarn.in b/rules/host-yarn.in new file mode 100644 index ..d98dd6c34620 --- /dev/null +++ b/rules/host-yarn.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_YARN + tristate + default y if ALLYES + select HOST_NODEJS diff --git a/rules/host-yarn.make b/rules/host-yarn.make new file mode 100644 index ..16e04c05aee8 --- /dev/null +++ b/rules/host-yarn.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Juergen Borleis +# +# For further information about the PTXdist project and license conditions +# see the README file. +# +# 2019-May-05, Daniel Arnold, Updated to yarn 1.15.2 +# 2020-January-09, Björn Esser, Updated to yarn 1.21.1 + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_YARN) += host-yarn + +# +# Paths and names +# +HOST_YARN_VERSION := 1.21.1 +HOST_YARN_MD5 := cf49e663e0f56aa15f1740c77354ebe2 +HOST_YARN := yarn-$(HOST_YARN_VERSION) +HOST_YARN_SUFFIX := js +HOST_YARN_URL := https://github.com/yarnpkg/yarn/releases/download/v$(HOST_YARN_VERSION)/$(HOST_YARN).$(HOST_YARN_SUFFIX) +HOST_YARN_SOURCE := $(SRCDIR)/$(HOST_YARN).$(HOST_YARN_SUFFIX) + +# +# Extract (nothing to be done here) +# + +$(STATEDIR)/host-yarn.extract: + @$(call targetinfo) + @$(call touch) + +# +# Prepare (nothing to be done here) +# + +$(STATEDIR)/host-yarn.prepare: + @$(call targetinfo) + @$(call touch) + +# +# Compile (nothing to be done here) +# + +$(STATEDIR)/host-yarn.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-yarn.install: + @$(call targetinfo) + @$(call world/execute, HOST_YARN, \ + install -vDm 0755 $(HOST_YARN_SOURCE) \ + $(HOST_YARN_PKGDIR)/bin/yarn) + @$(call touch) + +# vim: syntax=make -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v5 3/3] nodejs_packages: new package
From: Björn Esser This is a dummy package to specify and install required Node.js packages for the target system. The management of those packages and their dependencies is handled with Yarn (run through host-nodejs) to maintain a reproducible offline cache that is stored in local_src/nodejs_packages. Signed-off-by: Björn Esser [uol: adjusted commit message and Kconfig menu file's help texts, integrated Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL, removed one square bracket in a shell test and wrapped install/cp into call of execute and world/execute] Signed-off-by: Ulrich Ölmann --- v3 --> v4: adjusted commit message and Kconfig menu file's help texts & fixed NODEJS_PACKAGES_URL Range-diff of v5 against v4: 3: ccd2b44a8d92 ! 3: 1a73ebbd6e7e nodejs_packages: new package @@ Commit message stored in local_src/nodejs_packages. Signed-off-by: Björn Esser -[uol: adjusted commit message and Kconfig menu file's help texts & fixed -NODEJS_PACKAGES_URL] +[uol: adjusted commit message and Kconfig menu file's help texts, integrated +Kconfig symbol NODEJS_PACKAGES_LICENSE, fixed NODEJS_PACKAGES_URL, removed one +square bracket in a shell test and wrapped install/cp into call of execute and +world/execute] Signed-off-by: Ulrich Ölmann ## rules/nodejs_packages.in (new) ## @@ rules/nodejs_packages.in (new) + +[1] https://legacy.yarnpkg.com/en/docs/dependency-versions/ + ++config NODEJS_PACKAGES_LICENSE ++ string ++ prompt "Licenses of to be installed Node.js packages" ++ default "unknown" ++ help ++Manually compiled list of licenses that the to be installed Node.js ++packages are distributed under, see description of the variable ++*_LICENSE in [1]. ++ ++ATTENTION: be aware of the fact that Node.js packages usually depend ++on additional Node.js packages that Yarn installs as well and that ++this propagates recursively resulting in an unknown number of Node.js ++packages on the target with an unknown set of licenses that they may ++be utilized under. Hence you carefully need to examine all of them ++individually to create a reliable list of licenses. ++ ++[1] https://www.ptxdist.org/doc/dev_manual.html#some-notes-about-licenses ++ +config NODEJS_PACKAGES_OFFLINE + bool -+ prompt "lock offline cache for offline/production use" ++ prompt "Lock offline cache for offline/production use" + help -+This option locks the offline cache for installing the nodejs packages -+and allows their installation during the build of the BSP without any -+need for internet connectivity. ++This option locks the offline cache for installing the Node.js ++packages and allows their installation during the build of the BSP ++without any need for internet connectivity. + +Enabling this option is highly recommended for production use. + @@ rules/nodejs_packages.make (new) +NODEJS_PACKAGES_URL := lndir://$(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL) +NODEJS_PACKAGES_DIR := $(BUILDDIR)/$(NODEJS_PACKAGES) +NODEJS_PACKAGES_CACHE := $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn_cache -+NODEJS_PACKAGES_LICENSE := unknown ++NODEJS_PACKAGES_LICENSE := $(call remove_quotes, $(PTXCONF_NODEJS_PACKAGES_LICENSE)) + +NODEJS_PACKAGES_LIST := $(call remove_quotes, $(PTXCONF_NODEJS_PACKAGES_LIST)) + @@ rules/nodejs_packages.make (new) + \"license\": \"UNLICENSED\", \ + \"private\": true \ + }" > $(NODEJS_PACKAGES_DIR)/package.json -+ if [[ ! -f $(YARN_LOCK) ]]; then \ ++ if [ ! -f $(YARN_LOCK) ]; then \ + touch $(YARN_LOCK); \ + ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \ + fi @@ rules/nodejs_packages.make (new) + +$(STATEDIR)/nodejs_packages.install: + @$(call targetinfo) -+ install -dm 0755 $(NODEJS_PACKAGES_PKGDIR)/usr/lib -+ cp -pr $(NODEJS_PACKAGES_DIR)/node_modules $(NODEJS_PACKAGES_PKGDIR)/usr/lib ++ @$(call world/execute, HOST_UA_NODESET, \ ++ install -dm 0755 $(NODEJS_PACKAGES_PKGDIR)/usr/lib) ++ @$(call execute, HOST_UA_NODESET, \ ++ cp -pr $(NODEJS_PACKAGES_DIR)/node_modules \ ++ $(NODEJS_PACKAGES_PKGDIR)/usr/lib) + @$(call touch) + +# rules/nodejs_packages.in | 73 ++ rules/nodejs_packages.make | 93 ++ 2 files changed, 166 insertions(+) create mode 100644 rules/nodejs_packages.in cre
[ptxdist] [PATCH v5 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
From: Björn Esser We also need to build a host-nodejs package first, as there are some tools needed to be executable on the host system during the intermediate cross-build process. This package drops support for NPM, as we will be managing Node.js packages with Yarn, which will be implemented in the following commits. The patches that are shipped along with this version of the package have been taken from the SRPM of the Node.js-package in Fedora. See: https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master Signed-off-by: Björn Esser [uol: adjusted commit message, dropped CREDIT lines, removed shell usage & inserted line break in build command] Signed-off-by: Ulrich Ölmann --- v1 --> v2: fix configure flags for host-nodejs v2 --> v3: add missing patches, remove obsolete patches Range-diff of v5 against v4: 1: e08d21cc0be1 ! 1: 440fed72eaf9 nodejs: version bump 6.9.5 -> 12.14.1 LTS @@ Commit message https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master Signed-off-by: Björn Esser +[uol: adjusted commit message, dropped CREDIT lines, removed shell usage & +inserted line break in build command] + Signed-off-by: Ulrich Ölmann ## patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch (new) ## @@ @@ rules/host-nodejs.make # # Copyright (C) 2015 by Michael Grzeschik +# Copyright (C) 2019 by Björn Esser -+# -+# 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. @@ rules/nodejs.make # # Copyright (C) 2015 by Michael Grzeschik +# Copyright (C) 2019 by Björn Esser -+# -+# 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. @@ rules/nodejs.make: NODEJS_ARM_FLOAT_ABI = $(shell ptxd_cross_cc_v | sed -n "s/CO +# # to the pre-built host tool binaries, which are different for +# # each individual checkout of a BSP. -_- + $(foreach f,$(NODEJS_HOST_TOOLS), \ -+ $(shell sed -i -e "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" $(NODEJS_DIR)/node.gyp $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp) \ -+ ) ++ sed -i -e "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" \ ++ $(NODEJS_DIR)/node.gyp $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp $(ptx/nl)) + + @$(call world/prepare, NODEJS) + ...1-Disable-running-gyp-on-shared-deps.patch | 25 ...Install-both-binaries-and-use-libdir.patch | 83 patches/node-v12.14.1/series | 5 + ...build-from-source-option-to-npmunbox.patch | 31 - patches/npmbox-2.6.1/series | 4 - rules/host-nodejs.in | 2 + rules/host-nodejs.make| 39 +++--- rules/nodejs.in | 54 ++-- rules/nodejs.make | 119 ++ 9 files changed, 185 insertions(+), 177 deletions(-) create mode 100644 patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch create mode 100644 patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch create mode 100644 patches/node-v12.14.1/series delete mode 100644 patches/npmbox-2.6.1/0001-npmbox-add-build-from-source-option-to-npmunbox.patch delete mode 100644 patches/npmbox-2.6.1/series diff --git a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch b/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch new file mode 100644 index ..58d46a8f4167 --- /dev/null +++ b/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch @@ -0,0 +1,25 @@ +From: Zuzana Svetlikova +Date: Thu, 27 Apr 2017 14:25:42 +0200 +Subject: [PATCH] Disable running gyp on shared deps + +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 56f53582d1f4..2fb80e742637 100644 +--- a/Makefile b/Makefile +@@ -141,9 +141,9 @@ test-code-cache: with-code-cache + echo "'test-code-cache' target is a noop" + + out/Makefile: config.gypi common.gypi node.gyp \ +- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ +- tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ +- tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp ++ deps/http_parser/http_parser.gyp \ ++ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ ++ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp + $(PYTHON) tools/gyp_node.py -f make + + # node_
Re: [ptxdist] [PATCH v4 3/3] nodejs_packages: new package
On Thu, Jan 30 2020 at 15:22 +0100, Michael Olbrich
wrote:
> On Wed, Jan 29, 2020 at 12:06:19PM +0100, Ulrich Ölmann wrote:
>> From: Björn Esser
>>
>> This is a dummy package to specify and install required Node.js packages for
>> the
>> target system.
>>
>> The management of those packages and their dependencies is handled with
>> Yarn (run through host-nodejs) to maintain a reproducible offline cache that
>> is
>> stored in local_src/nodejs_packages.
>>
>> Signed-off-by: Björn Esser
>> [uol: adjusted commit message and Kconfig menu file's help texts & fixed
>> NODEJS_PACKAGES_URL]
>> Signed-off-by: Ulrich Ölmann
>> ---
>> Range-diff of v4 against v3:
>> 3: 2a6984f0297b ! 3: ccd2b44a8d92 nodejs_packages: New package.
>> @@ Metadata
>> Author: Björn Esser
>>
>> ## Commit message ##
>> -nodejs_packages: New package.
>> +nodejs_packages: new package
>>
>> -This is a dummy package to specifiy and install the required
>> -Node.js packages for the target system.
>> +This is a dummy package to specify and install required Node.js
>> packages for the
>> +target system.
>>
>> -The management of the Node.js packages and their dependencies
>> -are handled with Yarn (run through host-nodejs) to maintain
>> -a reprocible offline cache.
>> -
>> -The cache is stored in local_src/nodejs_packages, which must
>> -be an existing path inside of the BSP.
>> +The management of those packages and their dependencies is handled
>> with
>> +Yarn (run through host-nodejs) to maintain a reproducible offline
>> cache that is
>> +stored in local_src/nodejs_packages.
>>
>> Signed-off-by: Björn Esser
>> +[uol: adjusted commit message and Kconfig menu file's help texts &
>> fixed
>> +NODEJS_PACKAGES_URL]
>> +Signed-off-by: Ulrich Ölmann
>>
>> ## rules/nodejs_packages.in (new) ##
>> @@
>> @@ rules/nodejs_packages.in (new)
>> + Reproducibly install Node.js packages that will be available
>> + system-wide on the target.
>> +
>> -+ You MUST specify at least one Node.js package in the shown
>> -+ submenu after enabling this option.
>> ++ You MUST specify at least one Node.js package in the submenu
>> that is
>> ++ shown after enabling this option.
>> +
>> +
>> +if NODEJS_PACKAGES
>> @@ rules/nodejs_packages.in (new)
>> + string
>> + prompt "Node.js packages to install"
>> + help
>> -+ A white-space separated list of Node.js packages including
>> -+ its version (e.g. express@4.17.x). npm semvers are fully
>> -+ supported.
>> ++ A white-space separated list of Node.js packages including
>> their
>> ++ versions (e.g. express@4.17.x or socket.io@'>=2.1.0
>> <=2.3.0'). NPM
>> ++ semvers are fully supported, see [1].
>> +
>> + The packages are managed with Yarn and are guaranteed to be
>> -+ reproducible and immutable as long as the download location
>> -+ stays accessible or the download-cache does not get altered.
>> ++ reproducible and immutable as long as the download location
>> stays
>> ++ accessible or the offline cache is not altered.
>> ++
>> ++ If the list of Node.js packages to be installed has been
>> populated for
>> ++ the first time or if it has been modified later on one needs
>> to
>> ++ (re-)build this package to download the desired Node.js
>> packages and
>> ++ update the offline cache. Afterwards it is highly recommended
>> to
>> ++ commit the path
>> '${PTXDIST_WORKSPACE}/local_src/nodejs_packages/' into
>> ++ the version control system and to lock the package cache.
>> +
>> -+ After downloading the packages and creating the package cache,
>> -+ by building this package the first time after altering the
>> list
>> -+ of installed packages, it is highly recommended to commit the
>> -+ path: './local_src/nodejs_packages/' into the git repository
>> -+ and to lock the package cache.
>>
Re: [ptxdist] [PATCH v3 2/3] host-ua-nodeset: new package
On Sat, Feb 01 2020 at 10:25 +0100, Ulrich Ölmann wrote: > From: Björn Esser > > The OPC Foundation's UA NodeSets and other normative files which are released > with an OPC UA specification (for details see [1]). Needed to build open62541. > > [1] > https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files > > Signed-off-by: Björn Esser > [uol: adjusted commit message and Kconfig menu file's help text, replaced > mkdir/cp by install -D -t] > Signed-off-by: Ulrich Ölmann > --- > v1 --> v2: adjusted commit message and Kconfig menu file's help text > v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t > > rules/host-ua-nodeset.in | 10 + > rules/host-ua-nodeset.make | 44 ++ > 2 files changed, 54 insertions(+) > create mode 100644 rules/host-ua-nodeset.in > create mode 100644 rules/host-ua-nodeset.make > > diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in > new file mode 100644 > index ..7d47e29feda5 > --- /dev/null > +++ b/rules/host-ua-nodeset.in > @@ -0,0 +1,10 @@ > +## SECTION=hosttools_noprompt > + > +config HOST_UA_NODESET > + tristate Just sent the v4 with the forgotten 'default y'. So ignore this iteration, please! Ulrich > + help > + The OPC Foundation's UA NodeSets and other normative files which are > + released with an OPC UA specification (for details see [1]). Needed to > + build open62541. > + > + [1] > https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files > diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make > new file mode 100644 > index ..5bc3da18f48e > --- /dev/null > +++ b/rules/host-ua-nodeset.make > @@ -0,0 +1,44 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Bjoern Esser > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset > + > +# > +# Paths and names > +# > +HOST_UA_NODESET_VERSION := 1.04.4-2020-01-08 > +HOST_UA_NODESET_MD5 := ce7b39c7f2d65617f76e0301f654a9ea > +HOST_UA_NODESET := ua-nodeset-$(HOST_UA_NODESET_VERSION) > +HOST_UA_NODESET_SUFFIX := tar.gz > +HOST_UA_NODESET_URL := > https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) > +HOST_UA_NODESET_SOURCE := > $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) > +HOST_UA_NODESET_DIR := $(HOST_BUILDDIR)/$(HOST_UA_NODESET) > + > +# > > +# Compile > +# > > + > +$(STATEDIR)/host-ua-nodeset.compile: > + @$(call targetinfo) > + @$(call touch) > + > +# > > +# Install > +# > > + > +$(STATEDIR)/host-ua-nodeset.install: > + @$(call targetinfo) > + > + @$(call world/execute, HOST_UA_NODESET, \ > + install -vD -t $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset \ > + $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/*) > + > + @$(call touch) -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 1/3] mbedtls: new package
From: Björn Esser mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint. Unfortunately the upcoming open62541 package cannot be built against OpenSSL. To enable its SSL functionality mbed TLS is needed. Signed-off-by: Björn Esser [uol: adjusted commit message] Signed-off-by: Ulrich Ölmann --- v2 --> v3: adjusted commit message rules/mbedtls.in | 13 + rules/mbedtls.make | 66 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/mbedtls.in create mode 100644 rules/mbedtls.make diff --git a/rules/mbedtls.in b/rules/mbedtls.in new file mode 100644 index ..a0d58dbd5468 --- /dev/null +++ b/rules/mbedtls.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config MBEDTLS + tristate + prompt "mbedtls" + select HOST_CMAKE + select LIBC_PTHREAD + select ZLIB + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS capabilities + in their (embedded) products, facilitating this functionality + with a minimal coding footprint. diff --git a/rules/mbedtls.make b/rules/mbedtls.make new file mode 100644 index ..0086492fc029 --- /dev/null +++ b/rules/mbedtls.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls + +# +# Paths and names +# +MBEDTLS_VERSION:= 2.16.3 +MBEDTLS_MD5:= 90ce7c7a001d2514410280706b3ab1a7 +MBEDTLS:= mbedtls-$(MBEDTLS_VERSION) +MBEDTLS_SUFFIX := tgz +MBEDTLS_URL:= https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) +MBEDTLS_DIR:= $(BUILDDIR)/$(MBEDTLS) +MBEDTLS_LICENSE:= Apache-2.0 +MBEDTLS_LICENSE_FILES := file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +# +# cmake +# +MBEDTLS_CONF_TOOL := cmake +MBEDTLS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DLINK_WITH_PTHREAD=ON \ + -DUNSAFE_BUILD=OFF \ + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF + +# +# Target-Install +# + +$(STATEDIR)/mbedtls.targetinstall: + @$(call targetinfo) + + @$(call install_init, mbedtls) + @$(call install_fixup, mbedtls,PRIORITY,optional) + @$(call install_fixup, mbedtls,SECTION,base) + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, mbedtls,DESCRIPTION,missing) + + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) + + @$(call install_finish, mbedtls) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 3/3] open62541: new package
From: Björn Esser
The open62541 project is an open source implementation of the OPC UA
communication infrastructure which is used in industrial control.
Signed-off-by: Björn Esser
[uol: adjusted commit message]
Signed-off-by: Ulrich Ölmann
---
v2 --> v3: adjusted commit message
...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
patches/open62541-1.0/series | 4 +
rules/host-open62541.in | 6 +
rules/host-open62541.make | 50
rules/open62541.in| 13 +
rules/open62541.make | 140 +++
6 files changed, 437 insertions(+)
create mode 100644
patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
create mode 100644 patches/open62541-1.0/series
create mode 100644 rules/host-open62541.in
create mode 100644 rules/host-open62541.make
create mode 100644 rules/open62541.in
create mode 100644 rules/open62541.make
diff --git
a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
new file mode 100644
index ..0dfd003518ed
--- /dev/null
+++
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
@@ -0,0 +1,224 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 2 Dec 2019 14:38:38 +0100
+Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This makes it easier for developers to keep all ua-nodesets XML
+definitions in a common location.
+
+Backported from: https://github.com/open62541/open62541/pull/3310
+
+Signed-off-by: Björn Esser
+---
+ CMakeLists.txt| 14 +-
+ doc/nodeset_compiler.rst | 22 +++---
+ examples/CMakeLists.txt | 4
+ examples/nodeset/CMakeLists.txt | 6 +++---
+ tests/nodeset-compiler/CMakeLists.txt | 14 +++---
+ tools/cmake/macros_public.cmake | 2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d426e1da66fe..fbbafd8f2791 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -15,7 +15,6 @@ include(GNUInstallDirs)
+
+ # Set when installed via make install
+ set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
+-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+
+ include(macros_internal)
+ include(macros_public)
+@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
(uses mbedTLS)" OFF)
+ option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
Device Server Profile" OFF)
+ option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
+
++if(NOT UA_NODESET_DIR)
++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
++endif()
++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
++
+ # Namespace Zero
+ set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
namespace zero (minimal/reduced/full)")
+ SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
"FULL")
+@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
+
+ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ if(NOT UA_FILE_NS0)
+-set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+ endif()
+ set(UA_FILE_NODESETS "${UA_FILE_NS0}")
+
+@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ endif()
+
+
+-set(UA_FILE_NODEIDS
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
+-set(UA_FILE_STATUSCODES
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
+-set(UA_FILE_TYPES_BSD
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+ else()
+ if(NOT UA_FILE_NS0)
+ set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
+diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
+index dd752ccd70a9..34fc8f800480 100644
+--- a/doc/nodeset_compiler.rst
b/doc/nodeset_compiler.rst
+@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen``
nodesets::
+ # Generate types and namespace for DI
+ ua_generate_nodeset_and_datatypes(
+ NAME "di"
+-FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv"
+-FILE_BSD
"${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd"
++FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDi
[ptxdist] [PATCH v4 2/3] host-ua-nodeset: new package
From: Björn Esser The OPC Foundation's UA NodeSets and other normative files which are released with an OPC UA specification (for details see [1]). Needed to build open62541. [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files Signed-off-by: Björn Esser [uol: adjusted commit message and Kconfig menu file, replaced mkdir/cp by install -D -t] Signed-off-by: Ulrich Ölmann --- v1 --> v2: adjusted commit message and Kconfig menu file's help text v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t v3 --> v4: adjusted commit message and added default y in Kconfig menu file rules/host-ua-nodeset.in | 11 ++ rules/host-ua-nodeset.make | 44 ++ 2 files changed, 55 insertions(+) create mode 100644 rules/host-ua-nodeset.in create mode 100644 rules/host-ua-nodeset.make diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in new file mode 100644 index ..ba10ae26c36c --- /dev/null +++ b/rules/host-ua-nodeset.in @@ -0,0 +1,11 @@ +## SECTION=hosttools_noprompt + +config HOST_UA_NODESET + tristate + default y if ALLYES + help + The OPC Foundation's UA NodeSets and other normative files which are + released with an OPC UA specification (for details see [1]). Needed to + build open62541. + + [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make new file mode 100644 index ..5bc3da18f48e --- /dev/null +++ b/rules/host-ua-nodeset.make @@ -0,0 +1,44 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset + +# +# Paths and names +# +HOST_UA_NODESET_VERSION:= 1.04.4-2020-01-08 +HOST_UA_NODESET_MD5:= ce7b39c7f2d65617f76e0301f654a9ea +HOST_UA_NODESET:= ua-nodeset-$(HOST_UA_NODESET_VERSION) +HOST_UA_NODESET_SUFFIX := tar.gz +HOST_UA_NODESET_URL:= https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_SOURCE := $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_DIR:= $(HOST_BUILDDIR)/$(HOST_UA_NODESET) + +# +# Compile +# + +$(STATEDIR)/host-ua-nodeset.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-ua-nodeset.install: + @$(call targetinfo) + + @$(call world/execute, HOST_UA_NODESET, \ + install -vD -t $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset \ + $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/*) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 2/3] host-ua-nodeset: New package.
On Thu, Jan 30 2020 at 14:57 +0100, Michael Olbrich wrote: > On Tue, Jan 28, 2020 at 04:27:04PM +0100, Ulrich Ölmann wrote: >> From: Björn Esser >> >> The OPC Foundation's UA NodeSets and other normative files which are released >> with an OPC UA specification (for details see [1]). Needed to build >> open62541. >> >> [1] >> https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files >> >> Signed-off-by: Björn Esser >> [uol: adjusted commit message and Kconfig menu file's help text] >> Signed-off-by: Ulrich Ölmann >> --- >> v1 --> v2: adjusted commit message and Kconfig menu file's help text >> >> rules/host-ua-nodeset.in | 10 + >> rules/host-ua-nodeset.make | 44 ++ >> 2 files changed, 54 insertions(+) >> create mode 100644 rules/host-ua-nodeset.in >> create mode 100644 rules/host-ua-nodeset.make >> >> diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in >> new file mode 100644 >> index ..7d47e29feda5 >> --- /dev/null >> +++ b/rules/host-ua-nodeset.in >> @@ -0,0 +1,10 @@ >> +## SECTION=hosttools_noprompt >> + >> +config HOST_UA_NODESET >> +tristate > > default y if ALLYES Args, forgot this while preparing the just sent v3... will send a v4! Ulrich >> +help >> + The OPC Foundation's UA NodeSets and other normative files which are >> + released with an OPC UA specification (for details see [1]). Needed to >> + build open62541. >> + >> + [1] >> https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files >> diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make >> new file mode 100644 >> index ..0b846f31d121 >> --- /dev/null >> +++ b/rules/host-ua-nodeset.make >> @@ -0,0 +1,44 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2019 by Bjoern Esser >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +# >> +# We provide this package >> +# >> +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset >> + >> +# >> +# Paths and names >> +# >> +HOST_UA_NODESET_VERSION := 1.04.4-2020-01-08 >> +HOST_UA_NODESET_MD5 := ce7b39c7f2d65617f76e0301f654a9ea >> +HOST_UA_NODESET := ua-nodeset-$(HOST_UA_NODESET_VERSION) >> +HOST_UA_NODESET_SUFFIX := tar.gz >> +HOST_UA_NODESET_URL := >> https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) >> +HOST_UA_NODESET_SOURCE := >> $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) >> +HOST_UA_NODESET_DIR := $(HOST_BUILDDIR)/$(HOST_UA_NODESET) >> + >> +# >> >> +# Compile >> +# >> >> + >> +$(STATEDIR)/host-ua-nodeset.compile: >> +@$(call targetinfo) >> +@$(call touch) >> + >> +# >> >> +# Install >> +# >> >> + >> +$(STATEDIR)/host-ua-nodeset.install: >> +@$(call targetinfo) >> + >> +@mkdir -p $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset >> +@cp -a $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ >> +$(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset > > @$(call world/execute, HOST_UA_NODESET, \ > install -vD -t $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset \ > $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/*) > > This will also delete any old files. > > Michael > >> + >> +@$(call touch) >> -- >> 2.25.0 >> >> >> ___ >> ptxdist mailing list >> ptxdist@pengutronix.de -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 3/3] open62541: new package
From: Björn Esser
The open62541 project is an open source implementation of the OPC UA
communication infrastructure which is used in industrial control.
Signed-off-by: Björn Esser
[uol: adjusted commit message]
Signed-off-by: Ulrich Ölmann
---
v2 --> v3: adjusted commit message
...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
patches/open62541-1.0/series | 4 +
rules/host-open62541.in | 6 +
rules/host-open62541.make | 50
rules/open62541.in| 13 +
rules/open62541.make | 140 +++
6 files changed, 437 insertions(+)
create mode 100644
patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
create mode 100644 patches/open62541-1.0/series
create mode 100644 rules/host-open62541.in
create mode 100644 rules/host-open62541.make
create mode 100644 rules/open62541.in
create mode 100644 rules/open62541.make
diff --git
a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
new file mode 100644
index ..0dfd003518ed
--- /dev/null
+++
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
@@ -0,0 +1,224 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 2 Dec 2019 14:38:38 +0100
+Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This makes it easier for developers to keep all ua-nodesets XML
+definitions in a common location.
+
+Backported from: https://github.com/open62541/open62541/pull/3310
+
+Signed-off-by: Björn Esser
+---
+ CMakeLists.txt| 14 +-
+ doc/nodeset_compiler.rst | 22 +++---
+ examples/CMakeLists.txt | 4
+ examples/nodeset/CMakeLists.txt | 6 +++---
+ tests/nodeset-compiler/CMakeLists.txt | 14 +++---
+ tools/cmake/macros_public.cmake | 2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d426e1da66fe..fbbafd8f2791 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -15,7 +15,6 @@ include(GNUInstallDirs)
+
+ # Set when installed via make install
+ set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
+-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+
+ include(macros_internal)
+ include(macros_public)
+@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
(uses mbedTLS)" OFF)
+ option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
Device Server Profile" OFF)
+ option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
+
++if(NOT UA_NODESET_DIR)
++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
++endif()
++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
++
+ # Namespace Zero
+ set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
namespace zero (minimal/reduced/full)")
+ SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
"FULL")
+@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
+
+ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ if(NOT UA_FILE_NS0)
+-set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+ endif()
+ set(UA_FILE_NODESETS "${UA_FILE_NS0}")
+
+@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ endif()
+
+
+-set(UA_FILE_NODEIDS
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
+-set(UA_FILE_STATUSCODES
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
+-set(UA_FILE_TYPES_BSD
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+ else()
+ if(NOT UA_FILE_NS0)
+ set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
+diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
+index dd752ccd70a9..34fc8f800480 100644
+--- a/doc/nodeset_compiler.rst
b/doc/nodeset_compiler.rst
+@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen``
nodesets::
+ # Generate types and namespace for DI
+ ua_generate_nodeset_and_datatypes(
+ NAME "di"
+-FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv"
+-FILE_BSD
"${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd"
++FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDi
[ptxdist] [PATCH v3 1/3] mbedtls: new package
From: Björn Esser mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint. Unfortunately the upcoming open62541 package cannot be built against OpenSSL. To enable its SSL functionality mbed TLS is needed. Signed-off-by: Björn Esser [uol: adjusted commit message] Signed-off-by: Ulrich Ölmann --- v2 --> v3: adjusted commit message rules/mbedtls.in | 13 + rules/mbedtls.make | 66 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/mbedtls.in create mode 100644 rules/mbedtls.make diff --git a/rules/mbedtls.in b/rules/mbedtls.in new file mode 100644 index ..a0d58dbd5468 --- /dev/null +++ b/rules/mbedtls.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config MBEDTLS + tristate + prompt "mbedtls" + select HOST_CMAKE + select LIBC_PTHREAD + select ZLIB + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS capabilities + in their (embedded) products, facilitating this functionality + with a minimal coding footprint. diff --git a/rules/mbedtls.make b/rules/mbedtls.make new file mode 100644 index ..0086492fc029 --- /dev/null +++ b/rules/mbedtls.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls + +# +# Paths and names +# +MBEDTLS_VERSION:= 2.16.3 +MBEDTLS_MD5:= 90ce7c7a001d2514410280706b3ab1a7 +MBEDTLS:= mbedtls-$(MBEDTLS_VERSION) +MBEDTLS_SUFFIX := tgz +MBEDTLS_URL:= https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) +MBEDTLS_DIR:= $(BUILDDIR)/$(MBEDTLS) +MBEDTLS_LICENSE:= Apache-2.0 +MBEDTLS_LICENSE_FILES := file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +# +# cmake +# +MBEDTLS_CONF_TOOL := cmake +MBEDTLS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DLINK_WITH_PTHREAD=ON \ + -DUNSAFE_BUILD=OFF \ + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF + +# +# Target-Install +# + +$(STATEDIR)/mbedtls.targetinstall: + @$(call targetinfo) + + @$(call install_init, mbedtls) + @$(call install_fixup, mbedtls,PRIORITY,optional) + @$(call install_fixup, mbedtls,SECTION,base) + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, mbedtls,DESCRIPTION,missing) + + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) + + @$(call install_finish, mbedtls) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 2/3] host-ua-nodeset: new package
From: Björn Esser The OPC Foundation's UA NodeSets and other normative files which are released with an OPC UA specification (for details see [1]). Needed to build open62541. [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files Signed-off-by: Björn Esser [uol: adjusted commit message and Kconfig menu file's help text, replaced mkdir/cp by install -D -t] Signed-off-by: Ulrich Ölmann --- v1 --> v2: adjusted commit message and Kconfig menu file's help text v2 --> v3: adjusted commit message and replaced mkdir/cp by install -D -t rules/host-ua-nodeset.in | 10 + rules/host-ua-nodeset.make | 44 ++ 2 files changed, 54 insertions(+) create mode 100644 rules/host-ua-nodeset.in create mode 100644 rules/host-ua-nodeset.make diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in new file mode 100644 index ..7d47e29feda5 --- /dev/null +++ b/rules/host-ua-nodeset.in @@ -0,0 +1,10 @@ +## SECTION=hosttools_noprompt + +config HOST_UA_NODESET + tristate + help + The OPC Foundation's UA NodeSets and other normative files which are + released with an OPC UA specification (for details see [1]). Needed to + build open62541. + + [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make new file mode 100644 index ..5bc3da18f48e --- /dev/null +++ b/rules/host-ua-nodeset.make @@ -0,0 +1,44 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset + +# +# Paths and names +# +HOST_UA_NODESET_VERSION:= 1.04.4-2020-01-08 +HOST_UA_NODESET_MD5:= ce7b39c7f2d65617f76e0301f654a9ea +HOST_UA_NODESET:= ua-nodeset-$(HOST_UA_NODESET_VERSION) +HOST_UA_NODESET_SUFFIX := tar.gz +HOST_UA_NODESET_URL:= https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_SOURCE := $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_DIR:= $(HOST_BUILDDIR)/$(HOST_UA_NODESET) + +# +# Compile +# + +$(STATEDIR)/host-ua-nodeset.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-ua-nodeset.install: + @$(call targetinfo) + + @$(call world/execute, HOST_UA_NODESET, \ + install -vD -t $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset \ + $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/*) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] kconfig: fix typos in diverse menu files
Signed-off-by: Ulrich Ölmann --- config/setup/Kconfig | 18 +- platforms/barebox.in | 2 +- platforms/dtc.in | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 28c2ce2c4528..3da0f5827c29 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -19,14 +19,14 @@ config SETUP_USER_NAME string default "" help - Full name of the user. Used as default in 'ptxdist newpackage' + Full name of the user. Used as default in 'ptxdist newpackage'. config SETUP_USER_EMAIL prompt "eMail" string default "" help - eMail address of the user. Used as default in 'ptxdist newpackage' + eMail address of the user. Used as default in 'ptxdist newpackage'. endmenu @@ -104,7 +104,7 @@ config SETUP_PTXMIRROR_ONLY prompt "Only use PTXdist Mirror to download packages" help Set this to y if you only want to download packages from - PTXCONF_SETUP_PTXMIRROR + PTXCONF_SETUP_PTXMIRROR. endif @@ -122,7 +122,7 @@ config SETUP_URL_WHITELIST prompt "URL Whitelist" help A space separated list of URLs. Any download URL that starts with - one of the here specified URLs will always be used. This + one of the URLs specified here will always be used. This overwrites the 'only use PTXdist Mirror' feature for these URLs. endif # SETUP_PTXMIRROR_ONLY @@ -262,8 +262,8 @@ config SETUP_DISABLE_REPRODUCIBLE config SETUP_ENV_WHITELIST string "environment variable whitelist (space separated)" help - PTXdist clears the environment by default. Specify here a - space separated list of environment variables to preserve. + PTXdist clears the environment by default. Specify a space + separated list of environment variables to preserve here. config SETUP_COMMON_CACHE @@ -282,7 +282,7 @@ config SETUP_GEN_DEP_TREE help PTXdist has the feature to generate graphs to illustrate the dependencies to build a root file system. This information - if probably only interesting for hard core developers or + is probably only interesting for hard core developers or marketing guys, you probably don't want it. BTW: you need to install the 'dot' program of the @@ -292,7 +292,7 @@ config SETUP_GEN_DEP_TREE config SETUP_CHECK_EXIT_ON_ERROR bool "enable exit on error" help - Use bash' "set -e" feature within ptxdist. Which enables + Use bash's "set -e" feature within ptxdist which enables quite aggressive error checking. Don't turn this on until you know what you're doing. @@ -313,7 +313,7 @@ config SETUP_ICECC_CREATE_ENV default "/usr/lib/icecc/icecc-create-env" prompt "icecc-create-env path" help - The full path to icecc-create-env + The full path to icecc-create-env. endif diff --git a/platforms/barebox.in b/platforms/barebox.in index df3542aaf3a9..526d7ede42ad 100644 --- a/platforms/barebox.in +++ b/platforms/barebox.in @@ -57,7 +57,7 @@ config BAREBOX_BAREBOXENV bool help The tool 'bareboxenv' can be used to manipulate the barebox - environment. Enable this option access the barebox environment + environment. Enable this option to access the barebox environment from the target Linux system. config BAREBOX_BAREBOXCRC32 diff --git a/platforms/dtc.in b/platforms/dtc.in index 038dff5c8b92..bafdb000a971 100644 --- a/platforms/dtc.in +++ b/platforms/dtc.in @@ -15,7 +15,7 @@ if DTC config DTC_INSTALL_OFTREE bool "install oftree to /boot" help - Creates an package to install the 'oftree' file to /boot + Creates a package to install the 'oftree' file to /boot of your target system. config DTC_OFTREE_DTS_PATH -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
Continuing Björn's work I just sent a v4 of this series. Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
From: Björn Esser
We also need to build a host-nodejs package first, as there
are some tools needed to be executable on the host system
during the intermediate cross-build process.
This package drops support for NPM, as we will be managing
Node.js packages with Yarn, which will be implemented in the
following commits.
The patches that are shipped along with this version of the
package have been taken from the SRPM of the Node.js-package
in Fedora. See:
https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master
Signed-off-by: Björn Esser
---
Range-diff of v4 against v3:
1: e08d21cc0be1 = 1: e08d21cc0be1 nodejs: version bump 6.9.5 -> 12.14.1 LTS
...1-Disable-running-gyp-on-shared-deps.patch | 25
...Install-both-binaries-and-use-libdir.patch | 83
patches/node-v12.14.1/series | 5 +
...build-from-source-option-to-npmunbox.patch | 31 -
patches/npmbox-2.6.1/series | 4 -
rules/host-nodejs.in | 2 +
rules/host-nodejs.make| 41 +++---
rules/nodejs.in | 54 ++--
rules/nodejs.make | 121 ++
9 files changed, 189 insertions(+), 177 deletions(-)
create mode 100644
patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
create mode 100644
patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
create mode 100644 patches/node-v12.14.1/series
delete mode 100644
patches/npmbox-2.6.1/0001-npmbox-add-build-from-source-option-to-npmunbox.patch
delete mode 100644 patches/npmbox-2.6.1/series
diff --git
a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
b/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
new file mode 100644
index ..58d46a8f4167
--- /dev/null
+++ b/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch
@@ -0,0 +1,25 @@
+From: Zuzana Svetlikova
+Date: Thu, 27 Apr 2017 14:25:42 +0200
+Subject: [PATCH] Disable running gyp on shared deps
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 56f53582d1f4..2fb80e742637 100644
+--- a/Makefile
b/Makefile
+@@ -141,9 +141,9 @@ test-code-cache: with-code-cache
+ echo "'test-code-cache' target is a noop"
+
+ out/Makefile: config.gypi common.gypi node.gyp \
+- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
+- tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
+- tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
++ deps/http_parser/http_parser.gyp \
++ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
++ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+ $(PYTHON) tools/gyp_node.py -f make
+
+ # node_version.h is listed because the N-API version is taken from there
diff --git
a/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
b/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
new file mode 100644
index ..38c3c96503f1
--- /dev/null
+++ b/patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch
@@ -0,0 +1,83 @@
+From: Elliott Sales de Andrade
+Date: Tue, 19 Mar 2019 23:22:40 -0400
+Subject: [PATCH] Install both binaries and use libdir.
+
+This allows us to build with a shared library for other users while
+still providing the normal executable.
+
+Signed-off-by: Elliott Sales de Andrade
+---
+ configure.py | 7 +++
+ tools/install.py | 31 ++-
+ 2 files changed, 21 insertions(+), 17 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 20cce214dbb1..e2d78a2a51ef 100755
+--- a/configure.py
b/configure.py
+@@ -559,6 +559,12 @@ parser.add_option('--shared',
+ help='compile shared library for embedding node in another project. ' +
+ '(This mode is not officially supported for regular applications)')
+
++parser.add_option('--libdir',
++action='store',
++dest='libdir',
++default='lib',
++help='a directory to install the shared library into')
++
+ parser.add_option('--without-v8-platform',
+ action='store_true',
+ dest='without_v8_platform',
+@@ -1103,6 +1109,7 @@ def configure_node(o):
+ if o['variables']['want_separate_host_toolset'] == 0:
+ o['variables']['node_code_cache'] = 'yes' # For testing
+ o['variables']['node_shared'] = b(options.shared)
++ o['variables']['libdir'] = options.libdir
+ node_module_version = getmoduleversion.get_version()
+
+ if sys.platform == 'darwin':
+diff --git a/tools/install.py b/tools/install.py
+index 655802980a6e..fe4723bf1501 100755
+--- a/tools/install.py
b/tools/install.py
+@@ -121,26 +121,23 @@ def subdir_files(path, dest, action):
+
+ def files(action):
+ is_windows = sys.platform == 'win32'
+- output_file = 'node'
+ output_prefix = 'out/Release/'
++ output_libprefix =
[ptxdist] [PATCH v4 3/3] nodejs_packages: new package
From: Björn Esser
This is a dummy package to specify and install required Node.js packages for the
target system.
The management of those packages and their dependencies is handled with
Yarn (run through host-nodejs) to maintain a reproducible offline cache that is
stored in local_src/nodejs_packages.
Signed-off-by: Björn Esser
[uol: adjusted commit message and Kconfig menu file's help texts & fixed
NODEJS_PACKAGES_URL]
Signed-off-by: Ulrich Ölmann
---
Range-diff of v4 against v3:
3: 2a6984f0297b ! 3: ccd2b44a8d92 nodejs_packages: New package.
@@ Metadata
Author: Björn Esser
## Commit message ##
-nodejs_packages: New package.
+nodejs_packages: new package
-This is a dummy package to specifiy and install the required
-Node.js packages for the target system.
+This is a dummy package to specify and install required Node.js
packages for the
+target system.
-The management of the Node.js packages and their dependencies
-are handled with Yarn (run through host-nodejs) to maintain
-a reprocible offline cache.
-
-The cache is stored in local_src/nodejs_packages, which must
-be an existing path inside of the BSP.
+The management of those packages and their dependencies is handled with
+Yarn (run through host-nodejs) to maintain a reproducible offline
cache that is
+stored in local_src/nodejs_packages.
Signed-off-by: Björn Esser
+[uol: adjusted commit message and Kconfig menu file's help texts &
fixed
+NODEJS_PACKAGES_URL]
+Signed-off-by: Ulrich Ölmann
## rules/nodejs_packages.in (new) ##
@@
@@ rules/nodejs_packages.in (new)
+Reproducibly install Node.js packages that will be available
+system-wide on the target.
+
-+You MUST specify at least one Node.js package in the shown
-+submenu after enabling this option.
++You MUST specify at least one Node.js package in the submenu that is
++shown after enabling this option.
+
+
+if NODEJS_PACKAGES
@@ rules/nodejs_packages.in (new)
+ string
+ prompt "Node.js packages to install"
+ help
-+A white-space separated list of Node.js packages including
-+its version (e.g. express@4.17.x). npm semvers are fully
-+supported.
++A white-space separated list of Node.js packages including their
++versions (e.g. express@4.17.x or socket.io@'>=2.1.0 <=2.3.0'). NPM
++semvers are fully supported, see [1].
+
+The packages are managed with Yarn and are guaranteed to be
-+reproducible and immutable as long as the download location
-+stays accessible or the download-cache does not get altered.
++reproducible and immutable as long as the download location stays
++accessible or the offline cache is not altered.
++
++If the list of Node.js packages to be installed has been populated for
++the first time or if it has been modified later on one needs to
++(re-)build this package to download the desired Node.js packages and
++update the offline cache. Afterwards it is highly recommended to
++commit the path '${PTXDIST_WORKSPACE}/local_src/nodejs_packages/' into
++the version control system and to lock the package cache.
+
-+After downloading the packages and creating the package cache,
-+by building this package the first time after altering the list
-+of installed packages, it is highly recommended to commit the
-+path: './local_src/nodejs_packages/' into the git repository
-+and to lock the package cache.
++As a prerequisite the path '${PTXDIST_WORKSPACE}/local_src/nodejs_
++packages/' must exist in the BSP *before* building this package.
+
-+Also the path: './local_src/nodejs_packages/' must exist in the
-+BSP *before* before building this package.
++[1] https://legacy.yarnpkg.com/en/docs/dependency-versions/
+
+config NODEJS_PACKAGES_OFFLINE
+ bool
-+ prompt "lock package cache for offline / production use"
++ prompt "lock offline cache for offline/production use"
+ help
-+This option locks the cache for installing the nodejs
-+packages and performs their installation during the
-+build of the BSP without any need for internet connectivity.
++This option locks the offline cache for installing the nodejs packages
++and allows their installation during the build of the BSP without any
++need for internet connectivity.
+
-+Checking this option is highly recommended for production use.
++Enabling this option is highly recommended for production use.
+
-+Do NOT forget to commit the path: './local_src/nodejs_packages/'
-+
[ptxdist] [PATCH v4 2/3] host-yarn: new package
From: Björn Esser Fast, reliable, and secure dependency management for Node.js. We use Yarn to generate an offline cache and a lock-file to be able to install all needed Node.js-packages reproducibly. This works even in environments without internet-connectivity, as long as the cache and the lock-file are in reach. Signed-off-by: Björn Esser [uol: adjusted commit message] Signed-off-by: Ulrich Ölmann --- Range-diff of v4 against v3: 2: e07e8a621a29 ! 2: c78fde2a6233 host-yarn: New package. @@ Metadata Author: Björn Esser ## Commit message ## -host-yarn: New package. +host-yarn: new package Fast, reliable, and secure dependency management for Node.js. -We use Yarn to generate a cache and a lock-file to be able -to install all needed Node.js-packages reproducibly. This -works even in environments without internet-connectivity, as -long as the cache and the lock-file are checked-in into the -version controll system (e.g. git) of the BSP. +We use Yarn to generate an offline cache and a lock-file to be able to install +all needed Node.js-packages reproducibly. This works even in environments +without internet-connectivity, as long as the cache and the lock-file are in +reach. Signed-off-by: Björn Esser +[uol: adjusted commit message] +Signed-off-by: Ulrich Ölmann ## rules/host-yarn.in (new) ## @@ rules/host-yarn.in | 6 + rules/host-yarn.make | 61 2 files changed, 67 insertions(+) create mode 100644 rules/host-yarn.in create mode 100644 rules/host-yarn.make diff --git a/rules/host-yarn.in b/rules/host-yarn.in new file mode 100644 index ..d98dd6c34620 --- /dev/null +++ b/rules/host-yarn.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_YARN + tristate + default y if ALLYES + select HOST_NODEJS diff --git a/rules/host-yarn.make b/rules/host-yarn.make new file mode 100644 index ..55a415945031 --- /dev/null +++ b/rules/host-yarn.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Juergen Borleis +# +# 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. +# +# 2019-May-05, Daniel Arnold, Updated to yarn 1.15.2 +# 2020-January-09, Björn Esser, Updated to yarn 1.21.1 + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_YARN) += host-yarn + +# +# Paths and names +# +HOST_YARN_VERSION := 1.21.1 +HOST_YARN_MD5 := cf49e663e0f56aa15f1740c77354ebe2 +HOST_YARN := yarn-$(HOST_YARN_VERSION) +HOST_YARN_SUFFIX := js +HOST_YARN_URL := https://github.com/yarnpkg/yarn/releases/download/v$(HOST_YARN_VERSION)/$(HOST_YARN).$(HOST_YARN_SUFFIX) +HOST_YARN_SOURCE := $(SRCDIR)/$(HOST_YARN).$(HOST_YARN_SUFFIX) + +# +# Extract (nothing to be done here) +# + +$(STATEDIR)/host-yarn.extract: + @$(call targetinfo) + @$(call touch) + +# +# Prepare (nothing to be done here) +# + +$(STATEDIR)/host-yarn.prepare: + @$(call targetinfo) + @$(call touch) + +# +# Compile (nothing to be done here) +# + +$(STATEDIR)/host-yarn.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-yarn.install: + @$(call targetinfo) + @install -pm 0755 $(HOST_YARN_SOURCE) $(PTXDIST_SYSROOT_HOST)/bin/yarn + @$(call touch) + +# vim: syntax=make -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] host-ua-nodeset: New package.
On Tue, Jan 14 2020 at 10:24 +0100, Roland Hieber wrote: > On Mon, Jan 13, 2020 at 02:35:55PM +0100, Björn Esser wrote: >> The OPC Foundation UA Nodeset. Needed to build open62541. >> >> Signed-off-by: Björn Esser >> --- >> rules/host-ua-nodeset.in | 6 ++ >> rules/host-ua-nodeset.make | 44 ++ >> 2 files changed, 50 insertions(+) >> create mode 100644 rules/host-ua-nodeset.in >> create mode 100644 rules/host-ua-nodeset.make >> >> diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in >> new file mode 100644 >> index 0..c582ec934 >> --- /dev/null >> +++ b/rules/host-ua-nodeset.in >> @@ -0,0 +1,6 @@ >> +## SECTION=hosttools_noprompt >> + >> +config HOST_UA_NODESET >> +tristate >> +help >> + OPC UA NodeSets > > Hm, that's not a very helpful help text... but I guess for > hosttools_noprompt this doesn't matter. Hi Roland, I took over from Björn Esser and just sent a v2 with a somewhat more thorough commit message and Kconfig option's help text. Best regards Ulrich > - Roland > >> diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make >> new file mode 100644 >> index 0..0b846f31d >> --- /dev/null >> +++ b/rules/host-ua-nodeset.make >> @@ -0,0 +1,44 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2019 by Bjoern Esser >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +# >> +# We provide this package >> +# >> +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset >> + >> +# >> +# Paths and names >> +# >> +HOST_UA_NODESET_VERSION := 1.04.4-2020-01-08 >> +HOST_UA_NODESET_MD5 := ce7b39c7f2d65617f76e0301f654a9ea >> +HOST_UA_NODESET := ua-nodeset-$(HOST_UA_NODESET_VERSION) >> +HOST_UA_NODESET_SUFFIX := tar.gz >> +HOST_UA_NODESET_URL := >> https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) >> +HOST_UA_NODESET_SOURCE := >> $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) >> +HOST_UA_NODESET_DIR := $(HOST_BUILDDIR)/$(HOST_UA_NODESET) >> + >> +# >> >> +# Compile >> +# >> >> + >> +$(STATEDIR)/host-ua-nodeset.compile: >> +@$(call targetinfo) >> +@$(call touch) >> + >> +# >> >> +# Install >> +# >> >> + >> +$(STATEDIR)/host-ua-nodeset.install: >> +@$(call targetinfo) >> + >> +@mkdir -p $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset >> +@cp -a $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ >> +$(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset >> + >> +@$(call touch) >> -- >> 2.25.0.rc1 >> >> >> ___ >> ptxdist mailing list >> ptxdist@pengutronix.de -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 3/3] open62541: New package.
From: Björn Esser
The open62541 project is an open source implementation of the OPC UA
communication infrastructure which is used in industrial control.
Signed-off-by: Björn Esser
---
...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++
patches/open62541-1.0/series | 4 +
rules/host-open62541.in | 6 +
rules/host-open62541.make | 50
rules/open62541.in| 13 +
rules/open62541.make | 140 +++
6 files changed, 437 insertions(+)
create mode 100644
patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
create mode 100644 patches/open62541-1.0/series
create mode 100644 rules/host-open62541.in
create mode 100644 rules/host-open62541.make
create mode 100644 rules/open62541.in
create mode 100644 rules/open62541.make
diff --git
a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
new file mode 100644
index ..0dfd003518ed
--- /dev/null
+++
b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch
@@ -0,0 +1,224 @@
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 2 Dec 2019 14:38:38 +0100
+Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This makes it easier for developers to keep all ua-nodesets XML
+definitions in a common location.
+
+Backported from: https://github.com/open62541/open62541/pull/3310
+
+Signed-off-by: Björn Esser
+---
+ CMakeLists.txt| 14 +-
+ doc/nodeset_compiler.rst | 22 +++---
+ examples/CMakeLists.txt | 4
+ examples/nodeset/CMakeLists.txt | 6 +++---
+ tests/nodeset-compiler/CMakeLists.txt | 14 +++---
+ tools/cmake/macros_public.cmake | 2 +-
+ 6 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d426e1da66fe..fbbafd8f2791 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -15,7 +15,6 @@ include(GNUInstallDirs)
+
+ # Set when installed via make install
+ set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
+-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+
+ include(macros_internal)
+ include(macros_public)
+@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support
(uses mbedTLS)" OFF)
+ option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded
Device Server Profile" OFF)
+ option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
+
++if(NOT UA_NODESET_DIR)
++set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
++endif()
++set(open62541_NODESET_DIR ${UA_NODESET_DIR})
++
+ # Namespace Zero
+ set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated
namespace zero (minimal/reduced/full)")
+ SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED"
"FULL")
+@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS)
+
+ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ if(NOT UA_FILE_NS0)
+-set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml)
++set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+ endif()
+ set(UA_FILE_NODESETS "${UA_FILE_NS0}")
+
+@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+ endif()
+
+
+-set(UA_FILE_NODEIDS
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv)
+-set(UA_FILE_STATUSCODES
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv)
+-set(UA_FILE_TYPES_BSD
${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd)
++set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
++set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
++set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+ else()
+ if(NOT UA_FILE_NS0)
+ set(UA_FILE_NS0
${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml)
+diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
+index dd752ccd70a9..34fc8f800480 100644
+--- a/doc/nodeset_compiler.rst
b/doc/nodeset_compiler.rst
+@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen``
nodesets::
+ # Generate types and namespace for DI
+ ua_generate_nodeset_and_datatypes(
+ NAME "di"
+-FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv"
+-FILE_BSD
"${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd"
++FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
++FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
+ NAMESPACE_IDX 2
+-FILE_NS
"${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml"
++FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
+
[ptxdist] [PATCH v2 1/3] mbedtls: New package.
From: Björn Esser mbed TLS (formerly known as PolarSSL) makes it trivially easy for developers to include cryptographic and SSL/TLS capabilities in their (embedded) products, facilitating this functionality with a minimal coding footprint. Unfortunately the upcoming open62541 package cannot be built against openSSL. To enable its SSL functionality mbedTLS is needed. Signed-off-by: Björn Esser --- rules/mbedtls.in | 13 + rules/mbedtls.make | 66 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/mbedtls.in create mode 100644 rules/mbedtls.make diff --git a/rules/mbedtls.in b/rules/mbedtls.in new file mode 100644 index ..a0d58dbd5468 --- /dev/null +++ b/rules/mbedtls.in @@ -0,0 +1,13 @@ +## SECTION=system_libraries + +config MBEDTLS + tristate + prompt "mbedtls" + select HOST_CMAKE + select LIBC_PTHREAD + select ZLIB + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS capabilities + in their (embedded) products, facilitating this functionality + with a minimal coding footprint. diff --git a/rules/mbedtls.make b/rules/mbedtls.make new file mode 100644 index ..0086492fc029 --- /dev/null +++ b/rules/mbedtls.make @@ -0,0 +1,66 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls + +# +# Paths and names +# +MBEDTLS_VERSION:= 2.16.3 +MBEDTLS_MD5:= 90ce7c7a001d2514410280706b3ab1a7 +MBEDTLS:= mbedtls-$(MBEDTLS_VERSION) +MBEDTLS_SUFFIX := tgz +MBEDTLS_URL:= https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) +MBEDTLS_DIR:= $(BUILDDIR)/$(MBEDTLS) +MBEDTLS_LICENSE:= Apache-2.0 +MBEDTLS_LICENSE_FILES := file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +# +# cmake +# +MBEDTLS_CONF_TOOL := cmake +MBEDTLS_CONF_OPT := \ + $(CROSS_CMAKE_USR) \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON \ + -DLINK_WITH_PTHREAD=ON \ + -DUNSAFE_BUILD=OFF \ + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF + +# +# Target-Install +# + +$(STATEDIR)/mbedtls.targetinstall: + @$(call targetinfo) + + @$(call install_init, mbedtls) + @$(call install_fixup, mbedtls,PRIORITY,optional) + @$(call install_fixup, mbedtls,SECTION,base) + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, mbedtls,DESCRIPTION,missing) + + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) + + @$(call install_finish, mbedtls) + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/3] host-ua-nodeset: New package.
From: Björn Esser The OPC Foundation's UA NodeSets and other normative files which are released with an OPC UA specification (for details see [1]). Needed to build open62541. [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files Signed-off-by: Björn Esser [uol: adjusted commit message and Kconfig menu file's help text] Signed-off-by: Ulrich Ölmann --- v1 --> v2: adjusted commit message and Kconfig menu file's help text rules/host-ua-nodeset.in | 10 + rules/host-ua-nodeset.make | 44 ++ 2 files changed, 54 insertions(+) create mode 100644 rules/host-ua-nodeset.in create mode 100644 rules/host-ua-nodeset.make diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in new file mode 100644 index ..7d47e29feda5 --- /dev/null +++ b/rules/host-ua-nodeset.in @@ -0,0 +1,10 @@ +## SECTION=hosttools_noprompt + +config HOST_UA_NODESET + tristate + help + The OPC Foundation's UA NodeSets and other normative files which are + released with an OPC UA specification (for details see [1]). Needed to + build open62541. + + [1] https://github.com/OPCFoundation/UA-Nodeset/#opc-ua-nodesets-and-other-supporting-files diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make new file mode 100644 index ..0b846f31d121 --- /dev/null +++ b/rules/host-ua-nodeset.make @@ -0,0 +1,44 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset + +# +# Paths and names +# +HOST_UA_NODESET_VERSION:= 1.04.4-2020-01-08 +HOST_UA_NODESET_MD5:= ce7b39c7f2d65617f76e0301f654a9ea +HOST_UA_NODESET:= ua-nodeset-$(HOST_UA_NODESET_VERSION) +HOST_UA_NODESET_SUFFIX := tar.gz +HOST_UA_NODESET_URL:= https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_SOURCE := $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) +HOST_UA_NODESET_DIR:= $(HOST_BUILDDIR)/$(HOST_UA_NODESET) + +# +# Compile +# + +$(STATEDIR)/host-ua-nodeset.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-ua-nodeset.install: + @$(call targetinfo) + + @mkdir -p $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset + @cp -a $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ + $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset + + @$(call touch) -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] ptxd_kconfig: fix line continuation
Signed-off-by: Ulrich Ölmann
---
scripts/lib/ptxd_lib_kconfig.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh
index e65f583cafb8..adddc46c1636 100644
--- a/scripts/lib/ptxd_lib_kconfig.sh
+++ b/scripts/lib/ptxd_lib_kconfig.sh
@@ -516,7 +516,7 @@ ptxd_kconfig_sync_config() {
all=""
fi
ptxd_bailout "Outdated config for '$(ptxd_print_path
"${PTXDIST_LAYERS[0]}")'" \
- "'oldconfig' changes the file. Run 'oldconfig${p:+ }${p}'
to update${all}."
+ "'oldconfig' changes the file. Run 'oldconfig${p:+ }${p}'
to update${all}." \
"Use --force to continue anyways."
else
ptxd_warning "Outdated config for '$(ptxd_print_path
"${PTXDIST_LAYERS[0]}")'" \
--
2.25.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/3] open62541: New package.
Hi Alex, On Tue, Jan 14 2020 at 10:56 +0100, Alexander Dahl wrote: > out of curiousity, is this based on that DistroKit topic branch from > last year? > > https://git.pengutronix.de/cgit/DistroKit/log/?h=rsc/topic/open62541 yes, that was Björn's starting point. :-) Best regards Ulrich > ;-) > > Greets > Alex > > On Mon, Jan 13, 2020 at 02:35:56PM +0100, Björn Esser wrote: >> The open62541 project is an open source implementation of the OPC UA >> communication infrastructure which is used in industrial control. >> >> Signed-off-by: Björn Esser >> --- >> ...-UA_NODESET_DIR-to-be-custom-defined.patch | 224 ++ >> patches/open62541-1.0/series | 4 + >> rules/host-open62541.in | 6 + >> rules/host-open62541.make | 50 >> rules/open62541.in| 13 + >> rules/open62541.make | 140 +++ >> 6 files changed, 437 insertions(+) >> [...] -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mc: dependency fix & version bump 4.8.20 -> 4.8.23
In current toolchains the dependency to libnsl is gone. Signed-off-by: Ulrich Ölmann --- rules/mc.in | 1 - rules/mc.make | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/mc.in b/rules/mc.in index 17e4dd454cb1..42adeaf07db9 100644 --- a/rules/mc.in +++ b/rules/mc.in @@ -3,7 +3,6 @@ menuconfig MC tristate select GCCLIBS_GCC_S - select LIBC_NSL select GLIB select E2FSPROGSif MC_VFS_UNDELFS select E2FSPROGS_LIBEXT2FS if MC_VFS_UNDELFS diff --git a/rules/mc.make b/rules/mc.make index caf109595fb3..a96d8b91568a 100644 --- a/rules/mc.make +++ b/rules/mc.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MC) += mc # # Paths and names # -MC_VERSION := 4.8.20 -MC_MD5 := 7f808b01f3f7d9aa52152a9efb86dbca +MC_VERSION := 4.8.23 +MC_MD5 := 466c3135f727f8ac2102d060a080ace3 MC := mc-$(MC_VERSION) MC_SUFFIX := tar.xz MC_URL := http://ftp.midnight-commander.org/$(MC).$(MC_SUFFIX) -- 2.23.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] kernel: fix typos in kconfig help texts
Signed-off-by: Ulrich Ölmann
---
platforms/kernel.in | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 22c142be68e3..df83576df3ed 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -136,7 +136,7 @@ choice
bool
prompt "xipImage"
help
- Create eXecute In Place Image
+ Create eXecute In Place Image.
config KERNEL_IMAGE_U
bool
@@ -177,7 +177,7 @@ choice
bool
prompt "simpleImage"
help
- Create a simple Image with embedded DTB
+ Create a simple Image with embedded DTB.
endchoice
if KERNEL_IMAGE_SIMPLE
@@ -198,7 +198,7 @@ config KERNEL_IMAGE_SIMPLE_DTS
This specifies the "dts" file used to create your simple
image.
- The default is "${PTXDIST_PLATFORMCONFIGDIR}/simpleImage.dts"
+ The default is "${PTXDIST_PLATFORMCONFIGDIR}/simpleImage.dts".
The path "${PTXDIST_PLATFORMCONFIGDIR}" is the directory
where your platformconfig file is located.
@@ -226,8 +226,8 @@ config KERNEL_XZ
bool
help
Select this if you're going to build your kernel compressed
- with lzma and your host system is lacking the proper tools.
- ("xz-utils" or the deprecated "lzma" package)
+ with lzma and your host system is lacking the proper tools
+ ("xz-utils" or the deprecated "lzma" package).
Select this if you're unsure, as it won't hurt. It just
increases the build time.
@@ -237,8 +237,8 @@ config KERNEL_LZOP
bool
help
Select this if you're going to build your kernel compressed
- with lzo and your host system is lacking the proper tools.
- (the "lzop" package)
+ with lzo and your host system is lacking the proper tools
+ (the "lzop" package).
Select this if you're unsure, as it won't hurt. It just
increases the build time.
@@ -248,8 +248,8 @@ config KERNEL_LZ4
bool
help
Select this if you're going to build your kernel compressed
- with lz4 and your host system is lacking the proper tools.
- (the "lz4" package)
+ with lz4 and your host system is lacking the proper tools
+ (the "lz4" package).
Select this if you're unsure, as it won't hurt. It just
increases the build time.
@@ -259,7 +259,7 @@ config KERNEL_OPENSSL
bool
help
Select this if you're going to build your kernel with support for
- module signing, IMA etc. where openssl is need as hosttool
+ module signing, IMA etc. where openssl is need as hosttool.
Select this if you're unsure, as it won't hurt. It just
increases the build time.
@@ -292,7 +292,7 @@ config KERNEL_SERIES
default "series"
help
This entry specifies a patch series file which has to live in
- the kernel patches directory:
+ the kernel patches directory.
The series file contains lines with names of patch files which
are then being applied to the kernel.
@@ -302,7 +302,7 @@ config KERNEL_CONFIG
string
default "kernelconfig-${PTXCONF_KERNEL_VERSION}"
help
- this entry specifies the .config file used to compile your kernel
+ This entry specifies the .config file used to compile your kernel.
endmenu
@@ -326,9 +326,9 @@ config KERNEL_EXTRA_MAKEVARS
Changing this entry will rebuild the whole kernel.
* C=1
- Run sparse when compiling
+ Run sparse when compiling.
* V=1
- Increase verbosity when compiling
+ Increase verbosity when compiling.
endif # KERNEL
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] doc: dev_manual: add explanation of *_SOURCE variable
Hi there, sending the same series of patches two times happened by accident - please just disregard one of them. Ulrich On Thu, Aug 22 2019 at 15:37 +0200, Ulrich Ölmann wrote: > Signed-off-by: Ulrich Ölmann > --- > doc/dev_manual.rst | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst > index cd1d2e9fc098..e83584634c06 100644 > --- a/doc/dev_manual.rst > +++ b/doc/dev_manual.rst > @@ -368,6 +368,8 @@ PTXdist specific. What does it mean: > alternative download locations are known, they can be listed in this > variable, delimiter character is the space. > > +- ``*_SOURCE`` tells PTXdist where to store the downloaded package. > + > - ``*_DIR`` points to the directory this package will be build later on > by PTXdist -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] doc: dev_manual: add explanation of *_SOURCE variable
Signed-off-by: Ulrich Ölmann --- doc/dev_manual.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index cd1d2e9fc098..e83584634c06 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -368,6 +368,8 @@ PTXdist specific. What does it mean: alternative download locations are known, they can be listed in this variable, delimiter character is the space. +- ``*_SOURCE`` tells PTXdist where to store the downloaded package. + - ``*_DIR`` points to the directory this package will be build later on by PTXdist -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] doc: dev_manual: fix typos
Signed-off-by: Ulrich Ölmann --- doc/dev_manual.rst | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index e83584634c06..d79ebdba780d 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -18,7 +18,7 @@ This chapter shows all (or most) of the details of how PTXdist works. .. _directory_hierarchy: -PTXdist’s directory hierarchy +PTXdist’s Directory Hierarchy - .. note:: Referenced directories are meant relative to the PTXdist main @@ -127,7 +127,7 @@ next time PTXdist builds the root filesystem it will use the local .. _adding_new_packages: -Adding new Packages +Adding New Packages --- PTXdist provides a huge amount of applications sufficient for the most @@ -370,8 +370,8 @@ PTXdist specific. What does it mean: - ``*_SOURCE`` tells PTXdist where to store the downloaded package. -- ``*_DIR`` points to the directory this package will be build later on - by PTXdist +- ``*_DIR`` points to the directory this package will be built later on + by PTXdist. - ``*_LICENSE`` enables the user to get a list of licenses she/he is using in her/his project (licenses of the enabled packages). @@ -610,7 +610,7 @@ The “header” of this stage defines some information IPKG needs. The important part that we must modify is the call to the ``install_copy`` macro (refer to section :ref:`reference_macros` for more details about this kind of macros). This call instructs PTXdist to include the -given file (with PID, UID and permissions) into the IPKG, which means to +given file (with UID, GID and permissions) into the IPKG, which means to install this file to the target’s root filesystem. From the previous *install* stage we know this package installs an @@ -667,7 +667,7 @@ One last task of this port is still open: A reasonable location for the new menu entry in PTXdist’s menu hierarchy. PTXdist arranges its menus on the meaning of each package. Is it a network related tool? Or a scripting language? Or a graphical application? -Each of these global meanings have their own submenu, where we can add +Each of these global meanings has its own submenu, where we can add our new entry to. We just have to edit the head of our new menu file ``./rules/foo.in`` to add it to a specific global menu. If our new package is a network related tool, the head of the menu file should @@ -741,7 +741,7 @@ for example). To make life easier for everybody the license for a package must be provided. *SPDX* license identifiers unify the license names and are used in PTXdist to identify license types and obligations. -If a package comes with more than one license, alls of their SPDX identifiers +If a package comes with more than one license, all of their SPDX identifiers must be listed and connected with the keyword ``AND``. If your package comes with GPL-2.0 and LGPL-2.1 licenses, the definition should look like this: @@ -840,7 +840,7 @@ To do a fast check if this addition was successful, we run: .. note:: It depends on the currently selected platform and its architecture what content this variable will have. The content shown above is an - example for an target. + example for a target. Or re-build the package with the new settings: @@ -1285,7 +1285,7 @@ Creating a Patch Series for a Package To create a patch series for the first time, we can run the following steps. We are still using our *foo-1.1.0* example package here: -Using quilt +Using Quilt """"""""""" We create a special directory for the patch series in the local project @@ -1382,7 +1382,7 @@ that are autogenerated in autotools-based buildsystems. Refer to section :ref:`configure_rebuild` on how PTXdist can handle this special task. -Adding more Patches to a Package +Adding More Patches to a Package If we want to add more patches to an already patched package, we can use @@ -1449,7 +1449,7 @@ content can be: .. _adding_files: -Adding binary only Files +Adding Binary Only Files Sometimes a few binary files have to be added into the root filesystem. @@ -1460,7 +1460,7 @@ On the other hand, sometimes files should be included that are not covered by any open source license and so, should not be shipped in the source code format. -Add binary Files File by File +Add Binary Files File by File ~ Doing to on a file by file base can happen by just using the ``install_copy`` @@ -1481,7 +1481,7 @@ file, we need one call to the ``install_copy`` macro per file. This is even harder if not only a set of files is to be installed, but a whole directory tree with files instead. -Add binary Files via an Archive +Add Binary Files via an Archive ~~~ If a whole tree of files is to be ins
[ptxdist] [PATCH 2/2] doc: dev_manual: fix typos
Signed-off-by: Ulrich Ölmann --- doc/dev_manual.rst | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index e83584634c06..d79ebdba780d 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -18,7 +18,7 @@ This chapter shows all (or most) of the details of how PTXdist works. .. _directory_hierarchy: -PTXdist’s directory hierarchy +PTXdist’s Directory Hierarchy - .. note:: Referenced directories are meant relative to the PTXdist main @@ -127,7 +127,7 @@ next time PTXdist builds the root filesystem it will use the local .. _adding_new_packages: -Adding new Packages +Adding New Packages --- PTXdist provides a huge amount of applications sufficient for the most @@ -370,8 +370,8 @@ PTXdist specific. What does it mean: - ``*_SOURCE`` tells PTXdist where to store the downloaded package. -- ``*_DIR`` points to the directory this package will be build later on - by PTXdist +- ``*_DIR`` points to the directory this package will be built later on + by PTXdist. - ``*_LICENSE`` enables the user to get a list of licenses she/he is using in her/his project (licenses of the enabled packages). @@ -610,7 +610,7 @@ The “header” of this stage defines some information IPKG needs. The important part that we must modify is the call to the ``install_copy`` macro (refer to section :ref:`reference_macros` for more details about this kind of macros). This call instructs PTXdist to include the -given file (with PID, UID and permissions) into the IPKG, which means to +given file (with UID, GID and permissions) into the IPKG, which means to install this file to the target’s root filesystem. From the previous *install* stage we know this package installs an @@ -667,7 +667,7 @@ One last task of this port is still open: A reasonable location for the new menu entry in PTXdist’s menu hierarchy. PTXdist arranges its menus on the meaning of each package. Is it a network related tool? Or a scripting language? Or a graphical application? -Each of these global meanings have their own submenu, where we can add +Each of these global meanings has its own submenu, where we can add our new entry to. We just have to edit the head of our new menu file ``./rules/foo.in`` to add it to a specific global menu. If our new package is a network related tool, the head of the menu file should @@ -741,7 +741,7 @@ for example). To make life easier for everybody the license for a package must be provided. *SPDX* license identifiers unify the license names and are used in PTXdist to identify license types and obligations. -If a package comes with more than one license, alls of their SPDX identifiers +If a package comes with more than one license, all of their SPDX identifiers must be listed and connected with the keyword ``AND``. If your package comes with GPL-2.0 and LGPL-2.1 licenses, the definition should look like this: @@ -840,7 +840,7 @@ To do a fast check if this addition was successful, we run: .. note:: It depends on the currently selected platform and its architecture what content this variable will have. The content shown above is an - example for an target. + example for a target. Or re-build the package with the new settings: @@ -1285,7 +1285,7 @@ Creating a Patch Series for a Package To create a patch series for the first time, we can run the following steps. We are still using our *foo-1.1.0* example package here: -Using quilt +Using Quilt """"""""""" We create a special directory for the patch series in the local project @@ -1382,7 +1382,7 @@ that are autogenerated in autotools-based buildsystems. Refer to section :ref:`configure_rebuild` on how PTXdist can handle this special task. -Adding more Patches to a Package +Adding More Patches to a Package If we want to add more patches to an already patched package, we can use @@ -1449,7 +1449,7 @@ content can be: .. _adding_files: -Adding binary only Files +Adding Binary Only Files Sometimes a few binary files have to be added into the root filesystem. @@ -1460,7 +1460,7 @@ On the other hand, sometimes files should be included that are not covered by any open source license and so, should not be shipped in the source code format. -Add binary Files File by File +Add Binary Files File by File ~ Doing to on a file by file base can happen by just using the ``install_copy`` @@ -1481,7 +1481,7 @@ file, we need one call to the ``install_copy`` macro per file. This is even harder if not only a set of files is to be installed, but a whole directory tree with files instead. -Add binary Files via an Archive +Add Binary Files via an Archive ~~~ If a whole tree of files is to be ins
[ptxdist] [PATCH 1/2] doc: dev_manual: add explanation of *_SOURCE variable
Signed-off-by: Ulrich Ölmann --- doc/dev_manual.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index cd1d2e9fc098..e83584634c06 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -368,6 +368,8 @@ PTXdist specific. What does it mean: alternative download locations are known, they can be listed in this variable, delimiter character is the space. +- ``*_SOURCE`` tells PTXdist where to store the downloaded package. + - ``*_DIR`` points to the directory this package will be build later on by PTXdist -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] networkmanager: version bump 1.14.4 -> 1.18.0
Signed-off-by: Ulrich Ölmann --- rules/networkmanager.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 6d31a201a56d..16b7c65ba855 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.14.4 -NETWORKMANAGER_MD5 := 54ce62f0aa18ef6c5e754eaac47494ac +NETWORKMANAGER_VERSION := 1.18.0 +NETWORKMANAGER_MD5 := c8c27116a8083bab5d5fcca0d03e988a NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.14/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.18/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later @@ -80,6 +80,7 @@ NETWORKMANAGER_CONF_OPT = \ --without-consolekit \ --without-session-tracking \ --with-suspend-resume=$(call ptx/ifdef,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT,systemd,upower) \ + --without-ebpf \ --without-selinux \ --without-libaudit \ --with-crypto=gnutls \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] modemmanager: add dependency on libxslt as host-tool
Hi Michael, On Thu, Jun 20 2019 at 12:11 +0200, Michael Olbrich wrote: > On Sun, Jun 16, 2019 at 06:39:34PM +0200, Ulrich Ölmann wrote: >> xsltproc is needed for header generation. > > No. The generated header is shipped with the tarball. This is only needed > if the input for this header is modified with a patch. you are right, indeed I have put patches on top of the tarball. Thanks for clarifying! > Btw, you can add this dependency locally without overwriting the whole > modemmanager.in file: > > $ cat rules/modemmanager-fixup.in > ## SECTION=networking > > config MODEMMANAGER > tristate > # needed because of local patches > select HOST_LIBXSLT > > Konfig will then merge the two occurrences of the symbol. The original one > will make sure the option is enabled and this will add the extra > dependency. Oh, I was unaware of that up to now - very good to know this! Best regards Ulrich > Michael > >> >> Signed-off-by: Ulrich Ölmann >> --- >> rules/modemmanager.in | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/rules/modemmanager.in b/rules/modemmanager.in >> index 50f2d9c6af9d..4cf335efdda3 100644 >> --- a/rules/modemmanager.in >> +++ b/rules/modemmanager.in >> @@ -2,6 +2,7 @@ >> >> menuconfig MODEMMANAGER >> tristate >> +select HOST_LIBXSLT >> select GLIB >> select UDEV >> select LIBGUDEV >> -- >> 2.20.1 -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] templates: meson: wizard.sh: use neat parameter expansion and prevent word splitting
Signed-off-by: Ulrich Ölmann
---
rules/templates/src-meson-prog/wizard.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/templates/src-meson-prog/wizard.sh
b/rules/templates/src-meson-prog/wizard.sh
index 3753d8d0e67d..d98a72585594 100644
--- a/rules/templates/src-meson-prog/wizard.sh
+++ b/rules/templates/src-meson-prog/wizard.sh
@@ -1,13 +1,13 @@
#!/bin/bash
NAME="${1}"
-if [ -z "$NAME" ]; then
+if [ -z "${NAME}" ]; then
echo -n "project name: "
read NAME
fi
VERSION="${3}"
-if [ -z "$VERSION" ]; then
+if [ -z "${VERSION}" ]; then
echo -n "project version: "
read VERSION
fi
@@ -16,7 +16,7 @@ mv "@name@.c" "${NAME}.c"
for i in \
meson.build \
- ${NAME}.c \
+ "${NAME}.c" \
; do
sed -i -e "s/\@name\@/${NAME}/g" \
-e "s/\@version\@/${VERSION}/g" $i
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] modemmanager: add dependency on libxslt as host-tool
xsltproc is needed for header generation. Signed-off-by: Ulrich Ölmann --- rules/modemmanager.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/modemmanager.in b/rules/modemmanager.in index 50f2d9c6af9d..4cf335efdda3 100644 --- a/rules/modemmanager.in +++ b/rules/modemmanager.in @@ -2,6 +2,7 @@ menuconfig MODEMMANAGER tristate + select HOST_LIBXSLT select GLIB select UDEV select LIBGUDEV -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] rootfs: keep /var writable, even if the rootfs is read-only
t; new file mode 100644 > index 0..65bc81470 > --- /dev/null > +++ b/projectroot/usr/lib/systemd/system/var.mount > @@ -0,0 +1,9 @@ > +[Unit] > +Description=Writeable support for '/var' > +Before=local-fs.target > +OnFailure=rescue.service > + > +[Mount] > +Where=/var > +What=varoverlayfs > +Type=varoverlayfs > diff --git a/projectroot/usr/sbin/mount.varoverlayfs > b/projectroot/usr/sbin/mount.varoverlayfs > new file mode 100644 > index 0..f50717aa3 > --- /dev/null > +++ b/projectroot/usr/sbin/mount.varoverlayfs > @@ -0,0 +1,11 @@ > +#!/bin/sh > +# Mount helper tool to mount some kind of writeable filesystem over '/var' > +# (which might be read-only). > +# What kind of filesystem is used to mount over '/var' can be controlled via > +# the 'run-varoverlayfs.mount' mount unit and is usually a RAM disk. > + > +systemctl start run-varoverlayfs.mount > +mkdir -p /run/varoverlayfs/upper > +mkdir -p /run/varoverlayfs/work > +mount -t overlay overlay > -olowerdir=/var,upperdir=/run/varoverlayfs/upper,workdir=/run/varoverlayfs/work > /var > +systemctl stop run-varoverlayfs.mount Using a mount helper here feels very elegant - good idea! :-) > diff --git a/rules/rootfs.in b/rules/rootfs.in > index 04f7a5287..4d96779fa 100644 > --- a/rules/rootfs.in > +++ b/rules/rootfs.in > @@ -179,6 +179,21 @@ config ROOTFS_VAR > > if ROOTFS_VAR > > +config ROOTFS_VAR_OVERLAYFS > + bool > + prompt "overlay '/var' with RAM disk" > + depends on INITMETHOD_SYSTEMD && !ROOTFS_VAR_VOLATILE > + help > + This lets the whole '/var' content be writeable transparently via an > + 'overlayfs'. > + Reading content happens from the underlaying root filesystem, while > + changed content gets stored into a RAM disk instead. This enables all > + applications to read initial data (configuration files for example) > + and let them change this data even if the root filesystem is > read-only. > + Due to these behavior all changes made at run-time aren't persistent s/these behavior/this behavior/ > + by default. > + Read documentation chapter 'Read Only Filesystem' for further details. > + > config ROOTFS_VAR_RUN > bool > select ROOTFS_RUN > diff --git a/rules/rootfs.make b/rules/rootfs.make > index ef5bba7df..aea04a7bf 100644 > --- a/rules/rootfs.make > +++ b/rules/rootfs.make > @@ -30,7 +30,7 @@ $(STATEDIR)/rootfs.targetinstall: > @$(call install_fixup, rootfs,PRIORITY,optional) > @$(call install_fixup, rootfs,SECTION,base) > @$(call install_fixup, rootfs,AUTHOR,"Robert Schwebel > ") > - @$(call install_fixup, rootfs,DESCRIPTION,missing) > + @$(call install_fixup, rootfs,DESCRIPTION, "Filesystem Hierarchy > Standard") Is this and... > > ## > ## install directories in rootfs > @@ -100,7 +100,7 @@ ifdef PTXCONF_ROOTFS_VAR > @$(call install_copy, rootfs, 0, 0, 0755, /var) > endif > ifdef PTXCONF_ROOTFS_VAR_LOG > - @$(call install_copy, rootfs, 0, 0, 0755, /var/log) > + @$(call install_copy, rootfs, 0, 0, 01777, /var/log) ... this and... > endif > ifdef PTXCONF_ROOTFS_VAR_RUN > @$(call install_link, rootfs, ../run, /var/run) > @@ -121,9 +121,13 @@ ifdef PTXCONF_ROOTFS_VAR_SPOOL_CRON > @$(call install_copy, rootfs, 0, 0, 0755, /var/spool/cron) > endif > ifdef PTXCONF_ROOTFS_VAR_TMP > - @$(call install_copy, rootfs, 0, 0, 0755, /var/tmp) > + @$(call install_copy, rootfs, 0, 0, 01777, /var/tmp) ... this hunk necessary for your overlayfs approach? If not, perhaps put it into a separate preparatory patch. > +endif > +ifdef PTXCONF_ROOTFS_VAR_OVERLAYFS > + @$(call install_alternative, rootfs, 0, 0, 0644, > /usr/lib/systemd/system/run-varoverlayfs.mount) > + @$(call install_alternative, rootfs, 0, 0, 0755, > /usr/sbin/mount.varoverlayfs) > + @$(call install_alternative, rootfs, 0, 0, 0644, > /usr/lib/systemd/system/var.mount) > endif > - > > ## > ## install files in rootfs > @@ -142,7 +146,18 @@ ifdef PTXCONF_ROOTFS_GSHADOW > endif > ifdef PTXCONF_ROOTFS_FSTAB > @$(call install_alternative, rootfs, 0, 0, 0644, /etc/fstab) > +ifndef PTXCONF_ROOTFS_VAR_OVERLAYFS > +ifdef PTXCONF_ROOTFS_VAR_TMP > + @$(call install_replace, rootfs, /etc/fstab, #tmp, "tmpfs") > +endif > +ifdef PTXCONF_ROOTFS_VAR_LOG > + @$(call install_replace, rootfs, /etc/fstab, #log, "tmpfs") > +endif > +ifdef PTXCONF_ROOTFS_VAR_LOCK > + @$(call install_replace, rootfs, /etc/fstab, #lock, "tmpfs") > endif > +endif # PTXCONF_ROOTFS_VAR_OVERLAYFS > +endif # PTXCONF_ROOTFS_FSTAB > ifdef PTXCONF_ROOTFS_MTAB_FILE > @$(call install_alternative, rootfs, 0, 0, 0644, /etc/mtab) > endif Good work! Best regards Ulrich -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/5] Clean up templates and add src-meson-prog template
The first three patches clean up some things I stumbled over while working on the addition of the src-meson-prog template which is found in the last two patches. Ulrich Ölmann (5): templates: wizard.sh: remove unused variable templates: wizard.sh: use neat parameter expansion and prevent word splitting templates: wizard.sh: use only one sed process templates: add src-meson-prog template templates: src-meson-prog: introduce version into template project doc/dev_manual.rst| 36 ++-- rules/templates/src-autoconf-lib/wizard.sh| 20 ++--- rules/templates/src-autoconf-prog/wizard.sh | 16 ++-- .../templates/src-autoconf-proglib/wizard.sh | 22 +++-- rules/templates/src-cmake-prog/wizard.sh | 12 ++- rules/templates/src-linux-driver/wizard.sh| 12 ++- rules/templates/src-make-prog/wizard.sh | 12 ++- rules/templates/src-meson-prog/@name@.c | 12 +++ rules/templates/src-meson-prog/COPYING| 12 +++ rules/templates/src-meson-prog/config.h.in| 2 + rules/templates/src-meson-prog/meson.build| 15 rules/templates/src-meson-prog/wizard.sh | 24 ++ rules/templates/src-qmake-prog/wizard.sh | 14 ++-- rules/templates/src-stellaris/wizard.sh | 12 ++- rules/templates/template-src-meson-prog-in| 8 ++ rules/templates/template-src-meson-prog-make | 83 +++ scripts/lib/ptxd_lib_template.sh | 9 +- 17 files changed, 245 insertions(+), 76 deletions(-) create mode 100644 rules/templates/src-meson-prog/@name@.c create mode 100644 rules/templates/src-meson-prog/COPYING create mode 100644 rules/templates/src-meson-prog/config.h.in create mode 100644 rules/templates/src-meson-prog/meson.build create mode 100644 rules/templates/src-meson-prog/wizard.sh create mode 100644 rules/templates/template-src-meson-prog-in create mode 100644 rules/templates/template-src-meson-prog-make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/5] templates: wizard.sh: use neat parameter expansion and prevent word splitting
Signed-off-by: Ulrich Ölmann
---
rules/templates/src-autoconf-lib/wizard.sh | 12 ++--
rules/templates/src-autoconf-prog/wizard.sh| 8
rules/templates/src-autoconf-proglib/wizard.sh | 14 +++---
rules/templates/src-cmake-prog/wizard.sh | 6 +++---
rules/templates/src-linux-driver/wizard.sh | 6 +++---
rules/templates/src-make-prog/wizard.sh| 6 +++---
rules/templates/src-qmake-prog/wizard.sh | 8
rules/templates/src-stellaris/wizard.sh| 6 +++---
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/rules/templates/src-autoconf-lib/wizard.sh
b/rules/templates/src-autoconf-lib/wizard.sh
index 35ef467b033e..e75b96e404de 100644
--- a/rules/templates/src-autoconf-lib/wizard.sh
+++ b/rules/templates/src-autoconf-lib/wizard.sh
@@ -1,12 +1,12 @@
#!/bin/bash
-NAME=$1
+NAME="${1}"
if [ -z "$NAME" ]; then
echo -n "project name: "
read NAME
fi
-NAME_UP=$(echo $NAME | tr '[a-z-]' '[A-Z_]')
-NAME_NODASH=$(echo $NAME | tr '-' '_')
+NAME_UP="$(echo $NAME | tr '[a-z-]' '[A-Z_]')"
+NAME_NODASH="$(echo $NAME | tr '-' '_')"
mv "@name@.c" "${NAME}.c"
mv "lib@name@.h" "lib${NAME}.h"
@@ -22,9 +22,9 @@ mv m4/internal.h .
for i in \
configure.ac \
Makefile.am \
- ${NAME}.c \
- lib${NAME}.h \
- lib${NAME}.pc.in \
+ "${NAME}.c" \
+ "lib${NAME}.h" \
+ "lib${NAME}.pc.in" \
INSTALL \
internal.h \
; do
diff --git a/rules/templates/src-autoconf-prog/wizard.sh
b/rules/templates/src-autoconf-prog/wizard.sh
index de63547e5b84..4b36c5e1f6f0 100644
--- a/rules/templates/src-autoconf-prog/wizard.sh
+++ b/rules/templates/src-autoconf-prog/wizard.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-NAME=$1
+NAME="${1}"
if [ -z "$NAME" ]; then
echo -n "project name: "
read NAME
fi
-NAME_UP=$(echo $NAME | tr '[a-z-]' '[A-Z_]')
+NAME_UP="$(echo $NAME | tr '[a-z-]' '[A-Z_]')"
mv "@name@.c" "${NAME}.c"
-NAME_NODASH=$(echo $NAME | tr '-' '_')
+NAME_NODASH="$(echo $NAME | tr '-' '_')"
# prepare and instantiate the M4 macros
mkdir -v m4
@@ -20,7 +20,7 @@ mv m4/internal.h .
for i in \
configure.ac \
Makefile.am \
- ${NAME}.c \
+ "${NAME}.c" \
INSTALL \
internal.h \
; do
diff --git a/rules/templates/src-autoconf-proglib/wizard.sh
b/rules/templates/src-autoconf-proglib/wizard.sh
index 6951dcd5268c..7c10b35f856b 100644
--- a/rules/templates/src-autoconf-proglib/wizard.sh
+++ b/rules/templates/src-autoconf-proglib/wizard.sh
@@ -1,12 +1,12 @@
#!/bin/bash
-NAME=$1
+NAME="${1}"
if [ -z "$NAME" ]; then
echo -n "project name: "
read NAME
fi
-NAME_UP=$(echo $NAME | tr '[a-z-]' '[A-Z_]')
-NAME_NODASH=$(echo $NAME | tr '-' '_')
+NAME_UP="$(echo $NAME | tr '[a-z-]' '[A-Z_]')"
+NAME_NODASH="$(echo $NAME | tr '-' '_')"
mv "@name@.c" "${NAME}.c"
mv "lib@name@.c" "lib${NAME}.c"
@@ -23,10 +23,10 @@ mv m4/internal.h .
for i in \
configure.ac \
Makefile.am \
- ${NAME}.c \
- lib${NAME}.c \
- lib${NAME}.h \
- lib${NAME}.pc.in \
+ "${NAME}.c" \
+ "lib${NAME}.c" \
+ "lib${NAME}.h" \
+ "lib${NAME}.pc.in" \
INSTALL \
internal.h \
; do
diff --git a/rules/templates/src-cmake-prog/wizard.sh
b/rules/templates/src-cmake-prog/wizard.sh
index 20c28f29d85f..6cd7ccbbfb1f 100644
--- a/rules/templates/src-cmake-prog/wizard.sh
+++ b/rules/templates/src-cmake-prog/wizard.sh
@@ -1,17 +1,17 @@
#!/bin/bash
-NAME=$1
+NAME="${1}"
if [ -z "$NAME" ]; then
echo -n "project name: "
read NAME
fi
-NAME_UP=$(echo $NAME | tr '[a-z-]' '[A-Z_]')
+NAME_UP="$(echo $NAME | tr '[a-z-]' '[A-Z_]')"
mv "@name@.cpp" "${NAME}.cpp"
for i in \
CMakeLists.txt \
- ${NAME}.cpp \
+ "${NAME}.cpp" \
; do
sed -i -e "s/\@name\@/${NAME}/g" $i
sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
diff --git a/rules/templates/src-linux-driver/wizard.sh
b/rules/templates/src-linux-driver/wizard.sh
index 61d47c415a17..61b31a845823 100644
--- a/rules/templates/src-linux-driver/wizard.sh
+++ b/rules/templates/src-linux-driver/wizard.sh
@@ -1,17 +1,17 @@
#!/bin/bash
-NAME=$1
+NAME="${1}"
if [ -z "$NAME" ]; then
echo -n "project name: "
read NAME
fi
-NAME_UP=$(echo $NAME | tr '[a-z-]' '[A-Z_]')
+NAME_UP="$(echo $NAME | tr '[a-z-]' '[A-Z_]')"
mv "@name@.c" "${NAME}.c"
for i in \
Makefile \
- ${NAME}.c \
+ "${NAME}.c
[ptxdist] [PATCH 4/5] templates: add src-meson-prog template
Signed-off-by: Ulrich Ölmann
---
doc/dev_manual.rst | 36 +++--
rules/templates/src-meson-prog/@name@.c | 12 +++
rules/templates/src-meson-prog/COPYING | 12 +++
rules/templates/src-meson-prog/config.h.in | 1 +
rules/templates/src-meson-prog/meson.build | 13 +++
rules/templates/src-meson-prog/wizard.sh | 17
rules/templates/template-src-meson-prog-in | 8 ++
rules/templates/template-src-meson-prog-make | 83
scripts/lib/ptxd_lib_template.sh | 7 ++
9 files changed, 182 insertions(+), 7 deletions(-)
create mode 100644 rules/templates/src-meson-prog/@name@.c
create mode 100644 rules/templates/src-meson-prog/COPYING
create mode 100644 rules/templates/src-meson-prog/config.h.in
create mode 100644 rules/templates/src-meson-prog/meson.build
create mode 100644 rules/templates/src-meson-prog/wizard.sh
create mode 100644 rules/templates/template-src-meson-prog-in
create mode 100644 rules/templates/template-src-meson-prog-make
diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst
index e17aa9b1bb58..dfadcb241891 100644
--- a/doc/dev_manual.rst
+++ b/doc/dev_manual.rst
@@ -206,6 +206,14 @@ handle:
and their settings. Creating such a package will also create a simple
template project to be used as a starting point for development.
+- **src-meson-prog**: This kind of package is built for the target.
+ It’s intended for developments based on the *meson* buildsystem.
+ Various projects are using *meson* today and can be built
+ with this package type. PTXdist will prepare it to compile sources in
+ accordance to the target libraries and their settings. Creating such
+ a package will also create a simple template project to be used as a
+ starting point for development.
+
- **font**: This package is a helper to add X font files to the root
filesystem. This package does not create an additional IPKG, instead
it adds the font to the existing font IPKG. This includes the
@@ -1156,12 +1164,12 @@ So, in the rule file only the two variables
``FOO_MAKE_ENV`` and
package’s buildsystem. If the package cannot be built in parallel, we
can also add the ``FOO_MAKE_PAR := NO``. ``YES`` is the default.
-Managing CMake / QMake Packages
-^^^
+Managing CMake/QMake/Meson Packages
+^^^
-Building packages that use ``cmake`` or ``qmake`` is much like building
-packages with an autotools based buildsystem. We need to specify the
-configuration tool:
+Building packages that use ``cmake``, ``qmake`` or ``meson`` is much like
+building packages with an autotools based buildsystem. We need to specify
+the configuration tool:
.. code-block:: make
@@ -1173,6 +1181,12 @@ or
FOO_CONF_TOOL := qmake
+or respectively
+
+.. code-block:: make
+
+FOO_CONF_TOOL := meson
+
And provide the correct configuration options. The syntax is different so
PTXdist provides additional macros to simplify configurable features.
For ``cmake`` the configuration options typically look like this:
@@ -1192,8 +1206,16 @@ For ``qmake`` the configuration options typically look
like this:
$(CROSS_QMAKE_OPT) \
PREFIX=/usr
-Please note that currently only host and target ``cmake`` packages and only
-target ``qmake`` packages are supported.
+And for ``meson`` the configuration options typically look like this:
+
+.. code-block:: make
+
+FOO_CONF_OPT := \
+ $(CROSS_MESON_USR) \
+ -Dbar=$(call ptx/truefalse,PTXCONF_FOO_BAR)
+
+Please note that currently only host and target ``cmake``\/``meson`` packages
+and only target ``qmake`` packages are supported.
Managing Python Packages
diff --git a/rules/templates/src-meson-prog/@name@.c
b/rules/templates/src-meson-prog/@name@.c
new file mode 100644
index ..061debf310bc
--- /dev/null
+++ b/rules/templates/src-meson-prog/@name@.c
@@ -0,0 +1,12 @@
+#include
+#include
+
+#include "config.h"
+
+int main(int argc, char *argv[])
+{
+ printf("Hello World, I'm @name@!\n");
+ printf("My license is " LICENSE_STR ".\n");
+
+ exit(EXIT_SUCCESS);
+}
diff --git a/rules/templates/src-meson-prog/COPYING
b/rules/templates/src-meson-prog/COPYING
new file mode 100644
index ..1844a019b31f
--- /dev/null
+++ b/rules/templates/src-meson-prog/COPYING
@@ -0,0 +1,12 @@
+Copyright (C) 2006 by Rob Landley
+
+Permission to use, copy, modify, and/or distribute this software for any
purpose
+with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
[ptxdist] [PATCH 5/5] templates: src-meson-prog: introduce version into template project
Signed-off-by: Ulrich Ölmann
---
rules/templates/src-meson-prog/@name@.c| 2 +-
rules/templates/src-meson-prog/config.h.in | 1 +
rules/templates/src-meson-prog/meson.build | 2 ++
rules/templates/src-meson-prog/wizard.sh | 9 -
scripts/lib/ptxd_lib_template.sh | 2 +-
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/rules/templates/src-meson-prog/@name@.c
b/rules/templates/src-meson-prog/@name@.c
index 061debf310bc..1911e620d09d 100644
--- a/rules/templates/src-meson-prog/@name@.c
+++ b/rules/templates/src-meson-prog/@name@.c
@@ -5,7 +5,7 @@
int main(int argc, char *argv[])
{
- printf("Hello World, I'm @name@!\n");
+ printf("Hello World, I'm version " VERSION_STR " of @name@!\n");
printf("My license is " LICENSE_STR ".\n");
exit(EXIT_SUCCESS);
diff --git a/rules/templates/src-meson-prog/config.h.in
b/rules/templates/src-meson-prog/config.h.in
index b0ee7ec65121..4d90c2e66ea8 100644
--- a/rules/templates/src-meson-prog/config.h.in
+++ b/rules/templates/src-meson-prog/config.h.in
@@ -1 +1,2 @@
+#define VERSION_STR "@version@"
#define LICENSE_STR "@license@"
diff --git a/rules/templates/src-meson-prog/meson.build
b/rules/templates/src-meson-prog/meson.build
index 946e1850cfd5..de559eb72693 100644
--- a/rules/templates/src-meson-prog/meson.build
+++ b/rules/templates/src-meson-prog/meson.build
@@ -1,8 +1,10 @@
project('@name@', 'c',
+ version : '@version@',
license : '0BSD',
default_options : ['warning_level=3'])
conf_data = configuration_data()
+conf_data.set('version', meson.project_version())
conf_data.set('license', meson.project_license()[0])
configure_file(input : 'config.h.in',
output : 'config.h',
diff --git a/rules/templates/src-meson-prog/wizard.sh
b/rules/templates/src-meson-prog/wizard.sh
index 305530b654d4..3753d8d0e67d 100644
--- a/rules/templates/src-meson-prog/wizard.sh
+++ b/rules/templates/src-meson-prog/wizard.sh
@@ -6,12 +6,19 @@ if [ -z "$NAME" ]; then
read NAME
fi
+VERSION="${3}"
+if [ -z "$VERSION" ]; then
+ echo -n "project version: "
+ read VERSION
+fi
+
mv "@name@.c" "${NAME}.c"
for i in \
meson.build \
${NAME}.c \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@version\@/${VERSION}/g" $i
done
diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
index 8ac3312dc775..b437c52f24ed 100644
--- a/scripts/lib/ptxd_lib_template.sh
+++ b/scripts/lib/ptxd_lib_template.sh
@@ -211,7 +211,7 @@ ptxd_template_write_src() {
return
fi &&
template_dir=$(dirname "${template_src}") &&
-( cd "${dst}" && bash wizard.sh "${package}" "${template_dir}") &&
+( cd "${dst}" && bash wizard.sh "${package}" "${template_dir}"
"${VERSION}") &&
rm -f "${dst}/wizard.sh"
}
export -f ptxd_template_write_src
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 3/5] templates: wizard.sh: use only one sed process
Signed-off-by: Ulrich Ölmann
---
rules/templates/src-autoconf-lib/wizard.sh | 6 +++---
rules/templates/src-autoconf-prog/wizard.sh| 6 +++---
rules/templates/src-autoconf-proglib/wizard.sh | 6 +++---
rules/templates/src-cmake-prog/wizard.sh | 4 ++--
rules/templates/src-linux-driver/wizard.sh | 4 ++--
rules/templates/src-make-prog/wizard.sh| 4 ++--
rules/templates/src-qmake-prog/wizard.sh | 4 ++--
rules/templates/src-stellaris/wizard.sh| 4 ++--
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/rules/templates/src-autoconf-lib/wizard.sh
b/rules/templates/src-autoconf-lib/wizard.sh
index e75b96e404de..a451b4f71e49 100644
--- a/rules/templates/src-autoconf-lib/wizard.sh
+++ b/rules/templates/src-autoconf-lib/wizard.sh
@@ -28,8 +28,8 @@ for i in \
INSTALL \
internal.h \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@namenodash\@/${NAME_NODASH}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@namenodash\@/${NAME_NODASH}/g" \
+ -e "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-autoconf-prog/wizard.sh
b/rules/templates/src-autoconf-prog/wizard.sh
index 4b36c5e1f6f0..b2d78f5d592d 100644
--- a/rules/templates/src-autoconf-prog/wizard.sh
+++ b/rules/templates/src-autoconf-prog/wizard.sh
@@ -24,8 +24,8 @@ for i in \
INSTALL \
internal.h \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@namenodash\@/${NAME_NODASH}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@namenodash\@/${NAME_NODASH}/g" \
+ -e "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-autoconf-proglib/wizard.sh
b/rules/templates/src-autoconf-proglib/wizard.sh
index 7c10b35f856b..f84ca8da8a12 100644
--- a/rules/templates/src-autoconf-proglib/wizard.sh
+++ b/rules/templates/src-autoconf-proglib/wizard.sh
@@ -30,7 +30,7 @@ for i in \
INSTALL \
internal.h \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@namenodash\@/${NAME_NODASH}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ "s/\@namenodash\@/${NAME_NODASH}/g" \
+ "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-cmake-prog/wizard.sh
b/rules/templates/src-cmake-prog/wizard.sh
index 6cd7ccbbfb1f..253eedca9cce 100644
--- a/rules/templates/src-cmake-prog/wizard.sh
+++ b/rules/templates/src-cmake-prog/wizard.sh
@@ -13,7 +13,7 @@ for i in \
CMakeLists.txt \
"${NAME}.cpp" \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-linux-driver/wizard.sh
b/rules/templates/src-linux-driver/wizard.sh
index 61b31a845823..20c8df88a38c 100644
--- a/rules/templates/src-linux-driver/wizard.sh
+++ b/rules/templates/src-linux-driver/wizard.sh
@@ -13,7 +13,7 @@ for i in \
Makefile \
"${NAME}.c" \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-make-prog/wizard.sh
b/rules/templates/src-make-prog/wizard.sh
index 61b31a845823..20c8df88a38c 100644
--- a/rules/templates/src-make-prog/wizard.sh
+++ b/rules/templates/src-make-prog/wizard.sh
@@ -13,7 +13,7 @@ for i in \
Makefile \
"${NAME}.c" \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-qmake-prog/wizard.sh
b/rules/templates/src-qmake-prog/wizard.sh
index 497706e2caf5..cd0b94f4cdc8 100644
--- a/rules/templates/src-qmake-prog/wizard.sh
+++ b/rules/templates/src-qmake-prog/wizard.sh
@@ -14,7 +14,7 @@ for i in \
"${NAME}.pro" \
"${NAME}.cpp" \
; do
- sed -i -e "s/\@name\@/${NAME}/g" $i
- sed -i -e "s/\@NAME\@/${NAME_UP}/g" $i
+ sed -i -e "s/\@name\@/${NAME}/g" \
+ -e "s/\@NAME\@/${NAME_UP}/g" $i
done
diff --git a/rules/templates/src-stellaris/wizard.sh
b/rules/templates/src-stellaris/wizard.sh
index 8ebce80c08b2..8350fc40e4d5 100644
--- a/rules/templates/src-stellaris/wizard.sh
[ptxdist] [PATCH] doc: ref manual: fix typos
Signed-off-by: Ulrich Ölmann --- doc/ref_manual.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst index e1e14f746fa7..0ac92a9a0e66 100644 --- a/doc/ref_manual.rst +++ b/doc/ref_manual.rst @@ -807,9 +807,9 @@ PTXdist with the ``print`` parameter: ``install_alternative`` is used by upstream PTXdist packages to install config files. In some rare use-cases the file should not be installed at all. For example if the config file is generated at runtime or provided by -a special configuration package. This is possibly by creating a symlink to +a special configuration package. This is possible by creating a symlink to ``/dev/null`` instead of a file at one of the locations described above. -PTXdist skip installing the file if it detects such a symlink. +PTXdist skips installing the file if it detects such a symlink. install_link -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] hostapd: version bump 2.6 -> 2.7
Signed-off-by: Ulrich Ölmann --- config/hostapd/defconfig | 36 +--- rules/hostapd.make | 4 ++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/config/hostapd/defconfig b/config/hostapd/defconfig index 28db7f31c04a..878daace0bea 100644 --- a/config/hostapd/defconfig +++ b/config/hostapd/defconfig @@ -50,9 +50,6 @@ CONFIG_IAPP=y # WPA2/IEEE 802.11i RSN pre-authentication CONFIG_RSN_PREAUTH=y -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y - # IEEE 802.11w (management frame protection) CONFIG_IEEE80211W=y @@ -157,6 +154,12 @@ CONFIG_WNM=y # IEEE 802.11ac (Very High Throughput) support CONFIG_IEEE80211AC=y +# IEEE 802.11ax HE support +# Note: This is experimental and work in progress. The definitions are still +# subject to change and this should not be expected to interoperate with the +# final IEEE 802.11ax version. +#CONFIG_IEEE80211AX=y + # Remove debugging code that is printing out debug messages to stdout. # This can be used to reduce the size of the hostapd considerably if debugging # code is not needed. @@ -166,6 +169,9 @@ CONFIG_IEEE80211AC=y # Disabled by default. CONFIG_DEBUG_FILE=y +# Send debug messages to syslog instead of stdout +#CONFIG_DEBUG_SYSLOG=y + # Add support for sending all debug messages (regardless of debug verbosity) # to the Linux kernel tracing facility. This helps debug the entire stack by # making it easy to record everything happening from the driver up into the @@ -256,6 +262,7 @@ CONFIG_VLAN_NETLINK=y # openssl = OpenSSL (default) # gnutls = GnuTLS # internal = Internal TLSv1 implementation (experimental) +# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental) # none = Empty template CONFIG_TLS=openssl @@ -268,6 +275,10 @@ CONFIG_TLSV11=y # can be enabled to enable use of stronger crypto algorithms. CONFIG_TLSV12=y +# Select which ciphers to use by default with OpenSSL if the user does not +# specify them. +#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW" + # If CONFIG_TLS=internal is used, additional library and include paths are # needed for LibTomMath. Alternatively, an integrated, minimal version of # LibTomMath can be used. See beginning of libtommath.c for details on benefits @@ -343,3 +354,22 @@ CONFIG_ACS=y # a client, from which a signature can be produced which can identify the model # of client device like "Nexus 6P" or "iPhone 5s". #CONFIG_TAXONOMY=y + +# Fast Initial Link Setup (FILS) (IEEE 802.11ai) +# Note: This is an experimental and not yet complete implementation. This +# should not be enabled for production use. +#CONFIG_FILS=y +# FILS shared key authentication with PFS +#CONFIG_FILS_SK_PFS=y + +# Include internal line edit mode in hostapd_cli. This can be used to provide +# limited command line editing and history support. +CONFIG_WPA_CLI_EDIT=y + +# Opportunistic Wireless Encryption (OWE) +# Experimental implementation of draft-harkins-owe-07.txt +#CONFIG_OWE=y + +# Override default value for the wpa_disable_eapol_key_retries configuration +# parameter. See that parameter in hostapd.conf for more details. +#CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1 diff --git a/rules/hostapd.make b/rules/hostapd.make index 340b764c202b..2ca5f642a125 100644 --- a/rules/hostapd.make +++ b/rules/hostapd.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_HOSTAPD) += hostapd # Paths and names # HOSTAPD_NAME := hostapd -HOSTAPD_VERSION:= 2.6 -HOSTAPD_MD5:= eaa56dce9bd8f1d195eb62596eab34c7 +HOSTAPD_VERSION:= 2.7 +HOSTAPD_MD5:= 8d3799f3a3c247cff47d41503698721b HOSTAPD:= $(HOSTAPD_NAME)-$(HOSTAPD_VERSION) HOSTAPD_SUFFIX := tar.gz HOSTAPD_URL:= http://w1.fi/releases/$(HOSTAPD).$(HOSTAPD_SUFFIX) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] modemmanager: version bump 1.8.0 -> 1.8.2
Signed-off-by: Ulrich Ölmann --- rules/modemmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/modemmanager.make b/rules/modemmanager.make index 04ae5116b7c9..d431940b5bd8 100644 --- a/rules/modemmanager.make +++ b/rules/modemmanager.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager # # Paths and names # -MODEMMANAGER_VERSION := 1.8.0 -MODEMMANAGER_MD5 := 89d9d6b230bbdd5e54a7c44f423cf34c +MODEMMANAGER_VERSION := 1.8.2 +MODEMMANAGER_MD5 := a49c9f73e46c7b89e5efedda250d22c0 MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) MODEMMANAGER_SUFFIX:= tar.xz MODEMMANAGER_URL := http://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) -- 2.19.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] fix-permissions.in: fix typo
Signed-off-by: Ulrich Ölmann --- rules/fix-permissions.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/fix-permissions.in b/rules/fix-permissions.in index 6c7d9653d866..483439ed4fb3 100644 --- a/rules/fix-permissions.in +++ b/rules/fix-permissions.in @@ -5,7 +5,7 @@ config FIX_PERMISSIONS prompt "create primary rootfs devnodes for nfs and fix permissions" help This function is useful for development via nfsroot. Initially, the - /dev/null an /dev/console devnodes are missing in a fresh sysroot for + /dev/null and /dev/console devnodes are missing in a fresh sysroot for nfs, preventing a successful system startup. However, creating them requires system administrator privileges. -- 2.18.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] iptables: fix typo
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- rules/iptables.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/iptables.in b/rules/iptables.in index 3cad506d09c2..846e5334a1d9 100644 --- a/rules/iptables.in +++ b/rules/iptables.in @@ -78,6 +78,6 @@ config IPTABLES_NFTABLES_COMPAT select NFTABLES prompt "nftables compat" help - install xtables-compat-multi, allowing compability with nftables + install xtables-compat-multi, allowing compatibility with nftables endif -- 2.16.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] polkit: automake: add missing conditional HAVE_INTROSPECTION
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- ...dd-missing-conditional-HAVE_INTROSPECTION.patch | 130 + patches/polkit-0.105/series| 3 +- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch diff --git a/patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch b/patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch new file mode 100644 index ..88afa7a0023b --- /dev/null +++ b/patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch @@ -0,0 +1,130 @@ +From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelm...@pengutronix.de> +Date: Wed, 4 Oct 2017 10:57:38 +0200 +Subject: [PATCH] automake: add missing conditional HAVE_INTROSPECTION +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Copy the corresponding m4 file from gobject-introspection-1.52.1. + +Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> +--- + Makefile.am | 2 ++ + m4/introspection.m4 | 96 + + 2 files changed, 98 insertions(+) + create mode 100644 m4/introspection.m4 + +diff --git a/Makefile.am b/Makefile.am +index 01f0a4bae8f3..d7ad566dc5f7 100644 +--- a/Makefile.am b/Makefile.am +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = actions data src docs po test + + NULL = +diff --git a/m4/introspection.m4 b/m4/introspection.m4 +new file mode 100644 +index ..d89c3d907d9c +--- /dev/null b/m4/introspection.m4 +@@ -0,0 +1,96 @@ ++dnl -*- mode: autoconf -*- ++dnl Copyright 2009 Johan Dahlin ++dnl ++dnl This file is free software; the author(s) gives unlimited ++dnl permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++ ++# serial 1 ++ ++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ++[ ++AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++AC_BEFORE([LT_INIT],[$0])dnl setup libtool first ++ ++dnl enable/disable introspection ++m4_if([$2], [require], ++[dnl ++enable_introspection=yes ++],[dnl ++AC_ARG_ENABLE(introspection, ++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], ++ [Enable introspection for this build]),, ++ [enable_introspection=auto]) ++])dnl ++ ++AC_MSG_CHECKING([for gobject-introspection]) ++ ++dnl presence/version checking ++AS_CASE([$enable_introspection], ++[no], [dnl ++found_introspection="no (disabled, use --enable-introspection to enable)" ++],dnl ++[yes],[dnl ++PKG_CHECK_EXISTS([gobject-introspection-1.0],, ++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) ++PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], ++ found_introspection=yes, ++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) ++],dnl ++[auto],[dnl ++PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) ++ dnl Canonicalize enable_introspection ++ enable_introspection=$found_introspection ++],dnl ++[dnl ++AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) ++])dnl ++ ++AC_MSG_RESULT([$found_introspection]) ++ ++INTROSPECTION_SCANNER= ++INTROSPECTION_COMPILER= ++INTROSPECTION_GENERATE= ++INTROSPECTION_GIRDIR= ++INTROSPECTION_TYPELIBDIR= ++if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++fi ++AC_SUBST(INTROSPECTION_SCANNER) ++AC_SUBST(INTROSPECTION_COMPILER) ++AC_SUBST(INTROSPECTION_GENERATE) ++AC_SUBST(INTROSPECTION_GIRDI
[ptxdist] [PATCH] networkmanager: version bump: 1.8.2-> 1.8.4
New stable release with most notable fixes: * Fix crash unregistering object manager in libnm on restart of NetworkManager. Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- rules/networkmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index e8905d840919..5a2cd6bb9e7d 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.8.2 -NETWORKMANAGER_MD5 := 1acf7a551905ae85d9987aadbb5f7205 +NETWORKMANAGER_VERSION := 1.8.4 +NETWORKMANAGER_MD5 := fefd157d884f7fd50384268704c5aa5d NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Build speed ups
Hi there, On Mon, Sep 18, 2017 at 07:14:52PM +0200, Root wrote: > > What do you use to speed up your builds? > > do you know PTXCONF_PROJECT_CREATE_DEVPKGS and PTXCONF_PROJECT_USE_DEVPKGS? > You find this options in ptxdist menuconfig submenu Project name & version. > > This does not speed up the compile step, it skips the compile step and use > prebuild packages from an earlier build instead for all packages you > want to do this. quite recently we reviewed the corresponding section of the PTXdist documentation, see http://testbed.ptxdist.org/doc/daily_work_section.html#using-pre-built-archives for more information. Best regards Ulrich -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/6] doc: pre-built packages: adjust capitalization in headings
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 264d623d5532..5da0722c9bd6 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -566,7 +566,7 @@ packages at the same time. Never worry again about your local host and how slow it is. With the help of *ICECC* every host will be a high speed development machine. -Using pre-built archives +Using Pre-Built Archives PTXdist is a tool which creates all the required parts of a target’s @@ -602,7 +602,7 @@ with care and so it is not enabled and used as default. This section describes how to make use of this PTXdist feature and what pitfalls exist when doing so. -Creating pre-built archives +Creating Pre-Built Archives ~~~ To make PTXdist creating pre-built archives, enable this feature prior a @@ -626,7 +626,7 @@ additional archive files with the name scheme ``*-dev.tar.gz``. These files are the pre-built archives which PTXdist can use later on to re-build the project. -Using pre-built archives +Using Pre-Built Archives To make PTXdist using pre-built archives, enable this feature prior a @@ -687,7 +687,7 @@ must be done manually by the user of the PTXdist project. Doing so, we can decide on a package by package base if its pre-built archive should be used or not. -Packages without pre-built archives support +Packages without Pre-Built Archives Support ~~~ No host nor cross related packages can be used based on their pre-built @@ -707,7 +707,7 @@ archives, but there are a few exceptions: - some other somehow broken packages all marked with a ``_DEVPKG := NO`` in their corresponding rule file -Workflow with pre-built archives +Workflow with Pre-Built Archives We starting with an empty PTXdist project and enabling the pre-built @@ -744,7 +744,7 @@ in this step. $ cp platform-/packages/*-dev.tar.gz /home/jbe/OSELAS.BSP/Pengutronix/OSELAS.BSP-Pengutronix-Generic -Use cases +Use Cases ~ Some major possible use cases are covered in this section: -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 5/6] doc: pre-built packages: enhance phrasing
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 53 ++--- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 34be5aa4c535..2fb27dad1387 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -582,10 +582,10 @@ about 6 hours. Introduction -While the development of a PTXdist project it is needed to clean and +While developing a PTXdist project it is necessary to clean and re-build everything from time to time to get a re-synced project result which honors all changes made in the project. But since cleaning and -re-building everything from time to time is a very good test case if +re-building everything from time to time is a very good test case for if some adaptions are still missing or if everything is complete, it can be a real time sink to do so. @@ -594,9 +594,9 @@ archives from the last run which includes all the files the package's build system has installed while the PTXdist's *install* stage runs for it. -The next time PTXdist should build a package it can use the results from +The next time PTXdist shall build a package it can use the results from the last run instead. This feature can drastically reduce the time to -re-build the whole project. But also, this PTXdist feature must handle +re-build the whole project. But also, this PTXdist feature must be handled with care and so it is not enabled and used as default. This section describes how to make use of this PTXdist feature and what @@ -605,7 +605,7 @@ pitfalls exist when doing so. Creating Pre-Built Archives ~~~ -To make PTXdist creating pre-built archives, enable this feature prior a +To make PTXdist create pre-built archives, enable this feature prior to a build in the menu: :: @@ -629,7 +629,7 @@ re-build the project. Using Pre-Built Archives -To make PTXdist using pre-built archives, enable this feature prior a +To make PTXdist use pre-built archives, enable this feature prior to a build in the menu: :: @@ -640,14 +640,14 @@ build in the menu: [*] use pre-built archives () -With the next build (e.g. ``ptxdist go``) PTXdist will look for a -specific package if its corresponding pre-built archive does exist. If -it does exist and the used hash value in the pre-built archive's +During the next build (e.g. ``ptxdist go``) PTXdist will look for a +specific package if its corresponding pre-built archive exists. If +it exists and the used hash value in the pre-built archive's filename matches, PTXdist will skip all source archive handling (extract, patch, compile and install) and just extract and use the pre-built archive's content. -A regular and safe usecase of pre-built archives is: +Sufficient conditions for safe application of pre-built archives are: - using one pre-built archive pool for one specific PTXdist project. @@ -658,11 +658,10 @@ A regular and safe usecase of pre-built archives is: - no package with a pre-built archive in the project is under development. -The hash as a part of the pre-built archive's filename does only reflect +The hash as a part of the pre-built archive's filename only reflects the package's configuration made in the menu (``ptxdist menuconfig``). If this package specific configuration changes, a new hash value will be -the result and PTXdist can select the corresponding correct pre-built -archive. +the result and PTXdist can select the matching pre-built archive. This hash value change is an important fact, as many things outside and inside the package can have a big impact of the binary result but @@ -672,55 +671,55 @@ Please be careful when using the pre-built archives if you: - intend to switch to a different toolchain with the next build. -- change the patch set applied to the corresponding package, e.g. a +- change the patch set applied to the corresponding package, e.g. the package is under development. - change the hard coded configure settings in the package's rule file, - e.g. a package is under development. + e.g. the package is under development. - intend to use one pre-built archive pool from different PTXdist projects. To consider all these precautions the generated pre-built archives are -not transferred automatically where the next build expects them. This +not transferred automatically to where the next build expects them. This must be done manually by the user of the PTXdist project. Doing so, we -can decide on a package by package base if its pre-built archive should +can decide on a package by package basis if its pre-built archive should be used or not. Packages without Pre-Built Archives Support ~~~ -No host nor cross related packages can be used based on their pre-built -archives. These kind of packages are alwa
[ptxdist] [PATCH v2 1/6] doc: pre-built packages: fix typos
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 84 +++--- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 460693021606..264d623d5532 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -566,7 +566,7 @@ packages at the same time. Never worry again about your local host and how slow it is. With the help of *ICECC* every host will be a high speed development machine. -Using pre-build archives +Using pre-built archives PTXdist is a tool which creates all the required parts of a target’s @@ -600,12 +600,12 @@ re-build the whole project. But also, this PTXdist feature must handle with care and so it is not enabled and used as default. This section describes how to make use of this PTXdist feature and what -pitfalls exists when doing so. +pitfalls exist when doing so. -Creating pre-build archives +Creating pre-built archives ~~~ -To make PTXdist creating pre-build archives, enable this feature prior a +To make PTXdist creating pre-built archives, enable this feature prior a build in the menu: :: @@ -613,7 +613,7 @@ build in the menu: $ ptxdist menuconfig Project Name & Version ---> -[*] create pre-build archives +[*] create pre-built archives Now run a regular build of the whole project: @@ -622,14 +622,14 @@ Now run a regular build of the whole project: $ ptxdist go When the build is finished, the directory ``packages`` contains -additional archives files with the name scheme ``*-dev.tar.gz``. These -files are the pre-build archives which PTXdist can use later on to +additional archive files with the name scheme ``*-dev.tar.gz``. These +files are the pre-built archives which PTXdist can use later on to re-build the project. -Using pre-build archives +Using pre-built archives -To make PTXdist using pre-build archives, enable this feature prior a +To make PTXdist using pre-built archives, enable this feature prior a build in the menu: :: @@ -637,38 +637,38 @@ build in the menu: $ ptxdist menuconfig Project Name & Version ---> -[*] use pre-build archives +[*] use pre-built archives () With the next build (e.g. ``ptxdist go``) PTXdist will look for a -specific package if its corresponding pre-build archive does exist. If -it does exist and the used hash value in the pre-build archive’s +specific package if its corresponding pre-built archive does exist. If +it does exist and the used hash value in the pre-built archive’s filename matches, PTXdist will skip all source archive handling (extract, patch, compile and install) and just extract and use the -pre-build archive’s content. +pre-built archive’s content. -A regular and save usecase of pre-build archives is: +A regular and safe usecase of pre-built archives is: -- using one pre-build archive pool for one specific PTXdist project. +- using one pre-built archive pool for one specific PTXdist project. - using a constant PTXdist version all the time. - using a constant OSELAS.Toolchain() version all the time. -- no package with a pre-build archive in the project is under +- no package with a pre-built archive in the project is under development. -The hash as a part of the pre-build archive’s filename does only reflect +The hash as a part of the pre-built archive’s filename does only reflect the package’s configuration made in the menu (``ptxdist menuconfig``). If this package specific configuration changes, a new hash value will be -the result and PTXdist can select the corresponding correct pre-build +the result and PTXdist can select the corresponding correct pre-built archive. This hash value change is an important fact, as many things outside and inside the package can have a big impact of the binary result but without a hash value change! -Please be careful when using the pre-build archives if you: +Please be careful when using the pre-built archives if you: - intend to switch to a different toolchain with the next build. @@ -678,48 +678,48 @@ Please be careful when using the pre-build archives if you: - change the hard coded configure settings in the package’s rule file, e.g. a package is under development -- intend to use one pre-build archive pool from different PTXdist +- intend to use one pre-built archive pool from different PTXdist projects. -To consider all these precautions the generated pre-build archives are -not transfered automatically where the next build expects them. This +To consider all these precautions the generated pre-built archives are +not transferred automatically where the next build expects them. This must be done manually by the user of the PTXdist project. Doing so, we -can decide on a pac
[ptxdist] [PATCH v2 6/6] doc: pre-built packages: some additions
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 8 1 file changed, 8 insertions(+) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 2fb27dad1387..431f0666e067 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -680,12 +680,18 @@ Please be careful when using the pre-built archives if you: - intend to use one pre-built archive pool from different PTXdist projects. +- change a global PTXdist configuration parameter (e.g. PTXCONF_GLOBAL_IPV6). + To consider all these precautions the generated pre-built archives are not transferred automatically to where the next build expects them. This must be done manually by the user of the PTXdist project. Doing so, we can decide on a package by package basis if its pre-built archive should be used or not. +If you are unsure if your modifications rendered some or all of your pre-built +archives invalid you can always delete and build them again to be on the safe +side. + Packages without Pre-Built Archives Support ~~~ @@ -753,6 +759,8 @@ Some major possible use cases are covered in this section: - share pre-built archives between two platforms based on the same architecture. +- increase reproducibility of binaries. + To simply speed up a re-build of the whole project (without development on any of the used packages) we just can copy all ``*-dev.tar.gz`` archives after the first build to the location where PTXdist expects -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 4/6] doc: pre-built packages: english genitive uses an apostrophe
Exchange U+2019 (right single quotation mark) by a simple apostrophe. Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index e82e1724701f..34be5aa4c535 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -569,7 +569,7 @@ development machine. Using Pre-Built Archives -PTXdist is a tool which creates all the required parts of a target’s +PTXdist is a tool which creates all the required parts of a target's filesystem to breathe life into it. And it creates these parts from any kind of source files. If a PTXdist project consists of many packages the build may take a huge amount of time. @@ -589,9 +589,9 @@ re-building everything from time to time is a very good test case if some adaptions are still missing or if everything is complete, it can be a real time sink to do so. -To not lose developer’s temper when doing such tests, PTXdist can keep -archives from the last run which includes all the files the package’s -build system has installed while the PTXdist’s *install* stage runs for +To not lose developer's temper when doing such tests, PTXdist can keep +archives from the last run which includes all the files the package's +build system has installed while the PTXdist's *install* stage runs for it. The next time PTXdist should build a package it can use the results from @@ -642,10 +642,10 @@ build in the menu: With the next build (e.g. ``ptxdist go``) PTXdist will look for a specific package if its corresponding pre-built archive does exist. If -it does exist and the used hash value in the pre-built archive’s +it does exist and the used hash value in the pre-built archive's filename matches, PTXdist will skip all source archive handling (extract, patch, compile and install) and just extract and use the -pre-built archive’s content. +pre-built archive's content. A regular and safe usecase of pre-built archives is: @@ -658,8 +658,8 @@ A regular and safe usecase of pre-built archives is: - no package with a pre-built archive in the project is under development. -The hash as a part of the pre-built archive’s filename does only reflect -the package’s configuration made in the menu (``ptxdist menuconfig``). +The hash as a part of the pre-built archive's filename does only reflect +the package's configuration made in the menu (``ptxdist menuconfig``). If this package specific configuration changes, a new hash value will be the result and PTXdist can select the corresponding correct pre-built archive. @@ -675,7 +675,7 @@ Please be careful when using the pre-built archives if you: - change the patch set applied to the corresponding package, e.g. a package is under development. -- change the hard coded configure settings in the package’s rule file, +- change the hard coded configure settings in the package's rule file, e.g. a package is under development. - intend to use one pre-built archive pool from different PTXdist -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 3/6] doc: pre-built packages: use consistent style in enumerations
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 5da0722c9bd6..e82e1724701f 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -676,7 +676,7 @@ Please be careful when using the pre-built archives if you: package is under development. - change the hard coded configure settings in the package’s rule file, - e.g. a package is under development + e.g. a package is under development. - intend to use one pre-built archive pool from different PTXdist projects. @@ -696,16 +696,16 @@ archives. These kind of packages are always (re-)built. Only target related packages can be used based on their pre-built archives, but there are a few exceptions: -- Linux kernel: It has an incomplete install stage, which results into +- Linux kernel: it has an incomplete install stage, which results into an incomplete pre-built archive. Due to this, it cannot be used as a - pre-built archive + pre-built archive. -- Barebox bootloader: It has an incomplete install stage, which results +- Barebox bootloader: it has an incomplete install stage, which results into an incomplete pre-built archive. Due to this, it cannot be used - as a pre-built archive + as a pre-built archive. - some other somehow broken packages all marked with a - ``_DEVPKG := NO`` in their corresponding rule file + ``_DEVPKG := NO`` in their corresponding rule file. Workflow with Pre-Built Archives @@ -749,10 +749,10 @@ Use Cases Some major possible use cases are covered in this section: -- Speed up a re-build of one single project +- speed up a re-build of one single project. -- Sharing pre-built archives between two platforms based on the same - architecture +- sharing pre-built archives between two platforms based on the same + architecture. To simply speed up a re-build of the whole project (without development on any of the used packages) we just can copy all ``*-dev.tar.gz`` -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 0/6] doc: pre-built packages: review chapter 'Using Pre-Built Archives'
Changes since v1: - split up into separate, more simple to review patches - include Roland Hieber's additional findings (see email with message-ID eecbf2a3-fc9e-2ef6-a9cb-c9d3f4905...@pengutronix.de) Best regards Ulrich Ulrich Ölmann (6): doc: pre-built packages: fix typos doc: pre-built packages: adjust capitalization in headings doc: pre-built packages: use consistent style in enumerations doc: pre-built packages: english genitive uses an apostrophe doc: pre-built packages: enhance phrasing doc: pre-built packages: some additions doc/daily_work.inc | 139 - 1 file changed, 73 insertions(+), 66 deletions(-) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] doc: pre-built packages: fix typos, enhance some formulations & occasionally add information
Hi Roland & list, it took some time to come back to this finally... On Wed, Jul 19, 2017 at 10:30:35AM +0200, Roland Hieber wrote: > Some more changes you could include: > > On 18.07.2017 15:27, Ulrich Ölmann wrote: > > [...] > > -PTXdist is a tool which creates all the required parts of a target’s > > +PTXdist is a tool which creates all the required parts of a target's > > Is there a reason why you changed Unicode quotation marks for ASCII > apostrophes? The english genitive uses just a simple apostrophe that is found easily on my keyboard. Hence I try to consistently use it instead of special unicode characters. > > [...] > > the last run instead. This feature can drastically reduce the time to > > re-build the whole project. But also, this PTXdist feature must handle > > while we're at it: must be handled --^ Correct. > > [...] > > -A regular and save usecase of pre-build archives is: > > +Sufficient conditions for save application of pre-built archives are: > > ^--- should be "safe" (adj), not "save" (verb) Yes. > > [...] > > +The hash as a part of the pre-built archive's filename does only reflect > > My feeling for English would change this to "only reflects", less emphasis. Changed. > > [...] > > +can decide on a package by package base if its pre-built archive should > > ^--- basis? Replaced. > > [...] > > +Now its time to copy the pre-built archives to this new directory. We > >^-- it's Good catch. > > +are under development, we must omit its corresponding pre-built archives > >archive? --^ Changed to "we must omit THEIR corresponding pre-built archives". > > [...] > > $ cp platform-/packages/*-dev.tar.gz| > > /home/jbe/OSELAS.BSP/Pengutronix/OSELAS.BSP-Pengutronix-Generic > > ^-- huh, why is > there a pipe? Removed. > - Roland I will send a v2 of this patch split up into a handful of single more specific patches. Best regards Ulrich -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] doc: pre-built packages: fix typos, enhance some formulations & occasionally add information
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- doc/daily_work.inc | 134 - 1 file changed, 71 insertions(+), 63 deletions(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 460693021606..46c4852c2547 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -566,10 +566,10 @@ packages at the same time. Never worry again about your local host and how slow it is. With the help of *ICECC* every host will be a high speed development machine. -Using pre-build archives +Using Pre-Built Archives -PTXdist is a tool which creates all the required parts of a target’s +PTXdist is a tool which creates all the required parts of a target's filesystem to breathe life into it. And it creates these parts from any kind of source files. If a PTXdist project consists of many packages the build may take a huge amount of time. @@ -582,30 +582,30 @@ about 6 hours. Introduction -While the development of a PTXdist project it is needed to clean and +While developing a PTXdist project it is necessary to clean and re-build everything from time to time to get a re-synced project result which honors all changes made in the project. But since cleaning and -re-building everything from time to time is a very good test case if +re-building everything from time to time is a very good test case for if some adaptions are still missing or if everything is complete, it can be a real time sink to do so. -To not lose developer’s temper when doing such tests, PTXdist can keep -archives from the last run which includes all the files the package’s -build system has installed while the PTXdist’s *install* stage runs for +To not lose developer's temper when doing such tests, PTXdist can keep +archives from the last run which includes all the files the package's +build system has installed while the PTXdist's *install* stage runs for it. -The next time PTXdist should build a package it can use the results from +The next time PTXdist shall build a package it can use the results from the last run instead. This feature can drastically reduce the time to re-build the whole project. But also, this PTXdist feature must handle with care and so it is not enabled and used as default. This section describes how to make use of this PTXdist feature and what -pitfalls exists when doing so. +pitfalls exist when doing so. -Creating pre-build archives +Creating Pre-Built Archives ~~~ -To make PTXdist creating pre-build archives, enable this feature prior a +To make PTXdist create pre-built archives, enable this feature prior to a build in the menu: :: @@ -613,7 +613,7 @@ build in the menu: $ ptxdist menuconfig Project Name & Version ---> -[*] create pre-build archives +[*] create pre-built archives Now run a regular build of the whole project: @@ -622,14 +622,14 @@ Now run a regular build of the whole project: $ ptxdist go When the build is finished, the directory ``packages`` contains -additional archives files with the name scheme ``*-dev.tar.gz``. These -files are the pre-build archives which PTXdist can use later on to +additional archive files with the name scheme ``*-dev.tar.gz``. These +files are the pre-built archives which PTXdist can use later on to re-build the project. -Using pre-build archives +Using Pre-Built Archives -To make PTXdist using pre-build archives, enable this feature prior a +To make PTXdist use pre-built archives, enable this feature prior to a build in the menu: :: @@ -637,90 +637,96 @@ build in the menu: $ ptxdist menuconfig Project Name & Version ---> -[*] use pre-build archives +[*] use pre-built archives () -With the next build (e.g. ``ptxdist go``) PTXdist will look for a -specific package if its corresponding pre-build archive does exist. If -it does exist and the used hash value in the pre-build archive’s +During the next build (e.g. ``ptxdist go``) PTXdist will look for a +specific package if its corresponding pre-built archive exists. If +it exists and the used hash value in the pre-built archive's filename matches, PTXdist will skip all source archive handling (extract, patch, compile and install) and just extract and use the -pre-build archive’s content. +pre-built archive's content. -A regular and save usecase of pre-build archives is: +Sufficient conditions for save application of pre-built archives are: -- using one pre-build archive pool for one specific PTXdist project. +- using one pre-built archive pool for one specific PTXdist project. - using a constant PTXdist version all the time. - using a constant OSELAS.Toolchain() version all the time. -- no package with a pre-build archive in the project is under +- no package with a pre-built archive in the project is u
[ptxdist] [PATCH] host-cmake: version bump 3.1.1 -> 3.7.2
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- rules/host-cmake.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/host-cmake.make b/rules/host-cmake.make index d7a52bd5063e..5db8e76b76ad 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -17,11 +17,11 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake # # Paths and names # -HOST_CMAKE_VERSION := 3.1.1 -HOST_CMAKE_MD5 := 0ae4f25dbec66697c0c3cec1b9e885ae +HOST_CMAKE_VERSION := 3.7.2 +HOST_CMAKE_MD5 := 79bd7e65cd81ea3aa2619484ad6ff25a HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION) HOST_CMAKE_SUFFIX := tar.gz -HOST_CMAKE_URL := http://www.cmake.org/files/v3.1/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) +HOST_CMAKE_URL := http://www.cmake.org/files/v3.7/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) HOST_CMAKE_SOURCE := $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE) HOST_CMAKE_LICENSE := BSD-3-Clause, Apache-2.0, bzip2-1.0.5 -- 2.1.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] gnutls: bugfix: remove dependency on libgmp
Commit bfc2cf9d1b7e ("nettle: update 2.7.1 -> 3.3") removed the dependency of
nettle on libgmp which resulted in
configure: error:
***
*** gmp was not found.
in the preparation stage of gnutls. Hence configure gnutls to use nettle-mini
instead which is a slimmed down version of nettle without the gmp dependency.
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de>
---
rules/gnutls.make | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/gnutls.make b/rules/gnutls.make
index 54f8bdbaefcd..38290d9c3b3b 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -69,6 +69,7 @@ GNUTLS_CONF_OPT := \
--disable-libopts-install \
--disable-guile \
--disable-crywrap \
+ --with-nettle-mini \
--without-p11-kit \
--without-tpm \
--without-librt-prefix \
--
2.11.0
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v2] networkmanager: version bump 1.4.2 -> 1.6.0
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- Changes since v1: - replaced "--without-config-dhcp-default" with "--with-config-dhcp-default=internal" rules/networkmanager.make | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index cd4d8da3c1e6..90654d8d268c 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.4.2 -NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e +NETWORKMANAGER_VERSION := 1.6.0 +NETWORKMANAGER_MD5 := ccdac1d03133a59065cbb93a09fa54b0 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) @@ -44,7 +44,7 @@ NETWORKMANAGER_CONF_OPT := \ --enable-ifupdown \ --disable-ifnet \ --disable-code-coverage \ - --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ + --$(call ptx/endis,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ --disable-introspection \ --disable-qt \ --disable-teamdctl \ @@ -70,7 +70,7 @@ NETWORKMANAGER_CONF_OPT := \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-hostname-persist=default \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \ - --with-logging-backend-default="" \ + --with-config-logging-backend-default="" \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \ --without-consolekit \ --with-session-tracking=no \ @@ -83,6 +83,8 @@ NETWORKMANAGER_CONF_OPT := \ --without-ofono \ --with-dhclient=/sbin/dhclient \ --without-dhcpcd \ + --without-dhcpcd-supports-ipv6 \ + --with-config-dhcp-default=internal \ --without-resolvconf \ --without-netconfig \ --with-config-dns-rc-manager-default=file \ -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] networkmanager: version bump 1.4.2 -> 1.6.0
Hi Michael, please use this patch as a replacement of last week's "networkmanager: version bump 1.4.2 -> 1.4.4". Regards Ulrich -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] networkmanager: version bump 1.4.2 -> 1.6.0
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- rules/networkmanager.make | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index cd4d8da3c1e6..c07f9df6577c 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.4.2 -NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e +NETWORKMANAGER_VERSION := 1.6.0 +NETWORKMANAGER_MD5 := ccdac1d03133a59065cbb93a09fa54b0 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) @@ -44,7 +44,7 @@ NETWORKMANAGER_CONF_OPT := \ --enable-ifupdown \ --disable-ifnet \ --disable-code-coverage \ - --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ + --$(call ptx/endis,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \ --disable-introspection \ --disable-qt \ --disable-teamdctl \ @@ -70,7 +70,7 @@ NETWORKMANAGER_CONF_OPT := \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-hostname-persist=default \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \ - --with-logging-backend-default="" \ + --with-config-logging-backend-default="" \ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-logind \ --without-consolekit \ --with-session-tracking=no \ @@ -83,6 +83,8 @@ NETWORKMANAGER_CONF_OPT := \ --without-ofono \ --with-dhclient=/sbin/dhclient \ --without-dhcpcd \ + --without-dhcpcd-supports-ipv6 \ + --without-config-dhcp-default \ --without-resolvconf \ --without-netconfig \ --with-config-dns-rc-manager-default=file \ -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] networkmanager: version bump 1.4.2 -> 1.4.4
--- rules/networkmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index cd4d8da3c1e6..1a6583fcba78 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.4.2 -NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e +NETWORKMANAGER_VERSION := 1.4.4 +NETWORKMANAGER_MD5 := 63f1e0d6d7e9099499d062c84c927a75 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -- 2.1.4 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] version bump 1.4.2 -> 1.4.4
On Wed, Jan 18, 2017 at 09:53:55AM +0100, Juergen Borleis wrote: > [...] > Something like a "networkmanager: version bump 1.4.2 -> 1.4.4" > as the subject of this patch would be helpful. Of course, I'll send a v2 in a minute - thanks. (If you want to do things fast, careless mistakes catch you up...) Ulrich -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] version bump 1.4.2 -> 1.4.4
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- rules/networkmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/networkmanager.make b/rules/networkmanager.make index cd4d8da3c1e6..1a6583fcba78 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.4.2 -NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e +NETWORKMANAGER_VERSION := 1.4.4 +NETWORKMANAGER_MD5 := 63f1e0d6d7e9099499d062c84c927a75 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -- 2.1.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] hostapd: version bump 2.5-> 2.6
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- config/hostapd/defconfig | 21 +++-- rules/hostapd.make | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/config/hostapd/defconfig b/config/hostapd/defconfig index 41519b052905..28db7f31c04a 100644 --- a/config/hostapd/defconfig +++ b/config/hostapd/defconfig @@ -1,4 +1,4 @@ -# Example hostapd build time configuration +# PTXdist hostapd build time configuration # # This file lists the configuration options that are used when building the # hostapd binary. All lines starting with # are ignored. Configuration option @@ -18,6 +18,9 @@ CONFIG_DRIVER_HOSTAP=y # Driver interface for drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y +# QCA vendor extensions to nl80211 +#CONFIG_DRIVER_NL80211_QCA=y + # driver_nl80211.c requires libnl. If you are compiling it yourself # you may need to point hostapd to your version of libnl. # @@ -246,6 +249,9 @@ CONFIG_VLAN_NETLINK=y # Should we use epoll instead of select? Select is used by default. #CONFIG_ELOOP_EPOLL=y +# Should we use kqueue instead of select? Select is used by default. +#CONFIG_ELOOP_KQUEUE=y + # Select TLS implementation # openssl = OpenSSL (default) # gnutls = GnuTLS @@ -290,7 +296,7 @@ CONFIG_TLSV12=y #CONFIG_SQLITE=y # Enable Fast Session Transfer (FST) -#CONFIG_FST=y +CONFIG_FST=y # Enable CLI commands for FST testing #CONFIG_FST_TEST=y @@ -326,3 +332,14 @@ CONFIG_TLSV12=y # http://wireless.kernel.org/en/users/Documentation/acs # CONFIG_ACS=y + +# Multiband Operation support +# These extentions facilitate efficient use of multiple frequency bands +# available to the AP and the devices that may associate with it. +#CONFIG_MBO=y + +# Client Taxonomy +# Has the AP retain the Probe Request and (Re)Association Request frames from +# a client, from which a signature can be produced which can identify the model +# of client device like "Nexus 6P" or "iPhone 5s". +#CONFIG_TAXONOMY=y diff --git a/rules/hostapd.make b/rules/hostapd.make index 06cd0a4161f4..21f2e01ab0fe 100644 --- a/rules/hostapd.make +++ b/rules/hostapd.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_HOSTAPD) += hostapd # Paths and names # HOSTAPD_NAME := hostapd -HOSTAPD_VERSION:= 2.5 -HOSTAPD_MD5:= 69f9cec3f76d74f402864a43e4f8624f +HOSTAPD_VERSION:= 2.6 +HOSTAPD_MD5:= eaa56dce9bd8f1d195eb62596eab34c7 HOSTAPD:= $(HOSTAPD_NAME)-$(HOSTAPD_VERSION) HOSTAPD_SUFFIX := tar.gz HOSTAPD_URL:= http://w1.fi/releases/$(HOSTAPD).$(HOSTAPD_SUFFIX) -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
