From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 22 Jan 2025 17:34:31 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tadgU-0037B5-1L for lore@lore.pengutronix.de; Wed, 22 Jan 2025 17:34:31 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tadgU-0002cS-T4; Wed, 22 Jan 2025 17:34:30 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tadgG-0002cD-Tv; Wed, 22 Jan 2025 17:34:16 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tadgG-001JdE-2O; Wed, 22 Jan 2025 17:34:16 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tadgG-005xw4-2F; Wed, 22 Jan 2025 17:34:16 +0100 Date: Wed, 22 Jan 2025 17:34:16 +0100 From: Michael Olbrich To: Rouven Czerwinski Message-ID: References: <20250122084358.3901992-1-r.czerwinski@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250122084358.3901992-1-r.czerwinski@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] libosdp: new package X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false On Wed, Jan 22, 2025 at 09:43:58AM +0100, Rouven Czerwinski wrote: > Add libosdp for support of the osdp protocol. Add a patch to build the > osdpctl program without the rest of the utilities, it is otherwise not > possible to build osdpctl without the python bindings. > > Signed-off-by: Rouven Czerwinski > --- > ...eLists-build-ospdctl-in-library-mode.patch | 29 ++++++ > patches/libosdp-2.4.0/series | 1 + > rules/libosdp.in | 9 ++ > rules/libosdp.make | 90 +++++++++++++++++++ > 4 files changed, 129 insertions(+) > create mode 100644 patches/libosdp-2.4.0/0001-CMakeLists-build-ospdctl-in-library-mode.patch > create mode 100644 patches/libosdp-2.4.0/series > create mode 100644 rules/libosdp.in > create mode 100644 rules/libosdp.make > > diff --git a/patches/libosdp-2.4.0/0001-CMakeLists-build-ospdctl-in-library-mode.patch b/patches/libosdp-2.4.0/0001-CMakeLists-build-ospdctl-in-library-mode.patch > new file mode 100644 > index 000000000..7f1c53cce > --- /dev/null > +++ b/patches/libosdp-2.4.0/0001-CMakeLists-build-ospdctl-in-library-mode.patch > @@ -0,0 +1,29 @@ > +From dbf9ac4f156f545c233e3259995c00413c68ba3f Mon Sep 17 00:00:00 2001 > +From: Rouven Czerwinski > +Date: Fri, 1 Mar 2024 12:11:20 +0100 > +Subject: [PATCH] CMakeLists: build ospdctl in library mode > + > +Also build osdpctl when only the library parts are build. > + > +Signed-off-by: Rouven Czerwinski > +--- > + CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 1efeb4b..e844b5c 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -40,8 +40,8 @@ option(CONFIG_OSDP_LIB_ONLY "Only build the library" OFF) > + include(GitSubmodules) > + add_subdirectory(utils) > + add_subdirectory(src) > ++add_subdirectory(osdpctl) > + if (NOT CONFIG_OSDP_STATIC_PD AND NOT CONFIG_OSDP_LIB_ONLY) > +- add_subdirectory(osdpctl) > + add_subdirectory(tests/pytest) > + add_subdirectory(tests/unit-tests) > + add_subdirectory(samples/c) > +-- > +2.43.1 > + > diff --git a/patches/libosdp-2.4.0/series b/patches/libosdp-2.4.0/series > new file mode 100644 > index 000000000..fad17c996 > --- /dev/null > +++ b/patches/libosdp-2.4.0/series > @@ -0,0 +1 @@ > +0001-CMakeLists-build-ospdctl-in-library-mode.patch > diff --git a/rules/libosdp.in b/rules/libosdp.in > new file mode 100644 > index 000000000..336fd01b1 > --- /dev/null > +++ b/rules/libosdp.in > @@ -0,0 +1,9 @@ > +## SECTION=system_libraries > + > +config LIBOSDP > + bool > + prompt "libosdp" > + select HOST_CMAKE > + select OPENSSL > + help > + OSDP (Open Supervised Device Protocol) library and osdpctl cli. > diff --git a/rules/libosdp.make b/rules/libosdp.make > new file mode 100644 > index 000000000..fe23bae49 > --- /dev/null > +++ b/rules/libosdp.make > @@ -0,0 +1,90 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2023 by Rouven Czerwinski > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBOSDP) += libosdp > + > +# > +# Paths and names > +# > +LIBOSDP_VERSION := 2.4.0 > +LIBOSDP_MD5 := 14484c746fa28a4a0005e893279bd8ec > +LIBOSDP := libosdp-$(LIBOSDP_VERSION) > +LIBOSDP_SUFFIX := tar.gz > +LIBOSDP_URL := https://github.com/goToMain/libosdp/archive/v$(LIBOSDP_VERSION).$(LIBOSDP_SUFFIX) > +LIBOSDP_SOURCE := $(SRCDIR)/$(LIBOSDP).$(LIBOSDP_SUFFIX) > +LIBOSDP_DIR := $(BUILDDIR)/$(LIBOSDP) > +LIBOSDP_LICENSE := Apache-2.0 > +LIBOSDP_LICENSE_FILES := file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 > + > +CUTILS_VERSION := 7d5cb004258b8b8a195b63ad15177ff196cefd08 > +CUTILS_MD5 := 018ceb214d27bb9ad237274de8307112 > +CUTILS_URL := https://github.com/goToMain/c-utils/archive/$(CUTILS_VERSION).zip > +CUTILS_SOURCE := $(SRCDIR)/c-utils-$(CUTILS_VERSION).zip > +$(CUTILS_SOURCE) := CUTILS > +CUTILS_DIR := $(LIBOSDP_DIR)/utils/ > + > +LIBOSDP_SOURCES := $(LIBOSDP_SOURCE) $(CUTILS_SOURCE) Use this instead: LIBOSDP_PARTS += CUTILS then you can drop the custom get and extract stuff. > + > +# ---------------------------------------------------------------------------- > +# Get > +# ---------------------------------------------------------------------------- > + > +#$(LIBOSDP_SOURCE): > +# @$(call targetinfo) > +# @$(call get, LIBOSDP) > + > +# ---------------------------------------------------------------------------- > +# Extract > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/libosdp.extract: > + @$(call targetinfo) > + @$(call clean, $(LIBOSDP_DIR)) > + @$(call extract, LIBOSDP) > + @$(call extract, CUTILS) > + @$(call patchin, LIBOSDP) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +LIBOSDP_CONF_ENV := $(CROSS_ENV) Default. Remove. > + > +# > +# cmake > +# > +LIBOSDP_CONF_TOOL := cmake > +LIBOSDP_CONF_OPT := \ break here. $(CROSS_CMAKE_USR) \ > + -DCONFIG_OSDP_LIB_ONLY=y > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/libosdp.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libosdp) > + @$(call install_fixup, libosdp, PRIORITY, optional) > + @$(call install_fixup, libosdp, SECTION, base) > + @$(call install_fixup, libosdp, AUTHOR, "Rouven Czerwinski ") > + @$(call install_fixup, libosdp, DESCRIPTION, missing) > + > + @$(call install_lib, libosdp, 0, 0, 0644, libosdp) > + > + @$(call install_copy, libosdp, 0, 0, 0644, -, /usr/bin/osdpctl) 644 looks wrong in /usr/bin. Michael > + > + @$(call install_finish, libosdp) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.39.5 > > > -- 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-5555 |