Skip to contentSkip to conversation

sign_ipk.bbclass: add missing 'd' parameter to raise_sanity_error()

PATCH In review Robin Lintermann 3 participants 9 messages Jun 2 – Jul 19

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 sign_ipk.bbclass: add missing 'd' parameter to raise_sanity_error()

The second raise_sanity_error() call in this class lacks the 'd' parameter which would lead to a python exception rather than the desired error message when the corresponding error condition is fulfilled.

---
 meta/classes/sign_ipk.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/sign_ipk.bbclass +1 -1
index 51c24b38b2..9f666998ba 100644
@@ -40,7 +40,7 @@ python () {
 
     sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE")
     if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
-        raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype)
+        raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype, d)
 }
 
 def sign_ipk(d, ipk_to_sign):
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/5 busybox: add a DEPENDS on libpam when pam is selected in DISTRO_FEATURES

When 'pam' is in DISTRO_FEATURES and CONFIG_PAM is selected in busybox the target-libpam is required to be installed before busybox can be built. Add a build-time dependency for busybox on libpam to guarantee this.
If CONFIG_PAM is not selected in busybox's .config, this dependency would rather be unnecessary, but it doesn't hurt to have it anyhow.

---
 meta/recipes-core/busybox/busybox.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/busybox/busybox.inc +1 -0
index f5d7c3f9c8..d5ab9eff6d 100644
@@ -4,6 +4,7 @@ HOMEPAGE = "https://www.busybox.net"
 BUGTRACKER = "https://bugs.busybox.net/"
 
 DEPENDS += "kern-tools-native virtual/crypt"
+DEPENDS += "${@ bb.utils.contains('DISTRO_FEATURES','pam','libpam','',d)}"
 
 # bzip2 applet in busybox is based on lightly-modified bzip2-1.0.4 source
 # the GPL is version 2 only
Signature · 1 line
2.43.0
#2 lore raw

PATCH 3/5 util-linux: fix 'mount' options in mountall initscript

In reply to Robin Lintermann

mount -t allows for a 'no'-prefix to exclude a set of fs types from the call. But the 'no'-prefix applies to the whole list of fs types given and should not be repeated for each individual type specified.

---
 meta/recipes-core/util-linux/util-linux_2.39.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux_2.39.3.bb +1 -1
index 12c504e0a2..6f22f13676 100644
@@ -194,7 +194,7 @@ do_install () {
         fi
 
 	install -d ${D}${sysconfdir}/default/
-	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
+	echo 'MOUNTALL="-t nonfs,smbfs,ncpfs"' > ${D}${sysconfdir}/default/mountall
 
 	rm -f ${D}${bindir}/chkdupexe
 
Signature · 1 line
2.43.0
#3 lore raw

PATCH 4/5 alsa-utils: add runtime dependency on ncurses for 'alsamixer'

In reply to Robin Lintermann
---
 meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb +2 -0
index e598fac9f8..8b59417b01 100644
@@ -61,6 +61,8 @@ ALSA_UTILS_PKGS = "\
 PACKAGES += "${ALSA_UTILS_PKGS}"
 RDEPENDS:${PN} += "${ALSA_UTILS_PKGS}"
 
+RDEPENDS:alsa-utils-alsamixer += "ncurses"
+
 FILES:${PN} = ""
 ALLOW_EMPTY:alsa-utils = "1"
 FILES:alsa-utils-alsabat     = "${bindir}/alsabat"
Signature · 1 line
2.43.0
#4 lore raw

Patchtest results for [scarthgap][PATCH 4/5] alsa-utils: add runtime dependency on ncurses for 'alsamixer'

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/scarthgap-4-5-alsa-utils-add-runtime-dependency-on-ncurses-for-alsamixer.patch

FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#5 lore raw

PATCH 5/5 update-alternatives.bbclass: Add a 'DISTRO_FEATURE' to create only relative symlinks

In reply to Robin Lintermann

Currently update-alternatives will create absolute symlinks to the target files.
This leads to confusion when looking at the resulting rootfs directory from the host machine and makes it impossible to do a diff between two rootfs directories staged on the host.

Add a way to let it install relative symlinks only by adding 'alternatives-symlinks-relative' to DISTRO_FEATURES.

---
 meta/classes-recipe/update-alternatives.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes-recipe/update-alternatives.bbclass +2 -0
index b153e1b297..6cfb190c31 100644
@@ -261,6 +261,8 @@ def update_alternatives_alt_targets(d, pkg):
             continue
 
         alt_target = os.path.normpath(alt_target)
+        if bb.utils.contains('DISTRO_FEATURES','alternatives-symlinks-relative',True,False,d):
+            alt_target = os.path.relpath(alt_target, os.path.dirname(alt_link))
         updates.append( (alt_name, alt_link, alt_target, alt_priority) )
 
     return updates
Signature · 1 line
2.43.0
#6 lore raw
In reply to Robin Lintermann
Quoted 7 lines · Robin Lintermann via lists.openembedded.org

The second raise_sanity_error() call in this class lacks the 'd' parameter which would lead to a python exception rather than the desired error message when the corresponding error condition is fulfilled.

---

Hello,

We have a strict "master-first" policy so any patch needs to be merged on all the more recent supported branches before merging on scarthgap (in this case: master and wrynose).

This patch (and the other patches of this series by quickly glancing at them) is needed on master.

Can you please sent it there first, and then, ping back here so I can take them for scarthgap.

Thanks!

Quoted 16 lines
 meta/classes/sign_ipk.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/sign_ipk.bbclass +1 -1
index 51c24b38b2..9f666998ba 100644
@@ -40,7 +40,7 @@ python () {
 
     sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE")
     if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
-        raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype)
+        raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype, d)
 }
 
 def sign_ipk(d, ipk_to_sign):
Signature · 2 lines
Yoann Congal
Smile ECS
#7 lore raw
Quoted 15 lines · Yoann Congal
Quoted 7 lines · Robin Lintermann via lists.openembedded.org

The second raise_sanity_error() call in this class lacks the 'd' parameter which would lead to a python exception rather than the desired error message when the corresponding error condition is fulfilled.

---

Hello,

We have a strict "master-first" policy so any patch needs to be merged on all the more recent supported branches before merging on scarthgap (in this case: master and wrynose).

Quoted 5 lines

This patch (and the other patches of this series by quickly glancing at them) is needed on master.

Can you please sent it there first, and then, ping back here so I can take them for scarthgap.

Hello Robin,

Gentle ping for these patches, do you plan to get them merged on master and wrynose?

Regards,

Quoted 19 lines

Thanks!

Quoted 16 lines
 meta/classes/sign_ipk.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/sign_ipk.bbclass +1 -1
index 51c24b38b2..9f666998ba 100644
@@ -40,7 +40,7 @@ python () {
 
     sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE")
     if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
-        raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype)
+        raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype, d)
 }
 
 def sign_ipk(d, ipk_to_sign):
Signature · 1 line
Yoann Congal
#8 lore raw
Quoted 19 lines · Yoann Congal
Quoted 18 lines · Yoann Congal
Quoted 7 lines · Robin Lintermann via lists.openembedded.org

The second raise_sanity_error() call in this class lacks the 'd' parameter which would lead to a python exception rather than the desired error message when the corresponding error condition is fulfilled.

---

Hello,

We have a strict "master-first" policy so any patch needs to be merged on all the more recent supported branches before merging on scarthgap (in this case: master and wrynose).

This patch (and the other patches of this series by quickly glancing at them) is needed on master.

Quoted 7 lines
Quoted 2 lines

Can you please sent it there first, and then, ping back here so I can take them for scarthgap.

Hello Robin,

Gentle ping for these patches, do you plan to get them merged on master and wrynose?

Hello,

I will now drop this patch. Please send a new submission if the above situation changes.

Regards,

Signature · 2 lines
Yoann Congal
Smile ECS