summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-01-23 06:48:17 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-28 21:23:02 +0000
commitd1ff61a16a3fcfdd7cf882bc89fb1d164cb1603a (patch)
tree6b8eefe48317fe5e43f8dd45e6131ac9c773b1d2
parent549c9cb6a7b0e989ffcefed8219eedaa6f13c6c8 (diff)
downloadopenembedded-core-contrib-d1ff61a16a3fcfdd7cf882bc89fb1d164cb1603a.tar.gz
openembedded-core-contrib-d1ff61a16a3fcfdd7cf882bc89fb1d164cb1603a.tar.bz2
openembedded-core-contrib-d1ff61a16a3fcfdd7cf882bc89fb1d164cb1603a.zip
binconfig-disabled: try harder to prevent usage of config scripts
Returning a non-zero exit code is not enough to cause errors when configure scripts call the patched config scripts: for example, swig's configure script uses PCRE_LIBS=`$PCRE_CONFIG --libs` and does not abort on errors. Using empty output may then succeed, for example when the required library is available indirectly. Returning some nonsense command line arguments covers such cases, because using them will definitely lead to errors during compilation. The faked arguments were chosen such that these errors can be linked back to the root cause. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/binconfig-disabled.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/binconfig-disabled.bbclass b/meta/classes/binconfig-disabled.bbclass
index 27f904eb42..4c42ae22e4 100644
--- a/meta/classes/binconfig-disabled.bbclass
+++ b/meta/classes/binconfig-disabled.bbclass
@@ -10,6 +10,9 @@ FILES_${PN}-dev += "${bindir}/*-config"
do_install_append () {
for x in ${BINCONFIG}; do
echo "#!/bin/sh" > ${D}$x
+ # Make the disabled script emit invalid parameters for those configure
+ # scripts which call it without checking the return code.
+ echo "echo '--should-not-have-used-$x'" > ${D}$x
echo "exit 1" >> ${D}$x
done
}