[ptxdist] [PATCH v2] configure_helper: allow passing --force to ptxdist
Signed-off-by: Roland Hieber
---
v2: update doc/contributing.rst too
doc/contributing.rst| 3 +++
scripts/configure_helper.py | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 31dadcb0bba5..705f01377d32 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -130,6 +130,9 @@ needed. This tool contains a blacklist to filter out these
options.
``--sort``
Sort the options before comparing
+``-f, --force``
+Call PTXdist with ``--force``
+
There are several different ways to configure arguments:
.. code-block:: sh
diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 3af7b416a4f7..a29d80ecf0f3 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -163,7 +163,7 @@ def abort(message):
print("\nSee '%s --help' for more details." % cmd)
exit(1)
-def ask_ptxdist(pkg):
+def ask_ptxdist(pkg, force):
ptxdist = os.environ.get("PTXDIST", os.environ.get("ptxdist",
"ptxdist"))
cmdline = [ ptxdist, "-k", "make",
"/print-%s_DIR" % pkg,
@@ -174,6 +174,9 @@ def ask_ptxdist(pkg):
"/print-CROSS_MESON_USR",
"/print-CROSS_AUTOCONF_USR",
"/print-PTXDIST_SYSROOT_HOST" ]
+ if force:
+ cmdline.insert(1, "--force")
+
try:
p = subprocess.Popen(cmdline,
stdout=subprocess.PIPE,
@@ -485,6 +488,8 @@ parser.add_argument("-s", "--only-src", help="the only
source directory",
dest="only")
parser.add_argument("--sort", help="sort the options before comparing",
dest="sort", action="store_true")
+parser.add_argument("-f", "--force", help="pass --force when calling ptxdist",
+ dest="force", action="store_true")
args = parser.parse_args()
@@ -512,7 +517,7 @@ ptx_pkg_conf_opt = []
pkg_subdir = ""
tool = None
if args.pkg:
- (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) = ask_ptxdist(ptx_PKG)
+ (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) =
ask_ptxdist(ptx_PKG, args.force)
ptx_pkg_label = "rules/%s.make" % ptx_pkg
if tool == "autoconf":
parsed_pkg_conf_opt = parse_configure_args(pkg_conf_opt, [])
--
2.25.0.rc1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] configure_helper: allow passing --force to ptxdist
Signed-off-by: Roland Hieber
---
scripts/configure_helper.py | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 3af7b416a4f7..a29d80ecf0f3 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -163,7 +163,7 @@ def abort(message):
print("\nSee '%s --help' for more details." % cmd)
exit(1)
-def ask_ptxdist(pkg):
+def ask_ptxdist(pkg, force):
ptxdist = os.environ.get("PTXDIST", os.environ.get("ptxdist",
"ptxdist"))
cmdline = [ ptxdist, "-k", "make",
"/print-%s_DIR" % pkg,
@@ -174,6 +174,9 @@ def ask_ptxdist(pkg):
"/print-CROSS_MESON_USR",
"/print-CROSS_AUTOCONF_USR",
"/print-PTXDIST_SYSROOT_HOST" ]
+ if force:
+ cmdline.insert(1, "--force")
+
try:
p = subprocess.Popen(cmdline,
stdout=subprocess.PIPE,
@@ -485,6 +488,8 @@ parser.add_argument("-s", "--only-src", help="the only
source directory",
dest="only")
parser.add_argument("--sort", help="sort the options before comparing",
dest="sort", action="store_true")
+parser.add_argument("-f", "--force", help="pass --force when calling ptxdist",
+ dest="force", action="store_true")
args = parser.parse_args()
@@ -512,7 +517,7 @@ ptx_pkg_conf_opt = []
pkg_subdir = ""
tool = None
if args.pkg:
- (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) = ask_ptxdist(ptx_PKG)
+ (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) =
ask_ptxdist(ptx_PKG, args.force)
ptx_pkg_label = "rules/%s.make" % ptx_pkg
if tool == "autoconf":
parsed_pkg_conf_opt = parse_configure_args(pkg_conf_opt, [])
--
2.25.0.rc1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] host-ua-nodeset: New package.
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 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
[ptxdist] [PATCH 3/3] open62541: New package.
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 0..0dfd00351
--- /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"
+ )
+
+ # generate
[ptxdist] [PATCH 1/3] mbedtls: New package.
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 0..a0d58dbd5 --- /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 0..0086492fc --- /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.rc1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3] strongswan: Version bump 5.6.1 -> 5.8.2
Add swanctl support which replaces the old starter, ipsec and stroke backend. Swanctl is only tested with systemd. https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd Signed-off-by: Lars Pedersen --- v3: - Removed unnecessary configuration options - Install/enable strongswan systemd service if systemd is used - Use install_alternative for conf.d folder and swanctl.conf - Enabling swanctl installs default folder structure like fedora v2: - Install_lib and plugins installed like before - Set rpath to /usr/lib/plugins - Add license_files field rules/strongswan.in | 9 +-- rules/strongswan.make | 59 +-- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/rules/strongswan.in b/rules/strongswan.in index d0e660c57..8b1adff65 100644 --- a/rules/strongswan.in +++ b/rules/strongswan.in @@ -49,9 +49,14 @@ config STRONGSWAN_AFALG config STRONGSWAN_SYSTEMD_UNIT bool default y - # uses old systemd-daemon / libsystemd-journal libs - depends on BROKEN depends on INITMETHOD_SYSTEMD prompt "install systemd service file" +config STRONGSWAN_SWANCTL + bool + prompt "Use swanctl for configuration" + help + Swanctl is a new, portable command line utility to configure, + control and monitor the IKE daemon charon using the vici interface. + endif diff --git a/rules/strongswan.make b/rules/strongswan.make index 90db7bef7..1bf78b2b0 100644 --- a/rules/strongswan.make +++ b/rules/strongswan.make @@ -15,14 +15,17 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan # # Paths and names # -STRONGSWAN_VERSION := 5.6.1 -STRONGSWAN_MD5 := cb2241f1b96c524cd15b1c0f50ed9a27 +STRONGSWAN_VERSION := 5.8.2 +STRONGSWAN_MD5 := d94eac2caed51b0cc776e5887b10bace STRONGSWAN := strongswan-$(STRONGSWAN_VERSION) STRONGSWAN_SUFFIX := tar.bz2 STRONGSWAN_URL := https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX) STRONGSWAN_SOURCE := $(SRCDIR)/$(STRONGSWAN).$(STRONGSWAN_SUFFIX) STRONGSWAN_DIR := $(BUILDDIR)/$(STRONGSWAN) STRONGSWAN_LICENSE := GPL +STRONGSWAN_LICENSE_FILES := \ + file://LICENSE;md5=7744b64eaadabebdfd17e8a5ae6c9855 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # # Prepare @@ -36,11 +39,13 @@ STRONGSWAN_CONF_OPT := \ --$(call ptx/endis, PTXCONF_STRONGSWAN_AFALG)-af-alg \ --disable-bliss \ --disable-blowfish \ + --disable-botan \ --disable-ccm \ --disable-chapoly \ --enable-cmac \ --disable-ctr \ --disable-des \ + --disable-drbg \ --enable-fips-prf \ --enable-gcm \ --disable-gcrypt \ @@ -54,6 +59,7 @@ STRONGSWAN_CONF_OPT := \ --enable-nonce \ --disable-ntru \ --$(call ptx/endis, PTXCONF_STRONGSWAN_OPENSSL)-openssl \ + --disable-wolfssl \ --disable-padlock \ --enable-random \ --disable-rc2 \ @@ -126,11 +132,11 @@ STRONGSWAN_CONF_OPT := \ --enable-socket-default \ --disable-socket-dynamic \ --disable-socket-win \ - --enable-stroke \ + --$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-stroke \ --disable-smp \ --disable-sql \ --disable-uci \ - --disable-vici \ + --$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-vici \ --disable-android-dns \ --enable-attr \ --disable-attr-sql \ @@ -147,8 +153,6 @@ STRONGSWAN_CONF_OPT := \ --disable-imv-os \ --disable-imc-attestation \ --disable-imv-attestation \ - --disable-imc-swid \ - --disable-imv-swid \ --disable-imc-swima \ --disable-imv-swima \ --disable-imc-hcd \ @@ -174,14 +178,14 @@ STRONGSWAN_CONF_OPT := \ --disable-load-tester \ --disable-lookip \ --disable-radattr \ + --disable-save-keys \ --disable-systime-fix \ --disable-test-vectors \ --enable-updown \ --disable-aikgen \ - --enable-charon \ + --$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-charon \ --disable-cmd \ --disable-conftest \ - --disable-dumm \ --disable-fast \ --disable-fuzzing \ --disable-libipsec \ @@ -190,11 +194,10 @@ STRONGSWAN_CONF_OPT := \ --disable-medsrv \ --disable-nm \ --enable-pki \ - --enable-scepclient \ + --$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-scepclient \ --enable-scripts \ --disable-svc \ --$(call ptx/endis, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-systemd \ - --disable-swanctl \ --disable-tkm \ --disable-bfd-backtraces \ --disable-dbghelp-backtraces \ @@ -220,9 +223,12 @@ STRONGSWAN_CONF_OPT:= \ --disable-defaults \
[ptxdist] [PATCH] host-cmake: version bump 3.13.4 -> 3.16.2
Signed-off-by: Björn Esser --- rules/host-cmake.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-cmake.make b/rules/host-cmake.make index 8bab32945..15b428054 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake # # Paths and names # -HOST_CMAKE_VERSION := 3.13.4 -HOST_CMAKE_MD5 := b5a544ffc73f6922a6cf371fcb6bae22 +HOST_CMAKE_VERSION := 3.16.2 +HOST_CMAKE_MD5 := 78f418efd94f9c3364559d7f5d03c7b9 HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION) HOST_CMAKE_SUFFIX := tar.gz HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) -- 2.25.0.rc1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 2/3] 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. Signed-off-by: Björn Esser --- 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 0..d98dd6c34 --- /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 0..55a415945 --- /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.rc1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
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
---
v2: fix configure flags for host-nodejs
v3: add missing patches, remove obsolete patches
...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 0..58d46a8f4
--- /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 0..38c3c9650
--- /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 = output_prefix
+
+- if 'false' ==
[ptxdist] [PATCH v3 3/3] nodejs_packages: New package.
This is a dummy package to specifiy and install the 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.
Signed-off-by: Björn Esser
---
rules/nodejs_packages.in | 52 ++
rules/nodejs_packages.make | 90 ++
2 files changed, 142 insertions(+)
create mode 100644 rules/nodejs_packages.in
create mode 100644 rules/nodejs_packages.make
diff --git a/rules/nodejs_packages.in b/rules/nodejs_packages.in
new file mode 100644
index 0..144fc6c7b
--- /dev/null
+++ b/rules/nodejs_packages.in
@@ -0,0 +1,52 @@
+## SECTION=bytecode_engines
+
+menuconfig NODEJS_PACKAGES
+ tristate
+ select HOST_YARN
+ select NODEJS
+ prompt "Node.js packages (target) "
+ help
+ 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.
+
+
+if NODEJS_PACKAGES
+
+config NODEJS_PACKAGES_LIST
+ 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.
+
+ 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.
+
+ 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.
+
+ Also the path: './local_src/nodejs_packages/' must exist in the
+ BSP *before* before building this package.
+
+config NODEJS_PACKAGES_OFFLINE
+ bool
+ prompt "lock package 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.
+
+ Checking this option is highly recommended for production use.
+
+ Do NOT forget to commit the path: './local_src/nodejs_packages/'
+ into the BSP's git repository!
+
+endif
diff --git a/rules/nodejs_packages.make b/rules/nodejs_packages.make
new file mode 100644
index 0..7c044bd5c
--- /dev/null
+++ b/rules/nodejs_packages.make
@@ -0,0 +1,90 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Bjoern Esser
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NODEJS_PACKAGES) += nodejs_packages
+
+#
+# Paths and names
+#
+NODEJS_PACKAGES_VERSION:= 0.0.1
+NODEJS_PACKAGES:= nodejs_packages-$(NODEJS_PACKAGES_VERSION)
+NODEJS_PACKAGES_LOCAL := local_src/nodejs_packages
+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_LICENSE:= unknown
+
+NODEJS_PACKAGES_LIST := $(call remove_quotes,
$(PTXCONF_NODEJS_PACKAGES_LIST))
+
+YARN_LOCK := $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn.lock
+YARN_OPTS := \
+ --cwd "$(NODEJS_PACKAGES_DIR)" \
+ --cache-folder "$(NODEJS_PACKAGES_CACHE)" \
+ --link-duplicates \
+ --production=true
+
+ifdef PTXCONF_NODEJS_PACKAGES_OFFLINE
+YARN_OPTS += \
+ --frozen-lockfile \
+ --offline
+endif
+
+#
+# Compile
+#
+
+$(STATEDIR)/nodejs_packages.compile:
+ @$(call targetinfo)
+ mkdir -p $(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 \
+ touch $(YARN_LOCK); \
+ ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \
+ fi
+ yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST)
+ find $(NODEJS_PACKAGES_CACHE) -type f -name '.yarn-tarball.tgz' -delete
+ @$(call touch)
+
+#
+#
[ptxdist] [PATCH v2 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
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 --- v2: fix configure flags for host-nodejs rules/host-nodejs.in | 2 + rules/host-nodejs.make | 41 +++--- rules/nodejs.in| 54 +- rules/nodejs.make | 121 ++--- 4 files changed, 76 insertions(+), 142 deletions(-) diff --git a/rules/host-nodejs.in b/rules/host-nodejs.in index 6ea0dd519..527e7d427 100644 --- a/rules/host-nodejs.in +++ b/rules/host-nodejs.in @@ -3,4 +3,6 @@ config HOST_NODEJS tristate default y if ALLYES + select HOST_C_ARES select HOST_OPENSSL + select HOST_ZLIB diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make index 432cf930c..e26812c25 100644 --- a/rules/host-nodejs.make +++ b/rules/host-nodejs.make @@ -1,6 +1,9 @@ # -*-makefile-*- # # 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. @@ -11,32 +14,27 @@ # HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs -# -# Paths and names -# -HOST_NODEJS_NPMBOX_VERSION := 2.6.1 -HOST_NODEJS_NPMBOX_MD5 := 2779b99e3427cd49bbf28a236d871028 -HOST_NODEJS_NPMBOX := npmbox-$(HOST_NODEJS_NPMBOX_VERSION) -HOST_NODEJS_NPMBOX_SUFFIX := tar.bz2 -HOST_NODEJS_NPMBOX_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_NODEJS_NPMBOX).$(HOST_NODEJS_NPMBOX_SUFFIX) -HOST_NODEJS_NPMBOX_SOURCE := $(SRCDIR)/$(HOST_NODEJS_NPMBOX).$(HOST_NODEJS_NPMBOX_SUFFIX) -$(HOST_NODEJS_NPMBOX_SOURCE) := HOST_NODEJS_NPMBOX -HOST_NODEJS_NPMBOX_DIR = $(HOST_NODEJS_PKGDIR) -HOST_NODEJS_NPMBOX_STRIP_LEVEL := 0 - -HOST_NODEJS_SOURCES+= $(HOST_NODEJS_NPMBOX_SOURCE) +# Always run the preprocessor locally. +HOST_NODEJS_COMPILE_ENV:= \ + ICECC_REMOTE_CPP=0 # # Prepare # -HOST_NODEJS_CONF_TOOL := autoconf -HOST_NODEJS_CONF_OPT := \ +HOST_NODEJS_CONF_TOOL := autoconf +HOST_NODEJS_CONF_OPT := \ $(HOST_AUTOCONF) \ --prefix=/ \ + --no-cross-compiling \ --dest-os=linux \ + --without-dtrace \ + --without-etw \ + --without-npm \ + --shared \ --shared-openssl \ --shared-zlib \ + --shared-cares \ --with-intl=none \ --without-snapshot @@ -47,10 +45,13 @@ HOST_NODEJS_CONF_OPT := \ $(STATEDIR)/host-nodejs.install: @$(call targetinfo) @$(call install, HOST_NODEJS) - @sed "1s^.*^#\!/usr/bin/env node^g" \ - -i $(HOST_NODEJS_PKGDIR)/lib/node_modules/npm/bin/npm-cli.js - @$(call extract, HOST_NODEJS_NPMBOX) - @$(call world/patchin, HOST_NODEJS_NPMBOX) + +# # Needed to cross-compile for target. + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/bytecode_builtins_list_generator $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/mkcodecache $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/node_mksnapshot $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/torque $(HOST_NODEJS_PKGDIR)/bin/ + @$(call touch) # vim: syntax=make diff --git a/rules/nodejs.in b/rules/nodejs.in index e4ac11568..6d23f94ef 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
[ptxdist] [PATCH v2 2/3] 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. Signed-off-by: Björn Esser --- 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 0..d98dd6c34 --- /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 0..55a415945 --- /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.rc1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 3/3] nodejs_packages: New package.
This is a dummy package to specifiy and install the 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.
Signed-off-by: Björn Esser
---
rules/nodejs_packages.in | 52 ++
rules/nodejs_packages.make | 90 ++
2 files changed, 142 insertions(+)
create mode 100644 rules/nodejs_packages.in
create mode 100644 rules/nodejs_packages.make
diff --git a/rules/nodejs_packages.in b/rules/nodejs_packages.in
new file mode 100644
index 0..144fc6c7b
--- /dev/null
+++ b/rules/nodejs_packages.in
@@ -0,0 +1,52 @@
+## SECTION=bytecode_engines
+
+menuconfig NODEJS_PACKAGES
+ tristate
+ select HOST_YARN
+ select NODEJS
+ prompt "Node.js packages (target) "
+ help
+ 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.
+
+
+if NODEJS_PACKAGES
+
+config NODEJS_PACKAGES_LIST
+ 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.
+
+ 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.
+
+ 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.
+
+ Also the path: './local_src/nodejs_packages/' must exist in the
+ BSP *before* before building this package.
+
+config NODEJS_PACKAGES_OFFLINE
+ bool
+ prompt "lock package 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.
+
+ Checking this option is highly recommended for production use.
+
+ Do NOT forget to commit the path: './local_src/nodejs_packages/'
+ into the BSP's git repository!
+
+endif
diff --git a/rules/nodejs_packages.make b/rules/nodejs_packages.make
new file mode 100644
index 0..7c044bd5c
--- /dev/null
+++ b/rules/nodejs_packages.make
@@ -0,0 +1,90 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Bjoern Esser
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NODEJS_PACKAGES) += nodejs_packages
+
+#
+# Paths and names
+#
+NODEJS_PACKAGES_VERSION:= 0.0.1
+NODEJS_PACKAGES:= nodejs_packages-$(NODEJS_PACKAGES_VERSION)
+NODEJS_PACKAGES_LOCAL := local_src/nodejs_packages
+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_LICENSE:= unknown
+
+NODEJS_PACKAGES_LIST := $(call remove_quotes,
$(PTXCONF_NODEJS_PACKAGES_LIST))
+
+YARN_LOCK := $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn.lock
+YARN_OPTS := \
+ --cwd "$(NODEJS_PACKAGES_DIR)" \
+ --cache-folder "$(NODEJS_PACKAGES_CACHE)" \
+ --link-duplicates \
+ --production=true
+
+ifdef PTXCONF_NODEJS_PACKAGES_OFFLINE
+YARN_OPTS += \
+ --frozen-lockfile \
+ --offline
+endif
+
+#
+# Compile
+#
+
+$(STATEDIR)/nodejs_packages.compile:
+ @$(call targetinfo)
+ mkdir -p $(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 \
+ touch $(YARN_LOCK); \
+ ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \
+ fi
+ yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST)
+ find $(NODEJS_PACKAGES_CACHE) -type f -name '.yarn-tarball.tgz' -delete
+ @$(call touch)
+
+#
+#
[ptxdist] [PATCH 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
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 --- rules/host-nodejs.in | 2 + rules/host-nodejs.make | 43 --- rules/nodejs.in| 54 +- rules/nodejs.make | 121 ++--- 4 files changed, 78 insertions(+), 142 deletions(-) diff --git a/rules/host-nodejs.in b/rules/host-nodejs.in index 6ea0dd519..527e7d427 100644 --- a/rules/host-nodejs.in +++ b/rules/host-nodejs.in @@ -3,4 +3,6 @@ config HOST_NODEJS tristate default y if ALLYES + select HOST_C_ARES select HOST_OPENSSL + select HOST_ZLIB diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make index 432cf930c..27b3c9453 100644 --- a/rules/host-nodejs.make +++ b/rules/host-nodejs.make @@ -1,6 +1,9 @@ # -*-makefile-*- # # 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. @@ -11,32 +14,29 @@ # HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs -# -# Paths and names -# -HOST_NODEJS_NPMBOX_VERSION := 2.6.1 -HOST_NODEJS_NPMBOX_MD5 := 2779b99e3427cd49bbf28a236d871028 -HOST_NODEJS_NPMBOX := npmbox-$(HOST_NODEJS_NPMBOX_VERSION) -HOST_NODEJS_NPMBOX_SUFFIX := tar.bz2 -HOST_NODEJS_NPMBOX_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_NODEJS_NPMBOX).$(HOST_NODEJS_NPMBOX_SUFFIX) -HOST_NODEJS_NPMBOX_SOURCE := $(SRCDIR)/$(HOST_NODEJS_NPMBOX).$(HOST_NODEJS_NPMBOX_SUFFIX) -$(HOST_NODEJS_NPMBOX_SOURCE) := HOST_NODEJS_NPMBOX -HOST_NODEJS_NPMBOX_DIR = $(HOST_NODEJS_PKGDIR) -HOST_NODEJS_NPMBOX_STRIP_LEVEL := 0 - -HOST_NODEJS_SOURCES+= $(HOST_NODEJS_NPMBOX_SOURCE) +# Always run the preprocessor locally. +HOST_NODEJS_COMPILE_ENV:= \ + ICECC_REMOTE_CPP=0 # # Prepare # -HOST_NODEJS_CONF_TOOL := autoconf -HOST_NODEJS_CONF_OPT := \ +HOST_NODEJS_CONF_TOOL := autoconf +HOST_NODEJS_CONF_OPT := \ $(HOST_AUTOCONF) \ --prefix=/ \ + --no-cross-compiling \ --dest-os=linux \ + --with-arm-float-abi=hard \ + --with-arm-fpu=neon \ + --without-dtrace \ + --without-etw \ + --without-npm \ + --shared \ --shared-openssl \ --shared-zlib \ + --shared-cares \ --with-intl=none \ --without-snapshot @@ -47,10 +47,13 @@ HOST_NODEJS_CONF_OPT := \ $(STATEDIR)/host-nodejs.install: @$(call targetinfo) @$(call install, HOST_NODEJS) - @sed "1s^.*^#\!/usr/bin/env node^g" \ - -i $(HOST_NODEJS_PKGDIR)/lib/node_modules/npm/bin/npm-cli.js - @$(call extract, HOST_NODEJS_NPMBOX) - @$(call world/patchin, HOST_NODEJS_NPMBOX) + +# # Needed to cross-compile for target. + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/bytecode_builtins_list_generator $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/mkcodecache $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/node_mksnapshot $(HOST_NODEJS_PKGDIR)/bin/ + @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/torque $(HOST_NODEJS_PKGDIR)/bin/ + @$(call touch) # vim: syntax=make diff --git a/rules/nodejs.in b/rules/nodejs.in index e4ac11568..6d23f94ef 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
[ptxdist] [PATCH 2/3] 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. Signed-off-by: Björn Esser --- 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 0..d98dd6c34 --- /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 0..55a415945 --- /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.rc1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] nodejs_packages: New package.
This is a dummy package to specifiy and install the 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.
Signed-off-by: Björn Esser
---
rules/nodejs_packages.in | 52 ++
rules/nodejs_packages.make | 90 ++
2 files changed, 142 insertions(+)
create mode 100644 rules/nodejs_packages.in
create mode 100644 rules/nodejs_packages.make
diff --git a/rules/nodejs_packages.in b/rules/nodejs_packages.in
new file mode 100644
index 0..144fc6c7b
--- /dev/null
+++ b/rules/nodejs_packages.in
@@ -0,0 +1,52 @@
+## SECTION=bytecode_engines
+
+menuconfig NODEJS_PACKAGES
+ tristate
+ select HOST_YARN
+ select NODEJS
+ prompt "Node.js packages (target) "
+ help
+ 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.
+
+
+if NODEJS_PACKAGES
+
+config NODEJS_PACKAGES_LIST
+ 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.
+
+ 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.
+
+ 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.
+
+ Also the path: './local_src/nodejs_packages/' must exist in the
+ BSP *before* before building this package.
+
+config NODEJS_PACKAGES_OFFLINE
+ bool
+ prompt "lock package 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.
+
+ Checking this option is highly recommended for production use.
+
+ Do NOT forget to commit the path: './local_src/nodejs_packages/'
+ into the BSP's git repository!
+
+endif
diff --git a/rules/nodejs_packages.make b/rules/nodejs_packages.make
new file mode 100644
index 0..7c044bd5c
--- /dev/null
+++ b/rules/nodejs_packages.make
@@ -0,0 +1,90 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Bjoern Esser
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NODEJS_PACKAGES) += nodejs_packages
+
+#
+# Paths and names
+#
+NODEJS_PACKAGES_VERSION:= 0.0.1
+NODEJS_PACKAGES:= nodejs_packages-$(NODEJS_PACKAGES_VERSION)
+NODEJS_PACKAGES_LOCAL := local_src/nodejs_packages
+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_LICENSE:= unknown
+
+NODEJS_PACKAGES_LIST := $(call remove_quotes,
$(PTXCONF_NODEJS_PACKAGES_LIST))
+
+YARN_LOCK := $(PTXDIST_WORKSPACE)/$(NODEJS_PACKAGES_LOCAL)/yarn.lock
+YARN_OPTS := \
+ --cwd "$(NODEJS_PACKAGES_DIR)" \
+ --cache-folder "$(NODEJS_PACKAGES_CACHE)" \
+ --link-duplicates \
+ --production=true
+
+ifdef PTXCONF_NODEJS_PACKAGES_OFFLINE
+YARN_OPTS += \
+ --frozen-lockfile \
+ --offline
+endif
+
+#
+# Compile
+#
+
+$(STATEDIR)/nodejs_packages.compile:
+ @$(call targetinfo)
+ mkdir -p $(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 \
+ touch $(YARN_LOCK); \
+ ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \
+ fi
+ yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST)
+ find $(NODEJS_PACKAGES_CACHE) -type f -name '.yarn-tarball.tgz' -delete
+ @$(call touch)
+
+#
+#
Re: [ptxdist] [PATCH] Weston: Fix compilation for certain DRM targets
El vie., 10 ene. 2020 a las 10:13, Michael Olbrich () escribió: > > On Wed, Jan 08, 2020 at 04:47:47PM +0100, Guillermo Rodríguez wrote: > > If none of LIBDRM_INTEL, LIBDRM_FREEDRENO, or LIBDRM_ETNAVIV is defined, > > the simple-dmabuf-drm Meson option is set to an empty list, which breaks > > compilation. Fix this by setting the option to 'auto' in this case. > > > > Signed-off-by: Guillermo Rodriguez > > --- > > rules/weston.make | 4 > > 1 file changed, 4 insertions(+) > > > > diff --git a/rules/weston.make b/rules/weston.make > > index eaabebe61..45b9c6ea6 100644 > > --- a/rules/weston.make > > +++ b/rules/weston.make > > @@ -35,6 +35,10 @@ endif > > WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_FREEDRENO) += > > freedreno > > WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_ETNAVIV) += > > etnaviv > > > > +ifeq ($(WESTON_SIMPLE_DMABUF_DRM-y),) > > +WESTON_SIMPLE_DMABUF_DRM-y := auto > > Hmm, we handle all possible options above, so none should be found with > 'auto', so I think the correct setting here is: > > WESTON_SIMPLE_DMABUF_DRM-y := [] > > To provide an empty list. I am not sure. The error I saw specifically complained about the option being an empty list, so it looks like Meson didn't like that. But the thing is that for some reason I cannot reproduce it anymore. Will see if I can find what the exact problem was. Guillermo ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] udev-legacy: Fix build with recent glibc versions.
El dom., 12 ene. 2020 a las 13:52, Michael Olbrich () escribió: > > On Tue, Dec 10, 2019 at 07:55:36PM +0100, Guillermo Rodríguez wrote: > > Signed-off-by: Guillermo Rodriguez > > --- > > .../0003-include-sysmacros-for-new-glibc.patch | 17 + > > patches/udev-182/series | 1 + > > 2 files changed, 18 insertions(+) > > create mode 100644 > > patches/udev-182/0003-include-sysmacros-for-new-glibc.patch > > > > diff --git a/patches/udev-182/0003-include-sysmacros-for-new-glibc.patch > > b/patches/udev-182/0003-include-sysmacros-for-new-glibc.patch > > new file mode 100644 > > index 0..b2f8db670 > > --- /dev/null > > +++ b/patches/udev-182/0003-include-sysmacros-for-new-glibc.patch > > @@ -0,0 +1,17 @@ > > +Fix build with recent glibc releases where is no > > +longer included as part of . > > + > > +Ref.: https://wiki.gentoo.org/wiki/Glibc_2.26_porting_notes/sysmacros.h > > + > > +Index: udev-182/src/libudev.h > > +=== > > Please provide a proper patch header. Just recreating the patches with > git[1] should work. I created the patch using quilt as described in the ptxdist documentation (https://www.ptxdist.org/doc/dev_manual.html#using-quilt). If you don't intend to support this workflow, then I think you should cleary state that in the docs. Guillermo ___ ptxdist mailing list ptxdist@pengutronix.de
