[ptxdist] [PATCH v3] pam: new package

2020-01-28 Thread Ladislav Michl 
Signed-off-by: Ladislav Michl 
---
 Changes:
 - v2: Add license info, install_alternative config files individually
 - v3: Specify GPL-2.0-or-later AND LGPL-2.0-or-later

 rules/pam.in   | 10 ++
 rules/pam.make | 82 ++
 2 files changed, 92 insertions(+)
 create mode 100644 rules/pam.in
 create mode 100644 rules/pam.make

diff --git a/rules/pam.in b/rules/pam.in
new file mode 100644
index 0..75d5ef42c
--- /dev/null
+++ b/rules/pam.in
@@ -0,0 +1,10 @@
+## SECTION=security
+
+config PAM
+   tristate
+   prompt "PAM"
+   select LIBC_CRYPT
+   help
+ Linux-PAM (Pluggable Authentication Modules for Linux) is a suite
+ of shared libraries that enable the local system administrator to
+ choose how applications authenticate users.
diff --git a/rules/pam.make b/rules/pam.make
new file mode 100644
index 0..b665ce147
--- /dev/null
+++ b/rules/pam.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PAM) += pam
+
+#
+# Paths and names
+#
+PAM_VERSION:= 1.3.1
+PAM_MD5:= 558ff53b0fc0563ca97f79e911822165
+PAM:= Linux-PAM-$(PAM_VERSION)
+PAM_SUFFIX := tar.xz
+PAM_URL:= 
https://github.com/linux-pam/linux-pam/releases/download/v$(PAM_VERSION)/$(PAM).$(PAM_SUFFIX)
+PAM_SOURCE := $(SRCDIR)/$(PAM).$(PAM_SUFFIX)
+PAM_DIR:= $(BUILDDIR)/$(PAM)
+PAM_LICENSE:= BSD-3-Clause OR (GPL-2.0-or-later AND LGPL-2.0-or-later)
+PAM_LICENSE_FILES := \
+   file://Copyright;md5=7eb5c1bf854e8881005d673599ee74d3 \
+   file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+PAM_CONF_TOOL  := autoconf
+PAM_CONF_OPT   := \
+   $(CROSS_AUTOCONF_USR) \
+   $(GLOBAL_LARGE_FILE_OPTION) \
+   --disable-lckpwdf \
+   --disable-cracklib \
+   --disable-audit \
+   --disable-db \
+   --disable-nis \
+   --disable-selinux \
+   --disable-regenerate-docu \
+   --disable-nls \
+   --disable-rpath
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/pam.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, pam)
+   @$(call install_fixup, pam,PRIORITY,optional)
+   @$(call install_fixup, pam,SECTION,base)
+   @$(call install_fixup, pam,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, pam,DESCRIPTION,"Pluggable Authentication 
Modules for Linux")
+
+   @$(call install_lib, pam, 0, 0, 0644, libpamc)
+   @$(call install_lib, pam, 0, 0, 0644, libpam_misc)
+   @$(call install_lib, pam, 0, 0, 0644, libpam)
+
+   @$(call install_tree, pam, 0, 0, -, /usr/lib/security)
+
+   @$(call install_alternative, pam, 0, 0, 0644, /etc/environment)
+   @$(call install_alternative, pam, 0, 0, 0644, /etc/security/access.conf)
+   @$(call install_alternative, pam, 0, 0, 0644, /etc/security/group.conf)
+   @$(call install_alternative, pam, 0, 0, 0644, /etc/security/limits.conf)
+   @$(call install_alternative, pam, 0, 0, 0644, 
/etc/security/namespace.conf)
+   @$(call install_alternative, pam, 0, 0, 0755, 
/etc/security/namespace.init)
+   @$(call install_alternative, pam, 0, 0, 0644, 
/etc/security/pam_env.conf)
+   @$(call install_alternative, pam, 0, 0, 0644, /etc/security/time.conf)
+
+   @$(call install_finish, pam)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.25.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v4 3/8] OpenCV: Clean up configure_helper output

2020-01-28 Thread Marian Cichy 
Signed-off-by: Marian Cichy 
---
 rules/opencv.make | 161 +++---
 1 file changed, 109 insertions(+), 52 deletions(-)

diff --git a/rules/opencv.make b/rules/opencv.make
index 1d97066a1..e08d90a3b 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -27,7 +27,7 @@ OPENCV_URL:= \
 OPENCV_SOURCE  := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
 OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
 OPENCV_LICENSE := BSD
-
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
 # 
 # Prepare
 # 
@@ -37,94 +37,153 @@ OPENCV_CONF_TOOL   := cmake
 OPENCV_CONF_OPT:= \
$(CROSS_CMAKE_USR) \
-DANT_EXECUTABLE:FILEPATH= \
-   -DPYTHON_EXECUTABLE= \
+   -DBUILD_CUDA_STUBS:BOOL=OFF \
-DBUILD_DOCS:BOOL=OFF \
-DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \
+   -DBUILD_ITT=ON \
+   -DBUILD_JASPER=OFF \
+   -DBUILD_JAVA=OFF \
+   -DBUILD_JPEG=OFF \
+   -DBUILD_LIST= \
+   -DBUILD_OPENEXR=OFF \
-DBUILD_PACKAGE:BOOL=OFF \
-   -DCMAKE_BUILD_TYPE=Release \
+   -DBUILD_PERF_TESTS=OFF \
+   -DBUILD_PNG=OFF \
+   -DBUILD_PROTOBUF=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
+   -DBUILD_TBB=OFF \
-DBUILD_TESTS=OFF \
-   -DBUILD_PERF_TESTS=OFF \
+   -DBUILD_TIFF=OFF \
+   -DBUILD_USE_SYMLINKS=OFF \
+   -DBUILD_WEBP=OFF \
-DBUILD_WITH_DEBUG_INFO=OFF \
-   -DBUILD_CUDA_STUBS:BOOL=OFF \
-   -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-   -DCMAKE_SKIP_RPATH=OFF \
-   -DCMAKE_USE_RELATIVE_PATHS=OFF \
+   -DBUILD_WITH_DYNAMIC_IPP=OFF \
+   -DBUILD_ZLIB=OFF \
+   -DBUILD_opencv_apps:BOOL=OFF \
+   -DBUILD_opencv_calib3d:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
+   -DBUILD_opencv_core:BOOL=ON \
+   -DBUILD_opencv_dnn=OFF \
+   -DBUILD_opencv_features2d:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
+   -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) 
\
+   -DBUILD_opencv_highgui:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF)  \
+   -DBUILD_opencv_imgcodecs=$(call 
ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \
+   -DBUILD_opencv_imgproc:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
+   -DBUILD_opencv_java_bindings_generator=ON \
+   -DBUILD_opencv_js=OFF \
+   -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
+   -DBUILD_opencv_objdetect:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \
+   -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) 
\
+   -DBUILD_opencv_python_bindings_generator=ON \
+   -DBUILD_opencv_python_tests=ON \
+   -DBUILD_opencv_stitching:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
+   -DBUILD_opencv_ts:BOOL=OFF \
+   -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) 
\
+   -DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \
+   -DBUILD_opencv_world:BOOL=OFF \
+   -DCAROTENE_NS=carotene_o4t \
+   -DCPU_BASELINE=DETECT \
+   -DCPU_DISPATCH= \
+   -DCV_DISABLE_OPTIMIZATION=OFF \
+   -DCV_ENABLE_INTRINSICS=ON \
+   -DCV_TRACE=ON \
+   -DENABLE_BUILD_HARDENING=OFF \
+   -DENABLE_CCACHE=OFF \
+   -DENABLE_CONFIG_VERIFICATION=OFF \
+   -DENABLE_COVERAGE=OFF \
-DENABLE_FAST_MATH=ON \
+   -DENABLE_GNU_STL_DEBUG=OFF \
+   -DENABLE_IMPL_COLLECTION=OFF \
+   -DENABLE_INSTRUMENTATION=OFF \
+   -DENABLE_LTO=OFF \
+   -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
-DENABLE_NOISY_WARNINGS=OFF \
-DENABLE_OMIT_FRAME_POINTER=ON \
-   -DENABLE_PRECOMPILED_HEADERS=OFF \
+   -DENABLE_PIC=ON \
-DENABLE_PROFILING=OFF \
-DENABLE_SOLUTION_FOLDERS=OFF \
-   -DWITH_GTK:BOOL=OFF \
-   -DWITH_TBB:BOOL=OFF \
-   -DWITH_TIFF:BOOL=OFF \
-   -DWITH_CUDA:BOOL=OFF \
-   -DWITH_EIGEN:BOOL=OFF \
-   -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
-DENABLE_VFPV3:BOOL=OFF \
-   -DWITH_GIGEAPI:BOOL=OFF \
+   -DGENERATE_ABI_DESCRIPTOR=OFF \
-DINSTALL_CREATE_DISTRIB:BOOL=OFF \
-   -DINSTALL_C_EXAMPLES:BOOL=OFF \
+   -DINSTALL_C_EXAMPLES:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_EXAMPLES) \
-DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \
+   -DINSTALL_TESTS=OFF \
-DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \
+   -DMKL_WITH_OPENMP=OFF \
+   -DMKL_WITH_TBB=OFF \
+   -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \
+   -DOPENCV_DUMP_HOOKS_FLOW=OFF \
+   -DOPENCV_ENABLE_MEMALIGN=ON \
+   -DOPENCV_ENABLE_MEMORY_SANITIZER=OFF \
+   -DOPENCV_ENABLE_NONFREE=OFF \
-DOPENCV_EXTRA_MODULES_PATH:PATH= \
+   -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \
+   -DOPENCV_

[ptxdist] [PATCH v4 4/8] OpenCV: Changed QT-Support from 4 to 5

2020-01-28 Thread Marian Cichy 
Signed-off-by: Marian Cichy 
---
 rules/opencv.in   | 7 +++
 rules/opencv.make | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rules/opencv.in b/rules/opencv.in
index e8b9e36df..16e7b56db 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -8,10 +8,9 @@ menuconfig OPENCV
select ZLIB
select LIBPNG
select LIBJPEG
-   select QT4  if OPENCV_QT
-   select QT4_BUILD_QTESTLIB   if OPENCV_QT
-   select QT4_BUILD_GUIif OPENCV_QT
-   select QT4_STL  if OPENCV_QT
+   select QT5  if OPENCV_QT
+   select QT5_TEST if OPENCV_QT
+   select QT5_GUI  if OPENCV_QT
select GSTREAMERif OPENCV_GSTREAMER
select V4L_UTILSif OPENCV_V4L_LIBV4L2
select V4L_UTILS_LIBV4L1if OPENCV_V4L_LIBV4L2
diff --git a/rules/opencv.make b/rules/opencv.make
index e08d90a3b..1cc692855 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -170,7 +170,7 @@ OPENCV_CONF_OPT := \
-DWITH_PROTOBUF=ON \
-DWITH_PTHREADS_PF:BOOL=OFF \
-DWITH_PVAPI:BOOL=OFF \
-   -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF) \
+   -DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,5,OFF) \
-DWITH_QUIRC=ON \
-DWITH_TBB:BOOL=OFF \
-DWITH_TIFF:BOOL=OFF \
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v4 8/8] OpenCV: make build generate pkg-config file

2020-01-28 Thread Marian Cichy 
OpenCV usually depends on CMake when some application wants to find its
libraries. However, PTXDist usually relies on pkg-config when building
custom software.
NOTE: This is a workaround since OpenCV marks the usage of pkg-config as
deprecated.
---
 rules/opencv.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/opencv.make b/rules/opencv.make
index 73582af38..ce10e9033 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -182,6 +182,7 @@ OPENCV_CONF_OPT := \
-DWITH_WEBP:BOOL=OFF \
-DWITH_XIMEA:BOOL=OFF \
-DWITH_XINE:BOOL=OFF \
+   -DOPENCV_GENERATE_PKGCONFIG=ON \
 
 
 $(STATEDIR)/opencv.install:
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff

2020-01-28 Thread Marian Cichy 
CMake switches used ptx/ifdef with an ON/OFF define, but we have
ptx/onoff for this case. Using this to sustain uniformity.

Signed-off-by: Marian Cichy 
---
 rules/opencv.make | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/rules/opencv.make b/rules/opencv.make
index 9ec11dc51..50bcd5997 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -60,25 +60,25 @@ OPENCV_CONF_OPT := \
-DBUILD_WITH_DYNAMIC_IPP=OFF \
-DBUILD_ZLIB=OFF \
-DBUILD_opencv_apps:BOOL=OFF \
-   -DBUILD_opencv_calib3d:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
+   -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \
-DBUILD_opencv_core:BOOL=ON \
-   -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \
-   -DBUILD_opencv_features2d:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
-   -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) 
\
-   -DBUILD_opencv_highgui:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF)  \
-   -DBUILD_opencv_imgcodecs=$(call 
ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \
-   -DBUILD_opencv_imgproc:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
+   -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \
+   -DBUILD_opencv_features2d:BOOL=$(call 
ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \
+   -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \
+   -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI)  \
+   -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \
+   -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \
-DBUILD_opencv_java_bindings_generator=ON \
-DBUILD_opencv_js=OFF \
-   -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
-   -DBUILD_opencv_objdetect:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \
-   -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) 
\
+   -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \
+   -DBUILD_opencv_objdetect:BOOL=$(call 
ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \
+   -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \
-DBUILD_opencv_python_bindings_generator=ON \
-DBUILD_opencv_python_tests=ON \
-   -DBUILD_opencv_stitching:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
+   -DBUILD_opencv_stitching:BOOL=$(call 
ptx/onoff,PTXCONF_OPENCV_STITCHING) \
-DBUILD_opencv_ts:BOOL=OFF \
-   -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) 
\
-DBUILD_opencv_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \
+   -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \
-DBUILD_opencv_world:BOOL=OFF \
-DCAROTENE_NS=carotene_o4t \
-DCPU_BASELINE=DETECT \
@@ -95,7 +95,7 @@ OPENCV_CONF_OPT   := \
-DENABLE_IMPL_COLLECTION=OFF \
-DENABLE_INSTRUMENTATION=OFF \
-DENABLE_LTO=OFF \
-   -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
+   -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \
-DENABLE_NOISY_WARNINGS=OFF \
-DENABLE_OMIT_FRAME_POINTER=ON \
-DENABLE_PIC=ON \
@@ -136,7 +136,7 @@ OPENCV_CONF_OPT := \
-DWITH_GDCM=OFF \
-DWITH_GIGEAPI:BOOL=OFF \
-DWITH_GPHOTO2:BOOL=OFF \
-   -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) 
\
+   -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \
-DWITH_GTK:BOOL=OFF \
-DWITH_GTK_2_X=OFF \
-DWITH_HALIDE=OFF \
@@ -153,7 +153,7 @@ OPENCV_CONF_OPT := \
-DWITH_JPEG:BOOL=ON \
-DWITH_LAPACK=ON \
-DWITH_LIBREALSENSE=OFF \
-   -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \
+   -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \
-DWITH_MFX=OFF \
-DWITH_NVCUVID:BOOL=OFF \
-DWITH_OPENCL:BOOL=ON \
@@ -175,7 +175,7 @@ OPENCV_CONF_OPT := \
-DWITH_TBB:BOOL=OFF \
-DWITH_TIFF:BOOL=OFF \
-DWITH_UNICAP:BOOL=OFF \
-   -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \
+   -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \
-DWITH_VA=OFF \
-DWITH_VA_INTEL=OFF \
-DWITH_VULKAN=OFF \
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2.

2020-01-28 Thread Marian Cichy 
Removed the modules opencv_superres and
opencv_videostab because they are not part of the opencv main repository
anymore but have been moved to the opencv_contrib repository.

Signed-off-by: Marian Cichy 
---
 rules/opencv.in   | 66 +
 rules/opencv.make | 68 +++
 2 files changed, 41 insertions(+), 93 deletions(-)

diff --git a/rules/opencv.in b/rules/opencv.in
index cd43563ea..37fd32758 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=multimedia_libs
+## SECTION=multimedia_libs
 
 menuconfig OPENCV
tristate
@@ -21,9 +19,6 @@ menuconfig OPENCV
help
  Open Source Computer Vision Library
 
- STAGING: remove in ptxdist-2020.06.0
- Old version that need to be updated. Fails to build with gcc >= 7.x.
-
 if OPENCV
 
 config OPENCV_CALIB3D
@@ -33,17 +28,6 @@ config OPENCV_CALIB3D
help
  Camera Calibration and 3D Reconstruction
 
-config OPENCV_CONTRIB
-   bool
-   prompt "contrib"
-   select OPENCV_CALIB3D
-   select OPENCV_IMGPROC
-   select OPENCV_ML
-   select OPENCV_OBJDETECT
-   select OPENCV_VIDEO
-   help
- Contributed/Experimental Stuff
-
 config OPENCV_FEATURES2D
bool
prompt "features2d"
@@ -58,16 +42,6 @@ config OPENCV_FLANN
help
  Clustering and Search in Multi-Dimensional Spaces
 
-config OPENCV_GPU
-   bool
-   prompt "gpu"
-   select OPENCV_LEGACY
-   select OPENCV_PHOTO
-   select OPENCV_OBJDETECT
-   select OPENCV_HIGHGUI
-   help
- GPU-accelerated Computer Vision
-
 config OPENCV_HIGHGUI
bool
prompt "highgui"
@@ -81,14 +55,11 @@ config OPENCV_IMGPROC
help
  Image Processing
 
-config OPENCV_LEGACY
+config OPENCV_IMGCODECS
bool
-   prompt "legacy"
-   select OPENCV_CALIB3D
-   select OPENCV_ML
-   select OPENCV_VIDEO
+   prompt "imgcodecs"
help
- Deprecated stuff
+ Image Codecs
 
 config OPENCV_ML
bool
@@ -96,15 +67,6 @@ config OPENCV_ML
help
  Machine Learning
 
-config OPENCV_NONFREE
-   bool
-   prompt "nonfree"
-   select OPENCV_CALIB3D
-   select OPENCV_IMGPROC
-   select OPENCV_FEATURES2D
-   help
- Non-free functionality
-
 config OPENCV_OBJDETECT
bool
prompt "objdetect"
@@ -128,14 +90,6 @@ config OPENCV_STITCHING
help
  Images stitching
 
-config OPENCV_SUPERRES
-   bool
-   prompt "superres"
-   select OPENCV_IMGPROC
-   select OPENCV_VIDEO
-   help
- Super Resolution
-
 config OPENCV_VIDEO
bool
prompt "video"
@@ -143,17 +97,11 @@ config OPENCV_VIDEO
help
  Video Analysis
 
-config OPENCV_VIDEOSTAB
+config OPENCV_VIDEOIO
bool
-   prompt "videostab"
-   select OPENCV_CALIB3D
-   select OPENCV_FEATURES2D
-   select OPENCV_HIGHGUI
-   select OPENCV_OBJDETECT
-   select OPENCV_PHOTO
-   select OPENCV_VIDEO
+   prompt "videoio"
help
- Video Stabilization
+ Video I/O
 
 config OPENCV_GSTREAMER
bool
diff --git a/rules/opencv.make b/rules/opencv.make
index 65125e3b7..44ee4fd0c 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,14 +17,13 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
 # Paths and names
 #
 
-OPENCV_VERSION := 2.4.8
-OPENCV_MD5 := 50cc1433b3654074206f5b3dbfd49848 \
-   5270b5b5480d3f02018e14a953dc3720
+OPENCV_VERSION := 4.1.2
+OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
 OPENCV := opencv-$(OPENCV_VERSION)
 OPENCV_SUFFIX  := zip
 OPENCV_URL := \
$(call ptx/mirror, SF, 
opencvlibrary/opencv-unix/$(OPENCV_VERSION)/$(OPENCV).$(OPENCV_SUFFIX)) \
-   
https://github.com/Itseez/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
+   
https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).$(OPENCV_SUFFIX)
 OPENCV_SOURCE  := $(SRCDIR)/$(OPENCV).$(OPENCV_SUFFIX)
 OPENCV_DIR := $(BUILDDIR)/$(OPENCV)
 OPENCV_LICENSE := BSD
@@ -47,6 +46,7 @@ OPENCV_CONF_OPT   := \
-DBUILD_TESTS=OFF \
-DBUILD_PERF_TESTS=OFF \
-DBUILD_WITH_DEBUG_INFO=OFF \
+   -DBUILD_CUDA_STUBS:BOOL=OFF \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_USE_RELATIVE_PATHS=OFF \
@@ -56,14 +56,12 @@ OPENCV_CONF_OPT := \
-DENABLE_PRECOMPILED_HEADERS=OFF \
-DENABLE_PROFILING=OFF \
-DENABLE_SOLUTION_FOLDERS=OFF \
-   -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON \
-DWITH_GTK:BOOL=OFF \
-DWITH_TBB:BOOL=OFF \
-DWITH_TIFF:BOOL=OFF \
-   -DCMAKE_VERBOSE:BOOL=OFF \
-DWITH_CUDA:BOOL=OFF \
-DWITH_EIGEN:BOOL=OFF \
-   -DENABLE_NEON:BOOL=$(call ptx/onoff, PTXCONF_ARCH_ARM_NEON) \
+   -DENABLE_NEO

[ptxdist] [PATCH v4 5/8] OpenCV: added switch to turn on/off DNN support

2020-01-28 Thread Marian Cichy 
Signed-off-by: Marian Cichy 
---
 rules/opencv.in   | 6 ++
 rules/opencv.make | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rules/opencv.in b/rules/opencv.in
index 16e7b56db..a917d79c7 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -102,6 +102,12 @@ config OPENCV_VIDEOIO
help
  Video I/O
 
+config OPENCV_DNN
+   bool
+   prompt "DNN"
+   help
+ Deep Neural Network Library
+
 config OPENCV_GSTREAMER
bool
prompt "gstreamer"
diff --git a/rules/opencv.make b/rules/opencv.make
index 1cc692855..9ec11dc51 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -62,7 +62,7 @@ OPENCV_CONF_OPT   := \
-DBUILD_opencv_apps:BOOL=OFF \
-DBUILD_opencv_calib3d:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
-DBUILD_opencv_core:BOOL=ON \
-   -DBUILD_opencv_dnn=OFF \
+   -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \
-DBUILD_opencv_features2d:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
-DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) 
\
-DBUILD_opencv_highgui:BOOL=$(call 
ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF)  \
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v4 7/8] OpenCV: Update to version 4.2.0

2020-01-28 Thread Marian Cichy 
Update version and add new dependencies
---
 rules/opencv.in   | 1 +
 rules/opencv.make | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/opencv.in b/rules/opencv.in
index a917d79c7..8380506ad 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -99,6 +99,7 @@ config OPENCV_VIDEO
 config OPENCV_VIDEOIO
bool
prompt "videoio"
+   select OPENCV_IMGCODECS
help
  Video I/O
 
diff --git a/rules/opencv.make b/rules/opencv.make
index 50bcd5997..73582af38 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPENCV) += opencv
 # Paths and names
 #
 
-OPENCV_VERSION := 4.1.2
-OPENCV_MD5 := 6b390578d57131ae9d6c2a183257399d
+OPENCV_VERSION := 4.2.0
+OPENCV_MD5 := b02b54115f1f99cb9e885d1e5988ff70
 OPENCV := opencv-$(OPENCV_VERSION)
 OPENCV_SUFFIX  := zip
 OPENCV_URL := \
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples

2020-01-28 Thread Marian Cichy 
Signed-off-by: Marian Cichy 
---
 rules/opencv.in   | 17 +
 rules/opencv.make | 13 ++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/rules/opencv.in b/rules/opencv.in
index 37fd32758..e8b9e36df 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -131,4 +131,21 @@ config OPENCV_QT
help
  QT GUI Support
 
+config OPENCV_EXAMPLES
+   bool
+   prompt "Build Examples"
+   select OPENCV_IMGPROC
+   select OPENCV_FLANN
+   select OPENCV_IMGCODECS
+   select OPENCV_VIDEOIO
+   select OPENCV_HIGHGUI
+   select OPENCV_ML
+   select OPENCV_VIDEO
+   select OPENCV_OBJDETECT
+   select OPENCV_PHOTO
+   select OPENCV_FEATURES2D
+   select OPENCV_CALIB3D
+   select OPENCV_STITCHING
+   help
+ Build the OpenCV example applications and install them into 
/usr/share/opencv/examples.
 endif
diff --git a/rules/opencv.make b/rules/opencv.make
index 44ee4fd0c..1d97066a1 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -39,7 +39,7 @@ OPENCV_CONF_OPT   := \
-DANT_EXECUTABLE:FILEPATH= \
-DPYTHON_EXECUTABLE= \
-DBUILD_DOCS:BOOL=OFF \
-   -DBUILD_EXAMPLES:BOOL=OFF \
+   -DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \
-DBUILD_PACKAGE:BOOL=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -122,6 +122,14 @@ OPENCV_CONF_OPT:= \
-DWITH_OPENGL:BOOL=OFF \
-DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF)
 
+
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+
+$(STATEDIR)/opencv.install:
+   @$(call targetinfo)
+   @$(call world/install, OPENCV)
+   @$(call touch)
+
 # 
 # Target-Install
 # 
@@ -153,9 +161,8 @@ $(STATEDIR)/opencv.targetinstall:
 
@$(foreach lib, $(OPENCV_LIBS-y), \
$(call install_lib, opencv, 0, 0, 0644, $(lib));)
-
+   @$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin)
@$(call install_finish, opencv)
-
@$(call touch)
 
 # vim: syntax=make
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/3] host-ua-nodeset: New package.

2020-01-28 Thread Ulrich Ölmann 
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.

2020-01-28 Thread Ulrich Ölmann 
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.

2020-01-28 Thread Ulrich Ölmann 
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.

2020-01-28 Thread Ulrich Ölmann 
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

Re: [ptxdist] [PATCH v2 1/4] pam: new package

2020-01-28 Thread Roland Hieber 
On Mon, Jan 27, 2020 at 04:57:12PM +0100, Ladislav Michl wrote:
> On Mon, Jan 27, 2020 at 10:57:48AM +0100, Roland Hieber wrote:
> > On Mon, Jan 27, 2020 at 09:52:30AM +0100, Ladislav Michl wrote:
> > > Signed-off-by: Ladislav Michl 
> > > ---
> > >  Note: Package states, that alternatively GPL can be used as a license.
> > >  There is no GPL version specification and also some files claims LGPL
> > >  can be used. Also without specifying version. Debian package references
> > >  /usr/share/common-licenses/GPL which is symlink to actual GPL version
> > >  (GPL-3). Based on package age, we could probably read license as
> > >  GPL-2.0-or-later.
> > 
> > Yeah, I think we can use GPL-2.0-or-later here, given that there are
> > some PAM modules that specifically mention this version (e.g.
> > modules/pam_loginuid/).  Please also include AND LGPL-2.0-or-later
> > because of modules/pam_mkhomedir/ and modules/pam_issue/.
> 
> Hmm, do we expect C operator precedence or better write it like this:
> PAM_LICENSE := BSD-3-Clause OR (GPL-2.0-or-later AND LGPL-2.0-or-later)
> 
> I wouldn't use extra parentheses...

I think SPDX syntax requires parentheses in any case, but I'm not sure.
Too many parentheses are not wrong however, and better readable.

 - Roland

-- 
Roland Hieber, Pengutronix e.K.  | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de