Skip to contentSkip to conversation

iniparser: Update to latest tip of trunk

PATCH In review Khem Raj 2 participants 3 messages Mar 26, 2022 – Mar 31, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 iniparser: Update to latest tip of trunk

Install .pc file

---
 ...iniparser.pc-Make-libpath-a-variable.patch | 23 +++++++++++++++++++
 .../iniparser/iniparser_4.1.bb                | 11 +++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch
meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch new file +23 -0
new file mode 100644
index 0000000000..4824344f05
@@ -0,0 +1,23 @@
+From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 25 Mar 2022 20:44:41 -0700
+Subject: [PATCH] iniparser.pc: Make libpath a variable
+
+Will set according to baselib that yocto exports.
+
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ iniparser.pc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/iniparser.pc
++++ b/iniparser.pc
+@@ -1,6 +1,6 @@
+ prefix=/usr
+ exec_prefix=/usr
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@baselib@
+ includedir=${prefix}/include
+ datarootdir=${prefix}/share
+ datadir=${datarootdir}
meta-oe/recipes-support/iniparser/iniparser_4.1.bb +9 -2
index f3593fb5ff..2810a4f651 100644
@@ -6,12 +6,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac"
 
 DEPENDS = "doxygen-native"
 
+PV .= "+git${SRCPV}"
+
 SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \
+           file://0001-iniparser.pc-Make-libpath-a-variable.patch \
 	   file://Add-CMake-support.patch"
 
-# tag 4.1
-SRCREV= "0a38e85c9cde1e099ca3bf70083bd00f89c3e5b6"
+SRCREV= "deb85ad4936d4ca32cc2260ce43323d47936410d"
 
 S = "${WORKDIR}/git"
 
 inherit cmake
+
+do_install:append() {
+    install -Dm 0644 ${S}/iniparser.pc ${D}${libdir}/pkgconfig/iniparser.pc
+    sed -i -e 's,@baselib@,${baselib},g' ${D}${libdir}/pkgconfig/iniparser.pc
+}
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH 2/2 ndctl: Upgrade to v73

Add iniparser dependency to util subdir
Correct path to iniparser.h

---
 ...n-Use-pkg-config-to-detect-iniparser.patch | 41 +++++++++++++++++++
 ...001-util-Correct-path-to-iniparser.h.patch | 28 +++++++++++++
 meta-oe/recipes-core/ndctl/ndctl_v69.bb       | 34 ---------------
 meta-oe/recipes-core/ndctl/ndctl_v73.bb       | 35 ++++++++++++++++
 4 files changed, 104 insertions(+), 34 deletions(-)
 create mode 100644 meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch
 create mode 100644 meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch
 delete mode 100644 meta-oe/recipes-core/ndctl/ndctl_v69.bb
 create mode 100644 meta-oe/recipes-core/ndctl/ndctl_v73.bb
meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch new file +41 -0
new file mode 100644
index 0000000000..ee172c3a69
@@ -0,0 +1,41 @@
+From 44516eee75696c84849c0f7aa632e2456b101813 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Mar 2022 00:57:03 -0700
+Subject: [PATCH] meson: Use pkg-config to detect iniparser
+
+Add iniparser dependency to util subdir
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ meson.build      | 2 +-
+ util/meson.build | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 42e11aa..4209320 100644
+--- a/meson.build
++++ b/meson.build
+@@ -160,7 +160,7 @@ cc = meson.get_compiler('c')
+ 
+ # keyutils and iniparser lack pkgconfig
+ keyutils = cc.find_library('keyutils', required : get_option('keyutils'))
+-iniparser = cc.find_library('iniparser', required : true)
++iniparser = dependency('iniparser', required : true)
+ 
+ conf = configuration_data()
+ check_headers = [
+diff --git a/util/meson.build b/util/meson.build
+index 784b279..8e9ae9a 100644
+--- a/util/meson.build
++++ b/util/meson.build
+@@ -12,5 +12,6 @@ util = static_library('util', [
+   'iomem.c',
+   ],
+   include_directories : root_inc,
++  dependencies : iniparser,
+ )
+ util_dep = declare_dependency(link_with : util)
+-- 
+2.35.1
+
meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch new file +28 -0
new file mode 100644
index 0000000000..fe2612ce94
@@ -0,0 +1,28 @@
+From c212d228c25cb583f52a6d31e9f0ec7bc1f9c506 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Mar 2022 01:10:02 -0700
+Subject: [PATCH] util: Correct path to iniparser.h
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ util/parse-configs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/parse-configs.c b/util/parse-configs.c
+index c834a07..1b7ffa6 100644
+--- a/util/parse-configs.c
++++ b/util/parse-configs.c
+@@ -4,7 +4,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <iniparser.h>
++#include <iniparser/iniparser.h>
+ #include <sys/stat.h>
+ #include <util/parse-configs.h>
+ #include <util/strbuf.h>
+-- 
+2.35.1
+
meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted +0 -34
deleted file mode 100644
index 5f119c6b7d..0000000000
@@ -1,34 +0,0 @@
-SUMMARY = "libnvdimm utility library"
-DESCRIPTION = "Utility library for managing the libnvdimm \
-(non-volatile memory device) sub-system in the Linux kernel. \
-The LIBNVDIMM subsystem provides support for three types of \
-NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \
-simultaneously support both PMEM and BLK mode access."
-HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08"
-
-inherit autotools-brokensep pkgconfig bash-completion systemd
-
-SRCREV = "ea62d6d53bf6f806c4841e97a370201e18446860"
-SRC_URI = "git://github.com/pmem/ndctl.git;branch=master;protocol=https"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
-
-DEPENDS = "kmod udev json-c keyutils"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
-PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
-
-do_configure:prepend() {
-    ${S}/autogen.sh
-}
-
-SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "disable"
-
-FILES:${PN} += "${datadir}/daxctl/daxctl.conf"
meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +35 -0
new file mode 100644
index 0000000000..c88d392970
@@ -0,0 +1,35 @@
+SUMMARY = "libnvdimm utility library"
+DESCRIPTION = "Utility library for managing the libnvdimm \
+(non-volatile memory device) sub-system in the Linux kernel. \
+The LIBNVDIMM subsystem provides support for three types of \
+NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \
+simultaneously support both PMEM and BLK mode access."
+HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & MIT & CC0-1.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883"
+
+inherit meson pkgconfig bash-completion systemd
+
+SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
+SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \
+           file://0001-util-Correct-path-to-iniparser.h.patch \
+           file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
+
+DEPENDS = "kmod udev json-c keyutils iniparser"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF += "-Ddestructive=enabled"
+
+PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
+PACKAGECONFIG[tests] = "-Dtest=enabled, -Dtest=disabled,"
+PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native"
+
+SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
+SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service [email protected]"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
+
+FILES:${PN} += "${datadir}/daxctl/daxctl.conf "
Signature · 1 line
2.35.1
#2 lore raw

Re: [oe] [meta-oe][PATCH 2/2] ndctl: Upgrade to v73

This is giving an error while compilation when EXEWRAPPER_ENABLED is False:

|
| ../git/meson.build:213:0: ERROR: Can not run test applications in this cross environment.

Thanks,

Anuj

Quoted 219 lines · Khem Raj

Add iniparser dependency to util subdir
Correct path to iniparser.h

---
 ...n-Use-pkg-config-to-detect-iniparser.patch | 41
+++++++++++++++++++
 ...001-util-Correct-path-to-iniparser.h.patch | 28 +++++++++++++ meta-oe/recipes-core/ndctl/ndctl_v69.bb       | 34 --------------- meta-oe/recipes-core/ndctl/ndctl_v73.bb       | 35 ++++++++++++++++

 4 files changed, 104 insertions(+), 34 deletions(-)

 create mode 100644 meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use- pkg-config-to-detect-iniparser.patch
 create mode 100644 meta-oe/recipes-core/ndctl/ndctl/0001-util- Correct-path-to-iniparser.h.patch
 delete mode 100644 meta-oe/recipes-core/ndctl/ndctl_v69.bb create mode 100644 meta-oe/recipes-core/ndctl/ndctl_v73.bb

(quoted diff) +0 -0

config-to-detect-iniparser.patch b/meta-oe/recipes- core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch new file mode 100644
index 0000000000..ee172c3a69

meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to- new file +0 -0

detect-iniparser.patch

meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to- new file +1 -0
@@ -0,0 +1,41 @@
+From 44516eee75696c84849c0f7aa632e2456b101813 Mon Sep 17 00:00:00

2001

meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to- new file +21 -0
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Mar 2022 00:57:03 -0700
+Subject: [PATCH] meson: Use pkg-config to detect iniparser
+
+Add iniparser dependency to util subdir
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ meson.build      | 2 +-
+ util/meson.build | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 42e11aa..4209320 100644
+--- a/meson.build
++++ b/meson.build
+@@ -160,7 +160,7 @@ cc = meson.get_compiler('c')
+ 
+ # keyutils and iniparser lack pkgconfig
+ keyutils = cc.find_library('keyutils', required :

get_option('keyutils'))
+-iniparser = cc.find_library('iniparser', required : true) ++iniparser = dependency('iniparser', required : true) +
+ conf = configuration_data()
+ check_headers = [

meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to- new file +14 -0
+diff --git a/util/meson.build b/util/meson.build
+index 784b279..8e9ae9a 100644
+--- a/util/meson.build
++++ b/util/meson.build
+@@ -12,5 +12,6 @@ util = static_library('util', [
+   'iomem.c',
+   ],
+   include_directories : root_inc,
++  dependencies : iniparser,
+ )
+ util_dep = declare_dependency(link_with : util)
+-- 
+2.35.1
+
(quoted diff) +0 -0

to-iniparser.h.patch b/meta-oe/recipes-core/ndctl/ndctl/0001-util- Correct-path-to-iniparser.h.patch
new file mode 100644
index 0000000000..fe2612ce94

meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to- new file +0 -0

iniparser.h.patch

meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to- new file +1 -0
@@ -0,0 +1,28 @@
+From c212d228c25cb583f52a6d31e9f0ec7bc1f9c506 Mon Sep 17 00:00:00

2001

meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to- new file +27 -0
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Mar 2022 01:10:02 -0700
+Subject: [PATCH] util: Correct path to iniparser.h
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ util/parse-configs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/parse-configs.c b/util/parse-configs.c
+index c834a07..1b7ffa6 100644
+--- a/util/parse-configs.c
++++ b/util/parse-configs.c
+@@ -4,7 +4,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <iniparser.h>
++#include <iniparser/iniparser.h>
+ #include <sys/stat.h>
+ #include <util/parse-configs.h>
+ #include <util/strbuf.h>
+-- 
+2.35.1
+
meta- renamed from meta-oe/recipes-core/ndctl/ndctl_v69.bb +0 -0

oe/recipes-core/ndctl/ndctl_v69.bb
deleted file mode 100644
index 5f119c6b7d..0000000000

meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted +0 -7
@@ -1,34 +0,0 @@
-SUMMARY = "libnvdimm utility library"
-DESCRIPTION = "Utility library for managing the libnvdimm \
-(non-volatile memory device) sub-system in the Linux kernel. \
-The LIBNVDIMM subsystem provides support for three types of \
-NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \
-simultaneously support both PMEM and BLK mode access."
-HOMEPAGE =

"https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/ Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next"

meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted +0 -2
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM =

"file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08"

meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted +0 -5
-
-inherit autotools-brokensep pkgconfig bash-completion systemd
-
-SRCREV = "ea62d6d53bf6f806c4841e97a370201e18446860"
-SRC_URI =

"git://github.com/pmem/ndctl.git;branch=master;protocol=https"

meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted +0 -10
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
-
-DEPENDS = "kmod udev json-c keyutils"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs"
-
-PACKAGECONFIG ??=

"${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"

meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted +0 -9
-
-do_configure:prepend() {
-    ${S}/autogen.sh
-}
-
-SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "disable"
-
-FILES:${PN} += "${datadir}/daxctl/daxctl.conf"
meta- renamed from meta-oe/recipes-core/ndctl/ndctl_v73.bb +0 -0

oe/recipes-core/ndctl/ndctl_v73.bb
new file mode 100644
index 0000000000..c88d392970

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +7 -0
@@ -0,0 +1,35 @@
+SUMMARY = "libnvdimm utility library"
+DESCRIPTION = "Utility library for managing the libnvdimm \
+(non-volatile memory device) sub-system in the Linux kernel. \
+The LIBNVDIMM subsystem provides support for three types of \
+NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \
+simultaneously support both PMEM and BLK mode access."
+HOMEPAGE =

"https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/ Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next"

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +2 -0
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & MIT & CC0-1.0"
+LIC_FILES_CHKSUM =

"file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883"

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +5 -0
+
+inherit meson pkgconfig bash-completion systemd
+
+SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
+SRC_URI =

"git://github.com/pmem/ndctl.git;branch=main;protocol=https \
+           file://0001-util-Correct-path-to-iniparser.h.patch \
+ file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +10 -0
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
+
+DEPENDS = "kmod udev json-c keyutils iniparser"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF += "-Ddestructive=enabled"
+
+PACKAGECONFIG ??= "tests

${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,- Dsystemd=disabled,systemd"

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +2 -0
+PACKAGECONFIG[tests] = "-Dtest=enabled, -Dtest=disabled,"
+PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-

Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native"

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +2 -0
+
+SYSTEMD_PACKAGES =

"${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev- [email protected]"

meta-oe/recipes-core/ndctl/ndctl_v73.bb new file +3 -1
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
+
+FILES:${PN} += "${datadir}/daxctl/daxctl.conf "
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group. View/Reply Online (#96214):
https://lists.openembedded.org/g/openembedded-devel/message/96214
Mute This Topic: https://lists.openembedded.org/mt/90040727/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-devel/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-