From 1ea3e2c4d25c58efd1dc33d8a0e945ae069f673a Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Mon, 28 Sep 2020 14:45:26 +0200 Subject: libgpiod: consolidate the recipe files After dropping the support for v0.3.x, we no longer need the split into .bb and .inc files. Let's move the contents of libgpiod.inc into libgpiod_1.4.4.bb. While at it: do some refactoring: let's use ${BPN} in the URL, consolidate certain variables and add some explanatory comments. Signed-off-by: Bartosz Golaszewski Signed-off-by: Khem Raj --- meta-oe/recipes-support/libgpiod/libgpiod.inc | 19 ----------------- meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb | 24 +++++++++++++++++----- 2 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 meta-oe/recipes-support/libgpiod/libgpiod.inc diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc deleted file mode 100644 index cae3145dd0..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "C library and tools for interacting with the linux GPIO character device" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" - -SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" - -inherit autotools pkgconfig - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -EXTRA_OECONF = "--enable-tools" - -PACKAGES =+ " ${PN}-tools" - -FILES_${PN}-tools = "${bindir}/*" - -PACKAGES =+ "libgpiodcxx" -FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb index b5a64a554d..6433675ca4 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb @@ -1,17 +1,31 @@ -require libgpiod.inc +SUMMARY = "C library and tools for interacting with the linux GPIO character device" +AUTHOR = "Bartosz Golaszewski " -DEPENDS += "autoconf-archive-native" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" +SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" SRC_URI[md5sum] = "064c2627397e6641c52de09a26951112" SRC_URI[sha256sum] = "f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699" -# enable cxx bindings -PACKAGECONFIG ?= "cxx" +inherit autotools pkgconfig python3native +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" -inherit python3native +# Enable cxx bindings by default. +PACKAGECONFIG ?= "cxx" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES_${PN}-tools = "${bindir}/*" +FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -- cgit 1.2.3-korg