meta: 4 fixes
cover meta: 4 fixes
The following changes since commit e41c90b852167bbcb434da57b84280e855acae33:
busybox: In defconfig enable ASH_CMDCMD for built-in 'command' (2017-04-12 15:18:42 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/4fixes
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/4fixes
Robert Yang (4):
binconfig.bbclass: fix typo in get_binconfig_mangle()
apt: fix libdir path for apt.systemd.daily
autogen: update libopts.m4's patch
grep: do_configure: fix "Argument list too long"
meta/classes/binconfig.bbclass | 2 +- meta/recipes-devtools/apt/apt-package.inc | 4 +++- .../0001-config-libopts.m4-regenerate-it-from-config-libopts..patch | 2 +- meta/recipes-extended/grep/grep_3.0.bb | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
2.10.2
PATCH 1/4 binconfig.bbclass: fix typo in get_binconfig_mangle()
It should be -IOEINCDIR, not -I-IOEINCDIR.
--- meta/classes/binconfig.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/binconfig.bbclass +1 -1
@@ -14,7 +14,7 @@ def get_binconfig_mangle(d): s += " -e 's:-L${libdir}:-LOELIBDIR:;'" s += " -e 's:-I${includedir}:-IOEINCDIR:;'" s += " -e 's:-L${WORKDIR}:-LOELIBDIR:'" - s += " -e 's:-I${WORKDIR}:-I-IOEINCDIR:'" + s += " -e 's:-I${WORKDIR}:-IOEINCDIR:'" s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'" s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
Signature · 1 line
2.10.2
PATCH 2/4 apt: fix libdir path for apt.systemd.daily
In reply to Robert YangIt should be ${libdir} rather than /usr/lib, otherwise it would fail when multilib:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
$ bitbake apt [snip] install: target /path/to/apt/1.2.12-r0/image/usr/lib/apt is not a directory: No such file or directory [snip]
--- meta/recipes-devtools/apt/apt-package.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-devtools/apt/apt-package.inc +3 -1
@@ -83,9 +83,11 @@ do_install () { install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/debian/apt.systemd.daily ${D}/usr/lib/apt/ + install -m 0644 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/ install -m 0644 ${S}/debian/apt-daily.service ${D}${systemd_unitdir}/system/ + sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${systemd_unitdir}/system/apt-daily.service install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/ install -d ${D}${sysconfdir}/cron.daily/ install -m 0755 ${S}/debian/apt.apt-compat.cron.daily ${D}${sysconfdir}/cron.daily/ + sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${sysconfdir}/cron.daily/apt.apt-compat.cron.daily }
Signature · 1 line
2.10.2
PATCH 3/4 autogen: update libopts.m4's patch
In reply to Robert YangUse 'test -n "$POSIX_SHELL"' rather than 'test -x "$POSIX_SHELL"' so that 'POSIX_SHELL = "/usr/bin/env sh"' can work.
--- .../0001-config-libopts.m4-regenerate-it-from-config-libopts..patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch +1 -1
@@ -30,7 +30,7 @@ index c7ba4f3..51e6a39 100644 AC_PROG_SED [while : do -+ test -x "$POSIX_SHELL" && break ++ test -n "$POSIX_SHELL" && break POSIX_SHELL=`which bash` test -x "$POSIX_SHELL" && break POSIX_SHELL=`which dash`
Signature · 1 line
2.10.2
Re: [PATCH 3/4] autogen: update libopts.m4's patch
Hi RP,
I found that others are merged except this one, do you have any comments on it, please ?
// Robert
Quoted 22 lines · Robert Yang
Use 'test -n "$POSIX_SHELL"' rather than 'test -x "$POSIX_SHELL"' so that '
POSIX_SHELL= "/usr/bin/envsh"' can work.Signed-off-by Robert Yang <[email protected]>--- .../0001-config-libopts.m4-regenerate-it-from-config-libopts..patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch +1
-1@@ -30,7 +30,7 @@ index c7ba4f3..51e6a39 100644 AC_PROG_SED [while : do -+ test -x "$POSIX_SHELL" && break ++ test -n "$POSIX_SHELL" && break POSIX_SHELL=`which bash` test -x "$POSIX_SHELL" && break POSIX_SHELL=`which dash`
Re: [PATCH 3/4] autogen: update libopts.m4's patch
In reply to Robert YangQuoted 19 lines · Robert Yang
Use 'test -n "$POSIX_SHELL"' rather than 'test -x "$POSIX_SHELL"' so that '
POSIX_SHELL= "/usr/bin/envsh"' can work.Signed-off-by Robert Yang <[email protected]>---
.../0001-config-libopts.m4-regenerate-it-from-config- libopts..patch | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0libopts.m4-regenerate-it-from-config-libopts..patch b/meta/recipes- devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from- config-libopts..patch
index a14018e..e247594 100644
--- a/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4- regenerate-it-from-config-libopts..patch
+++ b/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4- regenerate-it-from-config-libopts..patch(quoted diff) +0
-0@@ -30,7 +30,7 @@ index c7ba4f3..51e6a39 100644
Quoted 8 lines
AC_PROG_SED
[while :
do
-+ test -x "$POSIX_SHELL" && break
++ test -n "$POSIX_SHELL" && break
POSIX_SHELL=which bash
test -x "$POSIX_SHELL" && break
POSIX_SHELL=which dash
The patch title makes this sound it it was some kind of regenerated file. You're then patching this for a rather subtle bug. I worry that this change is going to get lost in the future when someone regenerates this.
I'm wondering if we can find a better, more future proof solution?
Cheers,
Richard
Re: [PATCH 3/4] autogen: update libopts.m4's patch
Quoted 26 lines · Richard Purdie
Quoted 25 lines · Robert Yang
Use 'test -n "$POSIX_SHELL"' rather than 'test -x "$POSIX_SHELL"' so that '
POSIX_SHELL= "/usr/bin/envsh"' can work.Signed-off-by Robert Yang <[email protected]>---
.../0001-config-libopts.m4-regenerate-it-from-config-
libopts..patch | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0libopts.m4-regenerate-it-from-config-libopts..patch b/meta/recipes- devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from- config-libopts..patch
index a14018e..e247594 100644
--- a/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4- regenerate-it-from-config-libopts..patch
+++ b/meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4- regenerate-it-from-config-libopts..patchmeta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch +1
-1@@ -30,7 +30,7 @@ index c7ba4f3..51e6a39 100644 AC_PROG_SED [while : do -+ test -x "$POSIX_SHELL" && break ++ test -n "$POSIX_SHELL" && break POSIX_SHELL=`which bash`
Quoted 8 lines
meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch index c7ba4f3..51e6a39 100644 · line 36
Quoted 2 lines
meta/recipes-devtools/autogen/autogen/0001-config-libopts.m4-regenerate-it-from-config-libopts..patch +0
-0test -x "$POSIX_SHELL" && break POSIX_SHELL=`which dash`The patch title makes this sound it it was some kind of regenerated file. You're then patching this for a rather subtle bug. I worry that this change is going to get lost in the future when someone regenerates this.
Cool, you are right.
Quoted 2 lines
I'm wondering if we can find a better, more future proof solution?
I will think more about it.
// Robert
Quoted 5 lines
Cheers,
Richard
PATCH 4/4 grep: do_configure: fix "Argument list too long"
In reply to Robert YangFixed when len(TMPDIR) = 410:
aclocal: error: cannot open echo 'm4_define [snip]' configure.ac |: Argument list too long'
This is becuase it has a lot of m4 files, use relative path for them can fix the problem.
--- meta/recipes-extended/grep/grep_3.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-extended/grep/grep_3.0.bb +3 -0
@@ -16,6 +16,9 @@ inherit autotools gettext texinfo pkgconfig EXTRA_OECONF = "--disable-perl-regexp" +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + do_configure_prepend () { rm -f ${S}/m4/init.m4 }
Signature · 1 line
2.10.2