Skip to contentSkip to conversation

libldb: Do not require the "pam" distro feature to be enabled

PATCH In review Peter Kjellerstedt 3 participants 5 messages Jan 30, 2020 – Feb 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libldb: Do not require the "pam" distro feature to be enabled

From: Peter Kjellerstedt <[email protected]>

It was only added because samba was a dependency, but was not removed again when the dependency on samba was removed in commit 6207331f.

This effectively reverts commit a190c2e3.

---
 meta-networking/recipes-support/libldb/libldb_1.5.5.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-support/libldb/libldb_1.5.5.bb +1 -2
index b19c964d8..9a93e66b6 100644
@@ -36,8 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
 SRC_URI[md5sum] = "339a41ac9efaec680e6d1469dd9aa35b"
 SRC_URI[sha256sum] = "199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68"
 
-inherit waf-samba distro_features_check
-REQUIRED_DISTRO_FEATURES = "pam"
+inherit waf-samba
 
 S = "${WORKDIR}/ldb-${PV}"
 
Signature · 1 line
2.21.1
#1 lore raw

PATCH 2/2 gitpkgv.bbclass: Add support for extending the supported tag formats

Introduce GITPKGV_TAG_REGEXP (which defaults to "v(\d.*)") to support dropping other unwanted parts of the found tags than just a leading "v". Any matching groups in the regexp will be concatenated to yield the final version.

---
 meta-oe/classes/gitpkgv.bbclass | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
meta-oe/classes/gitpkgv.bbclass +10 -4
index ab591bd45..180421ed3 100644
@@ -40,10 +40,16 @@
 GITPKGV = "${@get_git_pkgv(d, False)}"
 GITPKGVTAG = "${@get_git_pkgv(d, True)}"
 
-def gitpkgv_drop_tag_prefix(version):
+# This regexp is used to drop unwanted parts of the found tags. Any matching
+# groups will be concatenated to yield the final version.
+GITPKGV_TAG_REGEXP ??= "v(\d.*)"
+
+def gitpkgv_drop_tag_prefix(d, version):
     import re
-    if re.match("v\d", version):
-        return version[1:]
+
+    m = re.match(d.getVar('GITPKGV_TAG_REGEXP'), version)
+    if m:
+        return ''.join(group for group in m.groups() if group)
     else:
         return version
 
@@ -105,7 +111,7 @@ def get_git_pkgv(d, use_tags):
                         output = bb.fetch2.runfetchcmd(
                             "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null"
                             % vars, d, quiet=True).strip()
-                        ver = gitpkgv_drop_tag_prefix(output)
+                        ver = gitpkgv_drop_tag_prefix(d, output)
                     except Exception:
                         ver = "0.0-%s-g%s" % (commits, vars['rev'][:7])
                 else:
Signature · 1 line
2.21.1
#2 lore raw

Re: [meta-oe][zeus][PATCH 2/2] gitpkgv.bbclass: Add support for extending the supported tag formats

Quoted 4 lines · Peter Kjellerstedt

Introduce GITPKGV_TAG_REGEXP (which defaults to "v(\d.*)") to support dropping other unwanted parts of the found tags than just a leading "v". Any matching groups in the regexp will be concatenated to yield the final version.

I believe I got this one already staged.

https://git.openembedded.org/meta-openembedded-contrib/commit/?h=stable/zeus-nut&id=b95100003df03c22eebe6ae5e4342b5281a2ef64

Quoted 40 lines
---
 meta-oe/classes/gitpkgv.bbclass | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
meta-oe/classes/gitpkgv.bbclass +10 -4
index ab591bd45..180421ed3 100644
@@ -40,10 +40,16 @@
 GITPKGV = "${@get_git_pkgv(d, False)}"
 GITPKGVTAG = "${@get_git_pkgv(d, True)}"
 
-def gitpkgv_drop_tag_prefix(version):
+# This regexp is used to drop unwanted parts of the found tags. Any matching
+# groups will be concatenated to yield the final version.
+GITPKGV_TAG_REGEXP ??= "v(\d.*)"
+
+def gitpkgv_drop_tag_prefix(d, version):
     import re
-    if re.match("v\d", version):
-        return version[1:]
+
+    m = re.match(d.getVar('GITPKGV_TAG_REGEXP'), version)
+    if m:
+        return ''.join(group for group in m.groups() if group)
     else:
         return version
 
@@ -105,7 +111,7 @@ def get_git_pkgv(d, use_tags):
                         output = bb.fetch2.runfetchcmd(
                             "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null"
                             % vars, d, quiet=True).strip()
-                        ver = gitpkgv_drop_tag_prefix(output)
+                        ver = gitpkgv_drop_tag_prefix(d, output)
                     except Exception:
                         ver = "0.0-%s-g%s" % (commits, vars['rev'][:7])
                 else:
#3 lore raw
In reply to Peter Kjellerstedt
Quoted 6 lines · Peter Kjellerstedt

From: Peter Kjellerstedt <[email protected]>

It was only added because samba was a dependency, but was not removed again when the dependency on samba was removed in commit 6207331f.

This effectively reverts commit a190c2e3.

I have an update to this package staged. I apply this on top of that.

https://git.openembedded.org/meta-openembedded-contrib/commit/?h=stable/zeus-nut&id=f64c2d691ea597aa6221e3d7706a4d022e07bfea

- armin

Quoted 21 lines
---
 meta-networking/recipes-support/libldb/libldb_1.5.5.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-support/libldb/libldb_1.5.5.bb +1 -2
index b19c964d8..9a93e66b6 100644
@@ -36,8 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
 SRC_URI[md5sum] = "339a41ac9efaec680e6d1469dd9aa35b"
 SRC_URI[sha256sum] = "199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68"
 
-inherit waf-samba distro_features_check
-REQUIRED_DISTRO_FEATURES = "pam"
+inherit waf-samba
 
 S = "${WORKDIR}/ldb-${PV}"
 
#4 lore raw
Quoted 14 lines

-----Original Message-----
From: akuster808 <[email protected]>
Sent: den 31 januari 2020 18:34
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [oe] [meta-oe][zeus][PATCH 1/2] libldb: Do not require the "pam" distro feature to be enabled

Quoted 5 lines · Peter Kjellerstedt

From: Peter Kjellerstedt <[email protected]>

It was only added because samba was a dependency, but was not removed again when the dependency on samba was removed in commit 6207331f.

Quoted 6 lines
Quoted 1 line

This effectively reverts commit a190c2e3.

I have an update to this package staged. I apply this on top of that.

https://git.openembedded.org/meta-openembedded-contrib/commit/?h=stable/zeus-nut&id=f64c2d691ea597aa6221e3d7706a4d022e07bfea

- armin

Did you forget about this? It didn't make it in when libldb was updated to 1.5.6, and it is not in stable/zeus-nut now.

//Peter

Quoted 20 lines
Quoted 20 lines
---
 meta-networking/recipes-support/libldb/libldb_1.5.5.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-support/libldb/libldb_1.5.5.bb +1 -2
index b19c964d8..9a93e66b6 100644
@@ -36,8 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
 SRC_URI[md5sum] = "339a41ac9efaec680e6d1469dd9aa35b"
 SRC_URI[sha256sum] = "199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68"
 
-inherit waf-samba distro_features_check
-REQUIRED_DISTRO_FEATURES = "pam"
+inherit waf-samba
 
 S = "${WORKDIR}/ldb-${PV}"