[ptxdist] [PATCH] configure: fix regex for determining host tool versions
Previously, all of those _VERSION were empty on my system
Signed-off-by: Christian Hermann
---
configure.ac | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0549c38da..db2d85f77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ if test -z "$SED"; then
fi
AC_MSG_CHECKING([sed version])
-SED_VERSION=`$SED --version 2>/dev/null | $SED -ne "1
s/.*GNU.*\s\([[0-9\+\.]]\+\).*/\1/p"`
+SED_VERSION=`$SED --version 2>/dev/null | $SED -ne "1
s/.*GNU.*\s\([0-9\+\.]\+\).*/\1/p"`
case "$SED_VERSION" in
3.*) AC_MSG_ERROR([we need at least GNU sed 4.x but found $SED_VERSION]) ;;
4.*) ;;
@@ -209,7 +209,7 @@ dnl Check for awk
AC_PROG_AWK
AC_PATH_PROGS(AWK, ${AWK},)
AC_MSG_CHECKING([awk version])
-AWK_VERSION=`$AWK --version 2>/dev/null | $SED -ne "s/GNU [[Aa]]wk
\([[0-9\.]]*\)/\1/p"`
+AWK_VERSION=`$AWK --version 2>/dev/null | $SED -ne "s/GNU [Aa]wk
\([0-9\.]*\)/\1/p"`
case "$AWK_VERSION" in
"") AC_MSG_ERROR([we need GNU awk]) ;;
*) ;;
@@ -242,7 +242,7 @@ else
fi
AC_MSG_CHECKING([yacc/bison version])
-YACC_VERSION=`$YACC --version 2>/dev/null | $SED -ne "s/.*GNU Bison.*
\([[0-9.]]*\).*/\1/p"`
+YACC_VERSION=`$YACC --version 2>/dev/null | $SED -ne "s/.*GNU Bison.*
\([0-9.]*\).*/\1/p"`
case "${YACC_VERSION}" in
1.*)
AC_MSG_ERROR([$YACC_VERSION, your bison version is too old, install 2.3
or sth. like that]) ;;
@@ -283,7 +283,7 @@ if test -z "$WGET"; then
fi
AC_MSG_CHECKING([find version])
-FIND_VERSION=`$GNU_find --version 2>/dev/null | $SED -ne
"s/.*\s\+\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+\).*$/\1/p"`
+FIND_VERSION=`$GNU_find --version 2>/dev/null | $SED -ne
"s/.*\s\+\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/\1/p"`
case "$FIND_VERSION" in
4.*) ;;
*) AC_MSG_ERROR([we need at least GNU find 4.x]) ;;
@@ -295,7 +295,7 @@ AC_PATH_PROGS(MAKE, gmake gnumake make,, $PATH)
if test -z "$MAKE"; then
AC_MSG_ERROR([make could not be found, please install])
fi
-MAKE_VERSION=`$MAKE --version 2>/dev/null | $SED -ne "s/^GNU Make
\([[0-9]]\+\.[[0-9.]]\+\).*$/\1/p"`
+MAKE_VERSION=`$MAKE --version 2>/dev/null | $SED -ne "s/^GNU Make
\([0-9]\+\.[0-9.]\+\).*$/\1/p"`
MINOR_MAKE_VERSION="${MAKE_VERSION#*.}"
MAJOR_MAKE_VERSION="${MAKE_VERSION%.*}"
if test -z "${MAJOR_MAKE_VERSION}" -o -z "${MINOR_MAKE_VERSION}" ; then
@@ -347,7 +347,7 @@ dnl
dnl Check for Python 2.x
dnl
AC_MSG_CHECKING([Python version])
-PYTHON_VERSION=`$PYTHON --version 2>&1 | $SED -ne "1 s/Python
\([[0-9\+\.]]\+\).*/\1/p"`
+PYTHON_VERSION=`$PYTHON --version 2>&1 | $SED -ne "1 s/Python
\([0-9\+\.]\+\).*/\1/p"`
case "$PYTHON_VERSION" in
2.*) ;;
*) AC_MSG_ERROR([we need Python version 2.x but found $PYTHON_VERSION]) ;;
--
2.24.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] file: version bump 5.35 -> 5.36
* fetch via http instead of ftp * fix license identifier Signed-off-by: Christian Hermann --- rules/file.make | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rules/file.make b/rules/file.make index b721cf7e6..0d42cdece 100644 --- a/rules/file.make +++ b/rules/file.make @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_FILE) += file # # Paths and names # -FILE_VERSION := 5.35 -FILE_MD5 := 5f10fb45bdaffd729a572e563783b78e +FILE_VERSION := 5.36 +FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c FILE := file-$(FILE_VERSION) FILE_SUFFIX:= tar.gz -FILE_URL := ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) +FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) FILE_SOURCE:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX) FILE_DIR := $(BUILDDIR)/$(FILE) -FILE_LICENSE := BSD AND 2-term BSD +FILE_LICENSE := BSD-2-Clause +FILE_LICENSE_FILES := \ + file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3 \ + file://src/file.c;startline=1;endline=27;md5=c23a8098a761ce3193087925877307b9 # # Prepare -- 2.24.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] pciutils: version bump 3.3.0 -> 3.6.2
Signed-off-by: Christian Hermann --- rules/pciutils.make | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rules/pciutils.make b/rules/pciutils.make index b26350256..10e782859 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils # # Paths and names # -PCIUTILS_VERSION := 3.3.0 -PCIUTILS_MD5 := 3c19adf32a8457983b71ff376ef7dafe +PCIUTILS_VERSION := 3.6.2 +PCIUTILS_MD5 := 77963796d1be4f451b83e6da28ba4f82 PCIUTILS := pciutils-$(PCIUTILS_VERSION) PCIUTILS_SUFFIX:= tar.xz PCIUTILS_URL := $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX)) PCIUTILS_SOURCE:= $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX) PCIUTILS_DIR := $(BUILDDIR)/$(PCIUTILS) -PCIUTILS_LICENSE := GPL-2.0-only +PCIUTILS_LICENSE := GPL-2.0-or-later +PCIUTILS_LICENSE_FILES := \ + file://README;startline=4;endline=8;md5=e6d1f5496a9acbc746789a7b925d02e1 # # Prepare -- 2.24.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] tpm2-tools: add PIC flag to CFLAGS
Package prepare stage can fail on some platforms due to missing position independent code flag. Fix this package failure: checking whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS... yes checking whether C compiler accepts -fPIC... yes checking whether the linker accepts -shared... no configure: error: Cannot enable -shared, consider configuring with --disable-hardening Cc: Bastian Krause Signed-off-by: Bruno Thomsen --- rules/tpm2-tools.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make index 9fbb0cbc7..ead881ffb 100644 --- a/rules/tpm2-tools.make +++ b/rules/tpm2-tools.make @@ -41,6 +41,9 @@ TPM2_TOOLS_CONF_OPT := \ --without-gcov \ --without-bashcompdir +TPM2_TOOLS_CFLAGS := \ + -fPIC + # # Target-Install # -- 2.24.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] weston: Add init script
Signed-off-by: Guillermo Rodriguez
---
v2: Proper handling of init script and link
projectroot/etc/init.d/weston-init | 29 +
rules/weston-bbinit.in | 8
rules/weston.in| 5 +
rules/weston.make | 11 +++
4 files changed, 53 insertions(+)
create mode 100644 projectroot/etc/init.d/weston-init
create mode 100644 rules/weston-bbinit.in
diff --git a/projectroot/etc/init.d/weston-init
b/projectroot/etc/init.d/weston-init
new file mode 100644
index 0..fa6b96b07
--- /dev/null
+++ b/projectroot/etc/init.d/weston-init
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+start() {
+ OPENVT_ARGS="-c 1 -s"
+ WESTON_ARGS="--log=/var/log/weston.log"
+
+ test -f /etc/default/weston-init && . /etc/default/weston-init
+
+ if [ -z "$XDG_RUNTIME_DIR" ]; then
+ export XDG_RUNTIME_DIR=/run/xdg
+ mkdir -p "$XDG_RUNTIME_DIR"
+ chmod 0700 "$XDG_RUNTIME_DIR"
+ fi
+
+ echo "Starting Weston"
+ exec openvt $OPENVT_ARGS -- weston $WESTON_ARGS
+}
+
+stop() {
+ echo "Stopping Weston"
+ killall -q weston
+}
+
+case $1 in
+ start|stop) $1 ;;
+ restart) stop ; sleep 1 ; start ;;
+
+ *) echo "Usage: $0 {start|stop|restart}"; exit 1 ;;
+esac
diff --git a/rules/weston-bbinit.in b/rules/weston-bbinit.in
new file mode 100644
index 0..f0994d27e
--- /dev/null
+++ b/rules/weston-bbinit.in
@@ -0,0 +1,8 @@
+## SECTION=initmethod_bbinit
+
+config WESTON_BBINIT_LINK
+ string
+ depends on WESTON_STARTSCRIPT
+ prompt "weston-init"
+ default "S92weston-init"
+
diff --git a/rules/weston.in b/rules/weston.in
index d2ef2119b..75945d7e6 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -75,6 +75,11 @@ config WESTON_LAUNCH
weston-launch is a setuid-root program which does privileged
operations on Weston's behalf
+config WESTON_STARTSCRIPT
+ bool
+ default INITMETHOD_BBINIT
+ prompt "install /etc/init.d/weston-init"
+
config WESTON_SYSTEMD
bool
default INITMETHOD_SYSTEMD
diff --git a/rules/weston.make b/rules/weston.make
index 4c38fd2d1..eaabebe61 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -171,6 +171,17 @@ ifdef PTXCONF_WESTON_SYSTEMD
@$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
endif
+ifdef PTXCONF_INITMETHOD_BBINIT
+ifdef PTXCONF_WESTON_STARTSCRIPT
+ @$(call install_alternative, weston, 0, 0, 0755,
/etc/init.d/weston-init)
+ifneq ($(call remove_quotes,$(PTXCONF_WESTON_BBINIT_LINK)),)
+ @$(call install_link, weston, \
+ ../init.d/weston-init, \
+ /etc/rc.d/$(PTXCONF_WESTON_BBINIT_LINK))
+endif
+endif
+endif
+
@$(call install_copy, weston, 0, 0, 0755, -,
/usr/libexec/weston-simple-im)
@$(call install_copy, weston, 0, 0, 0755, -,
/usr/libexec/weston-desktop-shell)
@$(call install_copy, weston, 0, 0, 0755, -,
/usr/libexec/weston-keyboard)
--
2.21.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] How to express a dependency that can be satisfied by alternative packages
El mar., 7 ene. 2020 a las 12:29, Michael Olbrich () escribió: > > On Tue, Jan 07, 2020 at 12:11:19PM +0100, Guillermo Rodriguez Garcia wrote: > > El jue., 2 ene. 2020 a las 16:15, Michael Olbrich > > () escribió: > > > 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 > > > > What is exactly the meaning of RUNTIME? Why is it needed here? > > This means, that kbd is only needed at runtime and not at buildtime. This > relaxes the build dependencies a bit and allows more parallelization. > It's really only needed for the first line, but we add it to both for > consistency reasons. > > > Apart from that. What about the following: > > > > select KBDif !BUSYBOX > > select KBD_OPENVT if !BUSYBOX > > select BUSYBOX_OPENVT if BUSYBOX && !KBD_OPENVT > > > > This would prefer the Busybox version of openvt if none is explicitly > > selected and Busybox is already present (thus avoiding to pull in the > > kbd package if we can avoid it) > > Does that work? kconfig sometimes produces circular dependency errors, even > if they don't really exist. > If it works, then that's ok too (with the '&& RUNTIME' added). Uhm, indeed Kconfig complains. What would then be the way to achieve this: - If busybox is selected, then select BUSYBOX_OPENVT, unless KBD_OPENVT is already selected - If busybox is NOT selected, then select KBD_OPENVT ? The closest I've got is this: select KBDif !BUSYBOX select KBD_OPENVT if !BUSYBOX select BUSYBOX_OPENVT if BUSYBOX But this will end up selecting both versions of openvt if KBD_OPENVT was already selected... Guillermo -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mesalib: version bump 19.2.6 -> 19.3.1
Signed-off-by: Philipp Zabel --- rules/host-mesalib.make | 1 + rules/mesalib.make | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index eeab6a4d360a..65734991679e 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -49,6 +49,7 @@ HOST_MESALIB_CONF_OPT := \ -Dllvm=false \ -Dlmsensors=false \ -Domx-libs-path=/usr/lib/dri \ + -Dopencl-spirv=false \ -Dopengl=true \ -Dosmesa=none \ -Dosmesa-bits=8 \ diff --git a/rules/mesalib.make b/rules/mesalib.make index 264c9798021a..619f1dc15554 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 19.2.6 -MESALIB_MD5:= 696fd473c8956c81da1c04928ec08aa9 +MESALIB_VERSION:= 19.3.1 +MESALIB_MD5:= 5c5965db31993af47fee82c9a7ccba5e MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ @@ -111,6 +111,7 @@ MESALIB_CONF_OPT:= \ -Dllvm=false \ -Dlmsensors=$(call ptx/truefalse, PTXCONF_MESALIB_LMSENSORS) \ -Domx-libs-path=/usr/lib/dri \ + -Dopencl-spirv=false \ -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ -Dosmesa=none \ -Dosmesa-bits=8 \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 2/3] tpm2-tools: version bump 3.1.4 -> 4.1
Hi Bastian, Den man. 6. jan. 2020 kl. 15.41 skrev Bastian Krause : > > >>> TPM2_TOOLS_CFLAGS := \ > >>> -fPIC > >>> > >>> > >>> I don't know if this is the correct fix or something else is the root > >>> cause. > >> > >> Looks okay to me. Let's wait what Michael has to say about it. > > > > That makes sense to me. I think this should be handled correctly > > internally, but I think for a lot if distributions that's already the > > default in the toolchain, so it does not fail there. > > Alright. Bruno, could you send this as a proper patch? Yes, I can do that. Bruno ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/4] OpenCV: added -v flag when installing examples
--- rules/opencv.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/opencv.make b/rules/opencv.make index 2602bb253..ecd47c722 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -215,7 +215,7 @@ $(STATEDIR)/opencv.install: 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; \ + install -v -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ done endif @$(call touch) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/4] OpenCV: removed unnecessary source in install_tree
--- rules/opencv.make | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index ecd47c722..531b3bbf4 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -252,10 +252,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) + $(call install_tree, opencv, 0, 0, - , /usr/share/opencv/examples) endif @$(call install_finish, opencv) - @$(call touch) # vim: syntax=make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/4] changed and removed various cmake-flags
various flags are not specified anymore or automatically set by Cmake, i.e. any *-NOTFOUND or *-FOUND flag is autoset any paths to external program(libraries) like LAPACK or Python are auto-detected platform/hardware-support like NEON or VFPV3 are auto-detected we may want to have OPENCV_GENERATE_PKGCONFIG=ON libopencv_legacy and libopencv_shape do not exist anymore --- rules/opencv.make | 30 +- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index 531b3bbf4..0a6fd7a12 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -37,9 +37,6 @@ OPENCV_CONF_TOOL := cmake OPENCV_CONF_OPT:= \ $(CROSS_CMAKE_USR) \ -DANT_EXECUTABLE:FILEPATH= \ - -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) \ @@ -84,10 +81,7 @@ OPENCV_CONF_OPT := \ -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 \ @@ -108,21 +102,14 @@ OPENCV_CONF_OPT := \ -DENABLE_PROFILING=OFF \ -DENABLE_SOLUTION_FOLDERS=OFF \ -DENABLE_VFPV3: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= \ - -DMKL_INCLUDE_DIRS=MKL_ROOT_DIR-NOTFOUND/include \ -DMKL_WITH_OPENMP=OFF \ -DMKL_WITH_TBB=OFF \ - -DOPENCL_FOUND=ON \ -DOPENCV_DOWNLOAD_PATH=$(OPENCV_DIR)/.cache \ -DOPENCV_DUMP_HOOKS_FLOW=OFF \ -DOPENCV_ENABLE_MEMALIGN=ON \ @@ -130,24 +117,11 @@ OPENCV_CONF_OPT := \ -DOPENCV_ENABLE_NONFREE=OFF \ -DOPENCV_EXTRA_MODULES_PATH:PATH= \ -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ - -DOPENCV_GENERATE_PKGCONFIG=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_SETUPVARS=ON \ - -DOPENCV_MATHJAX_RELPATH=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0 \ -DOPENCV_PYTHON3_VERSION=OFF \ -DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \ -DPROTOBUF_UPDATE_FILES=OFF \ - -DPYTHON2_EXECUTABLE= \ - -DPYTHON2_INCLUDE_DIR2= \ - -DPYTHON2_LIBRARY= \ - -DPYTHON2_LIBRARY_DEBUG= \ - -DPYTHON2_NUMPY_INCLUDE_DIRS= \ - -DPYTHON2_PACKAGES_PATH= \ - -DPYTHON3_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON3_INCLUDE_DIR2= \ - -DPYTHON3_LIBRARY= \ - -DPYTHON3_LIBRARY_DEBUG= \ - -DPYTHON3_NUMPY_INCLUDE_DIRS= \ - -DPYTHON3_PACKAGES_PATH=lib/python3.7/dist-packages \ -DWITH_1394:BOOL=OFF \ -DWITH_ADE=ON \ -DWITH_ARAVIS=OFF \ @@ -231,12 +205,10 @@ OPENCV_LIBS-$(PTXCONF_OPENCV_FLANN) += libopencv_flann OPENCV_LIBS-$(PTXCONF_OPENCV_HIGHGUI) += libopencv_highgui OPENCV_LIBS-$(PTXCONF_OPENCV_IMGCODECS)+= libopencv_imgcodecs OPENCV_LIBS-$(PTXCONF_OPENCV_IMGPROC) += libopencv_imgproc -OPENCV_LIBS-$(PTXCONF_OPENCV_LEGACY) += libopencv_legacy OPENCV_LIBS-$(PTXCONF_OPENCV_ML) += libopencv_ml OPENCV_LIBS-$(PTXCONF_OPENCV_OBJDETECT)+= libopencv_objdetect OPENCV_LIBS-$(PTXCONF_OPENCV_PHOTO)+= libopencv_photo OPENCV_LIBS-$(PTXCONF_OPENCV_STITCHING)+= libopencv_stitching -OPENCV_LIBS-$(PTXCONF_OPENCV_SHAPE)+= libopencv_shape OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEO)+= libopencv_video OPENCV_LIBS-$(PTXCONF_OPENCV_VIDEOIO) += libopencv_videoio -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/4] OpenCV: Removed blank lines
--- rules/opencv.make | 2 -- 1 file changed, 2 deletions(-) diff --git a/rules/opencv.make b/rules/opencv.make index d2fb5aa44..2602bb253 100644 --- a/rules/opencv.make +++ b/rules/opencv.make @@ -210,8 +210,6 @@ OPENCV_CONF_OPT := \ $(STATEDIR)/opencv.install: - - @$(call targetinfo) @$(call world/install, OPENCV) ifdef PTXCONF_OPENCV_EXAMPLES -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] How to express a dependency that can be satisfied by alternative packages
On Tue, Jan 07, 2020 at 12:11:19PM +0100, Guillermo Rodriguez Garcia wrote: > El jue., 2 ene. 2020 a las 16:15, Michael Olbrich > () escribió: > > 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 > > What is exactly the meaning of RUNTIME? Why is it needed here? This means, that kbd is only needed at runtime and not at buildtime. This relaxes the build dependencies a bit and allows more parallelization. It's really only needed for the first line, but we add it to both for consistency reasons. > Apart from that. What about the following: > > select KBDif !BUSYBOX > select KBD_OPENVT if !BUSYBOX > select BUSYBOX_OPENVT if BUSYBOX && !KBD_OPENVT > > This would prefer the Busybox version of openvt if none is explicitly > selected and Busybox is already present (thus avoiding to pull in the > kbd package if we can avoid it) Does that work? kconfig sometimes produces circular dependency errors, even if they don't really exist. If it works, then that's ok too (with the '&& RUNTIME' added). 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
Re: [ptxdist] How to express a dependency that can be satisfied by alternative packages
El jue., 2 ene. 2020 a las 16:15, Michael Olbrich () escribió: > > 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 What is exactly the meaning of RUNTIME? Why is it needed here? Apart from that. What about the following: select KBDif !BUSYBOX select KBD_OPENVT if !BUSYBOX select BUSYBOX_OPENVT if BUSYBOX && !KBD_OPENVT This would prefer the Busybox version of openvt if none is explicitly selected and Busybox is already present (thus avoiding to pull in the kbd package if we can avoid it) Best, Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] weston: Add init script
El lun., 6 ene. 2020 a las 12:18, Michael Olbrich () escribió: > > On Thu, Dec 12, 2019 at 01:54:57PM +0100, Guillermo Rodríguez wrote: > > Signed-off-by: Guillermo Rodriguez > > --- > > Please take a look at how other packages handle this. You'll need a > WESTON_STARTSCRIPT option in weston.in and weston-bbinit.in for the link. I had looked at Avahi. Apparently it is the only package that does it in a different way :-/ Will submit a v2, thank you. Guillermo ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] ckermit: Move out of staging.
As we have fix for the failing build now, we can keep the package in its previous location. Signed-off-by: Björn Esser --- rules/ckermit.in| 7 +-- rules/host-ckermit.in | 4 +--- rules/host-testframework.in | 2 -- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/rules/ckermit.in b/rules/ckermit.in index 72e5a4b07..56d75080f 100644 --- a/rules/ckermit.in +++ b/rules/ckermit.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=communication +## SECTION=communication config CKERMIT tristate @@ -13,6 +11,3 @@ config CKERMIT help Columbia Univ 'kermit' terminal program: Basic file transfer & terminal control. - - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with glibc-2.28. diff --git a/rules/host-ckermit.in b/rules/host-ckermit.in index effcdb6e4..0f4ac657f 100644 --- a/rules/host-ckermit.in +++ b/rules/host-ckermit.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=hosttools_noprompt +## SECTION=hosttools_noprompt config HOST_CKERMIT tristate diff --git a/rules/host-testframework.in b/rules/host-testframework.in index e51251bbd..f993945eb 100644 --- a/rules/host-testframework.in +++ b/rules/host-testframework.in @@ -4,6 +4,4 @@ config HOST_TESTFRAMEWORK tristate prompt "host-side testing framework " select HOST_LRZSZ - # STAGING: remove in ptxdist-2020.06.0 - depends on STAGING select HOST_CKERMIT -- 2.24.0 ___ ptxdist mailing list ptxdist@pengutronix.de
