summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass3
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix.patch11
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb4
3 files changed, 13 insertions, 5 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 3f42b4f7cd..838448f33c 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -331,9 +331,6 @@ def check_sanity(e):
331 if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': 331 if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
332 messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' 332 messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
333 333
334 if os.path.basename(os.readlink('/bin/sh')) == 'dash':
335 messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n"
336
337 omask = os.umask(022) 334 omask = os.umask(022)
338 if omask & 0755: 335 if omask & 0755:
339 messages = messages + "Please use a umask which allows a+rx and u+rwx\n" 336 messages = messages + "Please use a umask which allows a+rx and u+rwx\n"
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index 1b20324715..e6eca1fe02 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -8,6 +8,15 @@ Originally by: RP
8Updated: Date: 2010/06/28 8Updated: Date: 2010/06/28
9Nitin A Kamble <nitin.a.kamble@intel.com> 9Nitin A Kamble <nitin.a.kamble@intel.com>
10 10
11It also adjusts libtool so that the header at the script is used for
12script execution and not thevalue of $SHELL. This is because many
13Makefiles change $SHELL so dash can get used to execute what is
14otherwise configured as a bash shell script. Since we don't need to
15execute scipts this way on any system I'm aware of us building upon,
16the simplest fix is just to remove $SHELL.
17
18Updated: Date: 2011/11/09
19RP
11 20
12Index: libtool-2.4/libltdl/m4/libtool.m4 21Index: libtool-2.4/libltdl/m4/libtool.m4
13=================================================================== 22===================================================================
@@ -18,7 +27,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
18 27
19 # Always use our own libtool. 28 # Always use our own libtool.
20-LIBTOOL='$(SHELL) $(top_builddir)/libtool' 29-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
21+LIBTOOL='$(SHELL) $(top_builddir)' 30+LIBTOOL='$(top_builddir)'
22+LIBTOOL="$LIBTOOL/${host_alias}-libtool" 31+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
23 AC_SUBST(LIBTOOL)dnl 32 AC_SUBST(LIBTOOL)dnl
24 33
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 6cc6bb5d2b..0cce46eca2 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -53,7 +53,9 @@ do_install() {
53 53
54 install -d ${D}${datadir}/sgml/openjade-${PV} 54 install -d ${D}${datadir}/sgml/openjade-${PV}
55 install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} 55 install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV}
56 install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV} 56 install -m 644 dsssl/*.dtd ${D}${datadir}/sgml/openjade-${PV}
57 install -m 644 dsssl/*.dsl ${D}${datadir}/sgml/openjade-${PV}
58 install -m 644 dsssl/*.sgm ${D}${datadir}/sgml/openjade-${PV}
57 59
58 install -d ${datadir}/sgml/openjade-${PV} 60 install -d ${datadir}/sgml/openjade-${PV}
59 install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog 61 install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog