Skip to contentSkip to conversation

apr: remove the use of ${SHELL} to avoid bash/dash confliction

PATCH New Hongxu Jia 1 participant 2 messages Apr 11, 2014

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover apr: remove the use of ${SHELL} to avoid bash/dash confliction

The following changes since commit 863cc7483f5ee43189537940de8ee5c0964d24cc:

poky.conf: Post release version bump (2014-04-10 18:03:07 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-apr
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-apr

Hongxu Jia (1):
apr: remove the use of ${SHELL} to avoid bash/dash confliction

 meta/recipes-support/apr/apr_1.4.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 apr: remove the use of ${SHELL} to avoid bash/dash confliction

While multible hosts sharing a common sstate cache, the fist host using bash as default shell and build apr, the second host using dash as default shell and build apr-util, there was a failure in apr-util:
...

| /bin/sh: 0: Can't open i586-poky-linux-libtool
| make[1]: *** [dbm/apr_dbm_gdbm.lo] Error 127
| make[1]: *** Waiting for unfinished jobs....
| make[1]: Leaving directory

`tmp/work/i586-poky-linux/apr-util/1.5.2-r0/apr-util-1.5.2'
...

The quick way to reproduce the defect in Ubuntu 1204:
1. Create a new build
2. sudo dpkg-reconfigure dash <set bash as /bin/sh>
3. bitbake apr
4. sudo dpkg-reconfigure dash <set dash as /bin/sh>
5. bitbake apr-util

Remove the use of $(SHELL) in the apr could avoid this issue.

---
 meta/recipes-support/apr/apr_1.4.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/apr/apr_1.4.8.bb +1 -1
index 4d36585..7a130d1 100644
@@ -56,7 +56,7 @@ apr_sysroot_preprocess () {
 	cp ${S}/build/apr_rules.mk $d/
 	sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk
 	sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk
-	sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g $d/apr_rules.mk
+	sed -i s,LIBTOOL=.*,LIBTOOL=${HOST_SYS}-libtool,g $d/apr_rules.mk
 	sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk
 	cp ${S}/build/mkdir.sh $d/
 	cp ${S}/build/make_exports.awk $d/
Signature · 1 line
1.8.1.2