Skip to contentSkip to conversation

Fixes for diffutils and u-boot

PATCH In review Robert Yang 2 participants 6 messages Dec 5, 2016 – Dec 6, 2016

lore
Share & tools
lore
#0 lore raw

cover Fixes for diffutils and u-boot

The following changes since commit 11063a01d4511b2688ea7ba2d7359e4e07328c66:

ruby: upgrade to 2.3.1 (2016-11-30 15:47:17 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/2fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/2fixes

Robert Yang (2):
diffutils: do_configure: fix "Argument list too long" image.bbclass: inherit image_types_uboot when needed

 meta/classes/image.bbclass                       | 9 +++++++++
 meta/recipes-extended/diffutils/diffutils_3.4.bb | 3 +++
 2 files changed, 12 insertions(+)
Signature · 1 line
2.9.0
#1 lore raw

PATCH 1/2 diffutils: do_configure: fix "Argument list too long"

Fixed when len(TMPDIR) = 410:
aclocal: error: cannot open echo [snip]: Argument list too long

This is becuase it has a lot of m4 files, use relative path for them can fix the problem.

It doesn't happen when MACHINE="qemux86", I think it is because intel-x86-64 is longer than qemux86.

---
 meta/recipes-extended/diffutils/diffutils_3.4.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/diffutils/diffutils_3.4.bb +3 -0
index cb7092b..be280ec 100644
@@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
 
 EXTRA_OECONF += "--without-libsigsegv-prefix"
 
+# Fix "Argument list too long" error when len(TMPDIR) = 410
+acpaths = "-I ./m4"
+
 do_configure_prepend () {
 	# Need to remove gettext macros with weird mix of versions
 	for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
Signature · 1 line
2.9.0
#2 lore raw

Re: [PATCH 1/2] diffutils: do_configure: fix "Argument list too long"

Quoted 19 lines · Robert Yang

Fixed when len(TMPDIR) = 410:
aclocal: error: cannot open echo [snip]: Argument list too long

This is becuase it has a lot of m4 files, use relative path for them can fix the problem.

It doesn't happen when MACHINE="qemux86", I think it is because intel-x86-64 is longer than qemux86.

---
 meta/recipes-extended/diffutils/diffutils_3.4.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/diffutils/diffutils_3.4.bb +0 -0
index cb7092b..be280ec 100644

meta/recipes-extended/diffutils/diffutils_3.4.bb SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ · line 14

Quoted 5 lines
meta/recipes-extended/diffutils/diffutils_3.4.bb +2 -0
@@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
 
 EXTRA_OECONF += "--without-libsigsegv-prefix"
 
+# Fix "Argument list too long" error when len(TMPDIR) = 410
+acpaths = "-I ./m4"

it looks ok if this work ok with externalsrc

Quoted 12 lines
meta/recipes-extended/diffutils/diffutils_3.4.bb +1 -1
+
 do_configure_prepend () {
        # Need to remove gettext macros with weird mix of versions
        for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
--

2.9.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw

Re: [PATCH 1/2] diffutils: do_configure: fix "Argument list too long"

Quoted 21 lines · Khem Raj
Quoted 20 lines · Robert Yang

Fixed when len(TMPDIR) = 410:
aclocal: error: cannot open echo [snip]: Argument list too long

This is becuase it has a lot of m4 files, use relative path for them can fix the problem.

It doesn't happen when MACHINE="qemux86", I think it is because intel-x86-64 is longer than qemux86.

---
 meta/recipes-extended/diffutils/diffutils_3.4.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/diffutils/diffutils_3.4.bb +0 -0
index cb7092b..be280ec 100644
@@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
 
Quoted 6 lines

meta/recipes-extended/diffutils/diffutils_3.4.bb SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ · line 14

Quoted 4 lines
meta/recipes-extended/diffutils/diffutils_3.4.bb +2 -0
 EXTRA_OECONF += "--without-libsigsegv-prefix"
 
+# Fix "Argument list too long" error when len(TMPDIR) = 410
+acpaths = "-I ./m4"

it looks ok if this work ok with externalsrc

Hi Khem,

What did mean about externalsrc, please ? Did you mean when B != S? If yes, it works well since it is for aclocal, which always runs in S. We have already such a fix in several recipes.

meta/recipes-extended/tar/tar.inc:acpaths = "-I ./m4" meta/recipes-extended/wget/wget.inc:acpaths = "-I ./m4" meta/recipes-core/coreutils/coreutils_6.9.bb:acpaths = "-I ./m4" meta/recipes-core/coreutils/coreutils_8.25.bb:acpaths = "-I ./m4"

// Robert

Quoted 14 lines
Quoted 13 lines
meta/recipes-extended/diffutils/diffutils_3.4.bb +1 -1
+
 do_configure_prepend () {
        # Need to remove gettext macros with weird mix of versions
        for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
--

2.9.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#4 lore raw

Re: [PATCH 1/2] diffutils: do_configure: fix "Argument list too long"

Quoted 29 lines · Robert Yang
Quoted 23 lines · Khem Raj
Quoted 22 lines · Robert Yang

Fixed when len(TMPDIR) = 410:
aclocal: error: cannot open echo [snip]: Argument list too long

This is becuase it has a lot of m4 files, use relative path for them can fix the problem.

It doesn't happen when MACHINE="qemux86", I think it is because intel-x86-64 is longer than qemux86.

---
meta/recipes-extended/diffutils/diffutils_3.4.bb | 3 +++

1 file changed, 3 insertions(+)
meta/recipes-extended/diffutils/diffutils_3.4.bb +0 -0
index cb7092b..be280ec 100644
@@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
 

EXTRA_OECONF += "--without-libsigsegv-prefix"

Quoted 8 lines
Quoted 4 lines

meta/recipes-extended/diffutils/diffutils_3.4.bb SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ · line 14

Quoted 2 lines
meta/recipes-extended/diffutils/diffutils_3.4.bb +2 -0
+# Fix "Argument list too long" error when len(TMPDIR) = 410
+acpaths = "-I ./m4"

it looks ok if this work ok with externalsrc

Hi Khem,

What did mean about externalsrc, please ? Did you mean when B != S?

yeah,

Quoted 1 line

If yes, it works well since it is for aclocal, which always runs in S.

seems to be the case. Then we should be fine.

Quoted 23 lines

We have already such a fix in several recipes.

meta/recipes-extended/tar/tar.inc:acpaths = "-I ./m4" meta/recipes-extended/wget/wget.inc:acpaths = "-I ./m4" meta/recipes-core/coreutils/coreutils_6.9.bb:acpaths = "-I ./m4" meta/recipes-core/coreutils/coreutils_8.25.bb:acpaths = "-I ./m4"

// Robert

Quoted 14 lines
Quoted 13 lines

+
do_configure_prepend () {
# Need to remove gettext macros with weird mix of versions
for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
--
2.9.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw

PATCH 2/2 image.bbclass: inherit image_types_uboot when needed

In reply to Robert Yang

Fixed:
MACHINE = "qemuarm"
IMAGE_FSTYPES += "ext3.bz2.u-boot"
[snip]
No IMAGE_CMD defined for IMAGE_FSTYPES entry 'ext3.bz2.u-boot' - possibly invalid type name or missing support class [snip]

This is because image_types_uboot is not inherited, inherit it when needed will fix the problem.

---
 meta/classes/image.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/image.bbclass +9 -0
index 6111f6d..b10272a 100644
@@ -144,6 +144,15 @@ inherit ${IMAGE_TYPE_live}
 IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2", "hdddirect"], "image-vm", "", d)}'
 inherit ${IMAGE_TYPE_vm}
 
+def build_uboot(d):
+    if 'u-boot' in (d.getVar('IMAGE_FSTYPES', True) or ''):
+        return "image_types_uboot"
+    else:
+        return ""
+
+IMAGE_TYPE_uboot = "${@build_uboot(d)}"
+inherit ${IMAGE_TYPE_uboot}
+
 python () {
     deps = " " + imagetypes_getdepends(d)
     d.appendVarFlag('do_rootfs', 'depends', deps)
Signature · 1 line
2.9.0