[ptxdist] [PATCH v3 3/3] opensc: Reactivate testsuite option
Signed-off-by: Alexander Dahl --- rules/opensc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/opensc.in b/rules/opensc.in index eeda1e43d..c6a00419e 100644 --- a/rules/opensc.in +++ b/rules/opensc.in @@ -7,6 +7,7 @@ menuconfig OPENSC select OPENCT if OPENSC_OPENCT select PCSC_LITEif OPENSC_PCSC select OPENSSL if OPENSC_OPENSSL + select CMOCKA if OPENSC_TESTSUITE help Smart card utilities with support for PKCS#15 compatible cards @@ -44,8 +45,7 @@ config OPENSC_TOOLS bool "install tools" config OPENSC_TESTSUITE - # needs cmocka - depends on BROKEN bool "install testsuite" + select OPENSC_OPENSSL endif -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 1/3] cmocka: new package
From: Alexander Dahl This adds the unit testing framework for C called 'cmocka'. Signed-off-by: Alexander Dahl --- Notes: v1 -> v2: * use make $(basename …) for building URL from VERSION rules/cmocka.in | 13 ++ rules/cmocka.make | 60 +++ 2 files changed, 73 insertions(+) create mode 100644 rules/cmocka.in create mode 100644 rules/cmocka.make diff --git a/rules/cmocka.in b/rules/cmocka.in new file mode 100644 index 0..d18cf00ff --- /dev/null +++ b/rules/cmocka.in @@ -0,0 +1,13 @@ +## SECTION=test_suites + +config CMOCKA + tristate + prompt "cmocka" + select HOST_CMAKE + help + cmocka is ... an elegant unit testing framework for C with + support for mock objects. It only requires the standard C + library, works on a range of computing platforms (including + embedded) and with different compilers. + +# vim: ft=kconfig noet tw=72 ts=8 sw=8 diff --git a/rules/cmocka.make b/rules/cmocka.make new file mode 100644 index 0..a25939bbe --- /dev/null +++ b/rules/cmocka.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Alexander Dahl +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_CMOCKA) += cmocka + +# +# Paths and names +# +CMOCKA_VERSION := 1.1.5 +CMOCKA_MD5 := 91f95cd5db88b9b120d191b18d367193 +CMOCKA := cmocka-$(CMOCKA_VERSION) +CMOCKA_SUFFIX := tar.xz +CMOCKA_URL := https://cmocka.org/files/$(basename $(CMOCKA_VERSION))/$(CMOCKA).$(CMOCKA_SUFFIX) +CMOCKA_SOURCE := $(SRCDIR)/$(CMOCKA).$(CMOCKA_SUFFIX) +CMOCKA_DIR := $(BUILDDIR)/$(CMOCKA) +CMOCKA_LICENSE := Apache-2.0 +CMOCKA_LICENSE_FILES := file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +CMOCKA_CONF_TOOL := cmake +CMOCKA_CONF_OPT:= \ + $(CROSS_CMAKE_USR) \ + -DBUILD_TESTING=OFF \ + -DPICKY_DEVELOPER:BOOL=OFF \ + -DUNIT_TESTING:BOOL=OFF \ + -DWITH_CMOCKERY_SUPPORT:BOOL=OFF \ + -DWITH_EXAMPLES:BOOL=OFF \ + -DWITH_STATIC_LIB=OFF + +# +# Target-Install +# + +$(STATEDIR)/cmocka.targetinstall: + @$(call targetinfo) + + @$(call install_init, cmocka) + @$(call install_fixup, cmocka,PRIORITY,optional) + @$(call install_fixup, cmocka,SECTION,base) + @$(call install_fixup, cmocka,AUTHOR,"Alexander Dahl ") + @$(call install_fixup, cmocka,DESCRIPTION,missing) + + @$(call install_lib, cmocka, 0, 0, 0644, libcmocka) + + @$(call install_finish, cmocka) + + @$(call touch) + +# vim: ft=make noet tw=72 ts=8 sw=8 -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 2/3] opensc: version bump 0.19.0 -> 0.20.0
Signed-off-by: Alexander Dahl --- rules/opensc.make | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rules/opensc.make b/rules/opensc.make index 80f578d03..b4ec2d623 100644 --- a/rules/opensc.make +++ b/rules/opensc.make @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_OPENSC) += opensc # # Paths and names # -OPENSC_VERSION := 0.19.0 -OPENSC_MD5 := 40734b2343cf83c62c4c403f8a37475e -OPENSC := OpenSC-$(OPENSC_VERSION) +OPENSC_VERSION := 0.20.0 +OPENSC_MD5 := c291219b6189793430f9d0c40b42b907 +OPENSC := opensc-$(OPENSC_VERSION) OPENSC_SUFFIX := tar.gz OPENSC_URL := https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION)/$(OPENSC).$(OPENSC_SUFFIX) OPENSC_SOURCE := $(SRCDIR)/$(OPENSC).$(OPENSC_SUFFIX) @@ -39,6 +39,7 @@ OPENSC_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --sysconfdir=/etc/opensc \ --enable-optimization \ + --disable-fuzzing \ --disable-strict \ --disable-pedantic \ --enable-thread-locking \ @@ -56,8 +57,11 @@ OPENSC_CONF_OPT := \ --disable-doc \ --disable-dnie-ui \ --disable-notify \ - --$(call ptx/endis,PTXCONF_OPENSC_TESTSUITE)-tests \ - --disable-static + --disable-autostart-items \ + --$(call ptx/endis,PTXCONF_OPENSC_TESTSUITE)-cmocka \ + --disable-static \ + --disable-assert \ + --without-cygwin-native # # Target-Install -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 0/3] cmocka: new package
Hei hei, this basically adds the version bump of opensc from 0.19.0 to 0.20.0, so now that one builds with cmocka tests. The cmocka part of this series did not change and I already had some practical experience with that in December. Works for me. ;-) For the OpenSC part: please test! I don't use that, I was just curious if those unit tests previously marked broken would build now cmocka is available. ;-) Greets Alex Alexander Dahl (3): cmocka: new package opensc: version bump 0.19.0 -> 0.20.0 opensc: Reactivate testsuite option rules/cmocka.in | 13 ++ rules/cmocka.make | 60 +++ rules/opensc.in | 4 ++-- rules/opensc.make | 14 +++ 4 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 rules/cmocka.in create mode 100644 rules/cmocka.make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to express a dependency that can be satisfied by alternative packages
Hi, On Thu, Jan 02, 2020 at 12:53:36PM +0100, Roland Hieber wrote: > On Mon, Dec 16, 2019 at 07:23:13PM +0100, Guillermo Rodriguez Garcia wrote: > > Let's say I have a package that requires a specific cmd line utility > > (e.g. openvt). > > This can be provided by two different packages (e.g. busybox or kbd) > > How to express that dependency in the .in file of my package ? > > PTXdist (or rather kconfig) does not have a notion of "provides" or > metapackages. I think is currently no way other than making a choice > option that selects the one or the other, or letting your config option > deoend on BUSYBOX_OPENVT || KBD_OPENVT. In the latter case it is > probably good to add a comment above it that depends on the opposite > value notifying the user that neither one of them is selected (see the > comment above IPTABLES_INSTALL_IPTABLES_APPLY in iptables.in for > example). Actually, the correct way to do this is probably: select KBD if !BUSYBOX_OPENVT && RUNTIME select KBD_OPENVT if !BUSYBOX_OPENVT && RUNTIME rules/openvpn.in or rules/easy-rsa.in already do something like this. Using 'depends' is not really a good idea. It hides options and can cause Dependency Chains that cannot be resolved automatically. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://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
[ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5
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 ac096d60c..415db9e1e 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 1656f605a..c2d91f9b5 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -195,7 +195,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 2/6] OpenCV: Added flag to build and integrate Examples
Signed-off-by: Marian Cichy --- rules/opencv.in | 5 + rules/opencv.make | 22 -- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 37fd32758..ac096d60c 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -131,4 +131,9 @@ config OPENCV_QT help QT GUI Support +config OPENCV_EXAMPLES + bool + prompt "Build Examples" + 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..fc6243753 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,22 @@ 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) +ifdef PTXCONF_OPENCV_EXAMPLES + @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples + find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \ + install -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ + done +endif + @$(call touch) + # # Target-Install # @@ -153,7 +169,9 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - +ifdef PTXCONF_OPENCV_EXAMPLES + $(call install_tree, opencv, 0, 0, $(OPENCV_PKGDIR)/usr/share/opencv/examples, /usr/share/opencv/examples) +endif @$(call install_finish, opencv) @$(call touch) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2.
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 5/6] OpenCV: added switch to turn on/off DNN support
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 415db9e1e..12b44606f 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 c2d91f9b5..c37ee5e2e 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -65,7 +65,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 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff
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 c37ee5e2e..d2fb5aa44 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -63,24 +63,24 @@ 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_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \ -DBUILD_opencv_videoio=ON \ -DBUILD_opencv_world:BOOL=OFF \ -DCAROTENE_NS=carotene_o4t \ @@ -101,7 +101,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 \ @@ -162,7 +162,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 \ @@ -178,7 +178,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 \ @@ -200,7 +200,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 3/6] OpenCV: Clean up configure_helper output
Signed-off-by: Marian Cichy --- rules/opencv.make | 182 +- 1 file changed, 133 insertions(+), 49 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index fc6243753..1656f605a 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,178 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -DPYTHON_EXECUTABLE= \ + -DAtlas_BLAS_LIBRARY=Atlas_BLAS_LIBRARY-NOTFOUND \ + -DAtlas_CBLAS_LIBRARY=Atlas_CBLAS_LIBRARY-NOTFOUND \ + -DAtlas_LAPACK_LIBRARY=Atlas_LAPACK_LIBRARY-NOTFOUND \ + -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=ON \ + -DBUILD_opencv_world:BOOL=OFF \ + -DCAROTENE_NS=carotene_o4t \ + -DCMAKE_CONFIGURATION_TYPES="Debug;Release" \ + -DCPU_BASELINE=DETECT \ + -DCPU_BASELINE_DISABLE=";VFPV3" \ + -DCPU_BASELINE_REQUIRE=";NEON" \ + -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 \ + -DEXECUTABLE_OUTPUT_PATH=$(OPENCV_BUILD_DIR)/bin \ + -DGENERATE_ABI_DESCRIPTOR=OFF \ -DINSTALL_CREATE_DISTRIB:BOOL=OFF \ -DINSTALL_C_EXAMPLES:BOOL=OFF \ -DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \ + -DINSTALL_TESTS=OFF \ -DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \ + -DLAPACK_CBLAS_H= \ + -DLAPACK_IMPL=Unknown \ + -DLAPACK_LAPACKE_H= \ + -DLAPACK_LIBRARIES= \ +
Re: [ptxdist] [PATCH] zstd: new package
Hi Florian, unfortunately your mailer seems to apply word wrapping to the patch, so it didn't apply for me. The git-format-patch manpage [1] has some tips how to prevent that. [1]: https://git-scm.com/docs/git-format-patch#_thunderbird Nevertheless some feedback below: On Fri, Dec 27, 2019 at 06:13:19PM +0100, Florian Faber wrote: > > Add zstd-1.4.4 to the repository. > > Signed-off-by: Florian Faber > --- > diff -upNr a/zstd.in rules/zstd.in > --- a/zstd.in 1970-01-01 01:00:00.0 +0100 > +++ b/zstd.in 2019-12-18 16:56:31.0 +0100 > @@ -0,0 +1,42 @@ > +## SECTION=shell_and_console > + > +menuconfig ZSTD > + bool > + prompt "zstd" We'd like all "-->" submenu markers to line up in the graphical menu, so please add an appropriate amount of whitespace to the end of the string. Also please indent the lines with one tab here instead of spaces. > + select HOST_CMAKE > + help > + zstd is a fast lossless compression algorithm and data > + compression tool, with command line syntax similar to > + gzip and xz. It is based on the LZ77 family, with further > + FSE & huff0 entropy stages. zstd offers highly configurable > + compression speed, with fast modes at > 200 MB/s per code, > + and strong modes nearing lzma compression ratios. It also > + features a very fast decoder, with speeds > 500 MB/s per core. > + > +if ZSTD > + > +config ZSTD_LIBZSTD > + tristate Hmm, sub-options usually are not tristate, but I guess it doesn't hurt either. > + prompt "install zstd library" > + > +config ZSTD_ZSTD > + tristate > + select ZSTD_LIBZSTD > + prompt "install zstd tool" > + > +config ZSTD_ZSTDCAT > + tristate > + select ZSTD_LIBZSTD > + prompt "install zstdcat" zstdcat seems to be a link to zstd, so you have to select ZSTD_ZSTD here too. > + > +config ZSTD_ZSTDGREP > + tristate > + select ZSTD_LIBZSTD > + prompt "install zstdgrep" > + > +config ZSTD_ZSTDLESS > + tristate > + select ZSTD_LIBZSTD > + prompt "install zstdless" > + > +endif > diff -upNr a/zstd.make rules/zstd.make > --- a/zstd.make 1970-01-01 01:00:00.0 +0100 > +++ b/zstd.make 2019-12-18 16:52:12.0 +0100 > @@ -0,0 +1,69 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Florian Faber > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_ZSTD) += zstd > + > +# > +# Paths and names > +# > +ZSTD_VERSION := 1.4.4 > +ZSTD_MD5 := 532aa7b3a873e144bbbedd9c0ea87694 > +ZSTD := zstd-$(ZSTD_VERSION) > +ZSTD_SUFFIX:= tar.gz > +ZSTD_URL := > https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX) > +ZSTD_SOURCE:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX) > +ZSTD_DIR := $(BUILDDIR)/$(ZSTD) > +ZSTD_SUBDIR:= build/cmake > +ZSTD_LICENSE := BSD > + > +# > > +# Prepare > +# > Mangled line, keep these separators on one line with the comment marker. > + > +ZSTD_CONF_TOOL := cmake > +ZSTD_BUILD_DIR := $(ZSTD_DIR)-build > +ZSTD_CONF_OPT := \ > + $(CROSS_CMAKE_USR) \ > + -B$(ZSTD_BUILD_DIR) > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/zstd.targetinstall: > + @$(call targetinfo) Make sure to indent with tabs here, not spaces, or make will error out because of syntax errors. > + > + @$(call install_init, zstd) > + @$(call install_fixup, zstd, PRIORITY, optional) > + @$(call install_fixup, zstd, SECTION, base) > + @$(call install_fixup, zstd, AUTHOR, "Florian Faber > ") Mangled line. > + @$(call install_fixup, zstd, DESCRIPTION, missing) > + > +ifdef PTXCONF_ZSTD_LIBZSTD > + $(call install_lib, zstd, 0, 0, 0644, libzstd) > +endif > +ifdef PTXCONF_ZSTD_ZSTD > + $(call install_copy, zstd, 0, 0, 0755, -, /usr/bin/zstd) > +endif > +ifdef PTXCONF_ZSTD_ZSTDCAT > + $(call install_copy, zstd, 0, 0, 0755, -, /usr/bin/zstdcat) This generates an error: ptxdist: error: file 'distrokit-next/platform-v7a/packages/zstd-1.4.4/usr/bin/zstdcat' is a link using 'distrokit-next/platform-v7a/packages/zstd-1.4.4/usr/bin/zstd' instead Use $(call install_link, ...) instead. - Roland > +endif > +ifdef PTXCONF_ZSTD_ZSTDGREP > + $(call install_copy, zstd, 0, 0, 0755, -, /usr/bin/zstdgrep) > +endif > +ifdef PTXCONF_ZSTD_ZSTDLESS > + $(call install_copy, zstd, 0, 0, 0755, -, /usr/bin/zstdless) > +endif > + > + @$(call install_finish, zstd) > + > + @$(call touch) > -- > Machines can do the work, so people have
[ptxdist] [PATCH v2] systemd: install systemd-timesync.list in ntp-units.d
When systemd-timesyncd is used, there should be an entry in ntp-units.d. Otherwise, timedatectl set-ntp sometimes fails with "NTP not supported". Signed-off-by: Clemens Gruber --- Changes from v1: - Changed install_tree to install_alternative to support overriding and to let other packages install ntp-units.d files as well .../usr/lib/systemd/ntp-units.d/80-systemd-timesync.list| 1 + rules/systemd.make | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list diff --git a/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list b/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list new file mode 100644 index 0..d5959ade8 --- /dev/null +++ b/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list @@ -0,0 +1 @@ +systemd-timesyncd.service diff --git a/rules/systemd.make b/rules/systemd.make index 5564d893f..2ecb3b648 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -432,6 +432,8 @@ ifdef PTXCONF_SYSTEMD_TIMEDATE /var/lib/systemd/timesync) @$(call install_link, systemd, ../systemd-timesyncd.service, \ /usr/lib/systemd/system/sysinit.target.wants/systemd-timesyncd.service) + @$(call install_alternative, systemd, 0, 0, 0664, \ + /usr/lib/systemd/ntp-units.d/80-systemd-timesync.list) endif ifdef PTXCONF_SYSTEMD_VCONSOLE -- 2.24.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] systemd: install systemd-timesync.list in ntp-units.d
Hi Denis, On Thu, Jan 02, 2020 at 09:46:21AM +, Denis OSTERLAND wrote: > Hi Clemens, > > Am Montag, den 23.12.2019, 15:45 +0100 schrieb Clemens Gruber: > > When systemd-timesyncd is used, there should be an entry in ntp-units.d. > > Otherwise, timedatectl set-ntp sometimes fails with "NTP not supported". > > > > Signed-off-by: Clemens Gruber > > --- > > projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list | 1 + > > rules/systemd.make | 1 + > > 2 files changed, 2 insertions(+) > > create mode 100644 > > projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > > > > diff --git > > a/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > > b/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > > new file mode 100644 > > index 0..d5959ade8 > > --- /dev/null > > +++ b/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > > @@ -0,0 +1 @@ > > +systemd-timesyncd.service > > diff --git a/rules/systemd.make b/rules/systemd.make > > index 5564d893f..6b7ec83ab 100644 > > --- a/rules/systemd.make > > +++ b/rules/systemd.make > > @@ -432,6 +432,7 @@ ifdef PTXCONF_SYSTEMD_TIMEDATE > > /var/lib/systemd/timesync) > > @$(call install_link, systemd, ../systemd-timesyncd.service, \ > > > > /usr/lib/systemd/system/sysinit.target.wants/systemd-timesyncd.service) > > + @$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/ntp-units.d/) > why install_tree and not install_alternative just this file? > Is there no other valid content of this file? > Is it unlikely that other packages will install to this directory? You are right, install_tree is not the right choice, because users should be able to override it or symlink it to /dev/null. And other packages like ntpd might supply their own ntp-units.d file, correct. I will send a v2 with install_alternative of the 80-systemd-timesync.list file shortly. Thanks, Clemens ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-meson: version bump 0.51.2 -> 0.52.1
Hi Björn, On Thu, Dec 26, 2019 at 05:55:22PM +0100, Björn Esser wrote: > Signed-off-by: Björn Esser > --- > rules/host-meson.make | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/rules/host-meson.make b/rules/host-meson.make > index a12b03652..73371872d 100644 > --- a/rules/host-meson.make > +++ b/rules/host-meson.make > @@ -14,14 +14,14 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson > # > # Paths and names > # > -HOST_MESON_VERSION := 0.51.2 > -HOST_MESON_MD5 := d46c4a8e3cfd27f90e2c6fe4a69e574b > -HOST_MESON := meson-$(HOST_MESON_VERSION) > -HOST_MESON_SUFFIX:= tar.gz > -HOST_MESON_URL := > https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX) > -HOST_MESON_SOURCE:= $(SRCDIR)/$(HOST_MESON).$(HOST_MESON_SUFFIX) > -HOST_MESON_DIR := $(HOST_BUILDDIR)/$(HOST_MESON) > -HOST_MESON_LICENSE := Apache-2.0 > +HOST_MESON_VERSION := 0.52.1 > +HOST_MESON_MD5 := a5f0c99567d772508f649a28ded7f8ad > +HOST_MESON := meson-$(HOST_MESON_VERSION) > +HOST_MESON_SUFFIX:= tar.gz > +HOST_MESON_URL := > https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX) > +HOST_MESON_SOURCE:= $(SRCDIR)/$(HOST_MESON).$(HOST_MESON_SUFFIX) > +HOST_MESON_DIR := $(HOST_BUILDDIR)/$(HOST_MESON) > +HOST_MESON_LICENSE := Apache-2.0 > HOST_MESON_LICENSE_FILES := > file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 Please keep functional changes and whitespace modifications in separate commits so they can easily be backported. - 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
Re: [ptxdist] How to express a dependency that can be satisfied by alternative packages
On Mon, Dec 16, 2019 at 07:23:13PM +0100, Guillermo Rodriguez Garcia wrote: > Hi all, > > Let's say I have a package that requires a specific cmd line utility > (e.g. openvt). > This can be provided by two different packages (e.g. busybox or kbd) > How to express that dependency in the .in file of my package ? PTXdist (or rather kconfig) does not have a notion of "provides" or metapackages. I think is currently no way other than making a choice option that selects the one or the other, or letting your config option deoend on BUSYBOX_OPENVT || KBD_OPENVT. In the latter case it is probably good to add a comment above it that depends on the opposite value notifying the user that neither one of them is selected (see the comment above IPTABLES_INSTALL_IPTABLES_APPLY in iptables.in for example). - 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
Re: [ptxdist] [PATCH] systemd: install systemd-timesync.list in ntp-units.d
Hi Clemens, Am Montag, den 23.12.2019, 15:45 +0100 schrieb Clemens Gruber: > When systemd-timesyncd is used, there should be an entry in ntp-units.d. > Otherwise, timedatectl set-ntp sometimes fails with "NTP not supported". > > Signed-off-by: Clemens Gruber > --- > projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list | 1 + > rules/systemd.make | 1 + > 2 files changed, 2 insertions(+) > create mode 100644 > projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > > diff --git a/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > b/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > new file mode 100644 > index 0..d5959ade8 > --- /dev/null > +++ b/projectroot/usr/lib/systemd/ntp-units.d/80-systemd-timesync.list > @@ -0,0 +1 @@ > +systemd-timesyncd.service > diff --git a/rules/systemd.make b/rules/systemd.make > index 5564d893f..6b7ec83ab 100644 > --- a/rules/systemd.make > +++ b/rules/systemd.make > @@ -432,6 +432,7 @@ ifdef PTXCONF_SYSTEMD_TIMEDATE > /var/lib/systemd/timesync) > @$(call install_link, systemd, ../systemd-timesyncd.service, \ > > /usr/lib/systemd/system/sysinit.target.wants/systemd-timesyncd.service) > + @$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/ntp-units.d/) why install_tree and not install_alternative just this file? Is there no other valid content of this file? Is it unlikely that other packages will install to this directory? Regards Denis > endif > > ifdef PTXCONF_SYSTEMD_VCONSOLE Diehl Connectivity Solutions GmbH Geschäftsführung: Horst Leonberger Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht Nürnberg: HRB 32315 ___ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/ The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. - For general information on data protection and your respective rights please visit https://www.diehl.com/group/en/transparency-and-information-obligations/ ___ ptxdist mailing list ptxdist@pengutronix.de
