summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-02-10 17:20:51 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-02-10 17:20:51 +0100
commitfaa40fdac290d1738da61d2b9c393df774fef2d0 (patch)
tree1d48870851e89185bc7d463aace343be23fe6f09
parent8fa61d6388c7f29275606993bdc0e1df9aec6e01 (diff)
downloadmeta-phytec-faa40fdac290d1738da61d2b9c393df774fef2d0.tar.bz2
meta-phytec-faa40fdac290d1738da61d2b9c393df774fef2d0.zip
ti-eula-unpack.in: uid bugfix
TI binary installer will fail if the uid is too high. Install binary as fakeroot in patched 32bit mode. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-core/fakeroot/fakeroot-native32bit_1.18.4.bb5
-rw-r--r--recipes-ti/includes/ti-eula-unpack.inc4
2 files changed, 8 insertions, 1 deletions
diff --git a/recipes-core/fakeroot/fakeroot-native32bit_1.18.4.bb b/recipes-core/fakeroot/fakeroot-native32bit_1.18.4.bb
new file mode 100644
index 0000000..611a9a0
--- /dev/null
+++ b/recipes-core/fakeroot/fakeroot-native32bit_1.18.4.bb
@@ -0,0 +1,5 @@
+require recipes-core/fakeroot/fakeroot-native_${PV}.bb
+
+EXTRA_OECONF = "--program-prefix= --target=i686-pc-linux-gnu"
+CFLAGS = "-O2 -m32"
+CXXFLAGS = "${CFLAGS}"
diff --git a/recipes-ti/includes/ti-eula-unpack.inc b/recipes-ti/includes/ti-eula-unpack.inc
index aee88f1..db29b46 100644
--- a/recipes-ti/includes/ti-eula-unpack.inc
+++ b/recipes-ti/includes/ti-eula-unpack.inc
@@ -9,6 +9,8 @@
# TI_BIN_UNPK_WDEXT - This variable extends workdir path, if user wants to put
# the output in some internal directory
+DEPENDS = "fakeroot-native32bit"
+
python do_unpack () {
bb.build.exec_func('base_do_unpack', d)
bb.build.exec_func('ti_bin_do_unpack', d)
@@ -46,7 +48,7 @@ python ti_bin_do_unpack() {
os.chmod(binfile, 0755)
# Run the InstallJammer binary and accept the EULA
- filename = "HOME=%s ./%s --mode console" % (workdir, binfile)
+ filename = "HOME=%s fakeroot ./%s --mode console" % (workdir, binfile)
# Test executable by printing installer version or help screen (--version currently broken for some installers)
# - this is currently broken in some IJ installers - comment out for now