summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-09-18 18:47:59 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:09 +0000
commitfd401f292ebca8d905783ef15b9b347f80d6f899 (patch)
treebf8bf06845c80f5a0a477fe7a92c0874839e1cd7
parent6b76f04195911a40d868d988b8223db0f88ac8a9 (diff)
downloadpoky-fd401f292ebca8d905783ef15b9b347f80d6f899.tar.gz
rootfs generation: export two new variables to postinst scriptlets
In order for the postinst scriptlets to be able to run once we need to export the location of the intercept scripts and also the location of native sysrootfs. The gdk-pixbuf binaries will need the latter because in order to generate the loaders.cache it will need to scan some shared libraries that must be native. Even though the output is a text file. (From OE-Core rev: 927fabf549bb79cc179d2cb0a953dcd515acf464) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass2
-rw-r--r--meta/classes/rootfs_deb.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
3 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 200a941177..293c52c629 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -475,6 +475,8 @@ export D="${target_rootfs}"
475export OFFLINE_ROOT="\$D" 475export OFFLINE_ROOT="\$D"
476export IPKG_OFFLINE_ROOT="\$D" 476export IPKG_OFFLINE_ROOT="\$D"
477export OPKG_OFFLINE_ROOT="\$D" 477export OPKG_OFFLINE_ROOT="\$D"
478export INTERCEPT_DIR="${WORKDIR}/intercept_scripts"
479export NATIVE_ROOT=${STAGING_DIR_NATIVE}
478 480
479\$2 \$1/\$3 \$4 481\$2 \$1/\$3 \$4
480if [ \$? -ne 0 ]; then 482if [ \$? -ne 0 ]; then
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 881fdbd980..955382f045 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -48,6 +48,8 @@ fakeroot rootfs_deb_do_rootfs () {
48 export OFFLINE_ROOT=${IMAGE_ROOTFS} 48 export OFFLINE_ROOT=${IMAGE_ROOTFS}
49 export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} 49 export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
50 export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} 50 export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
51 export INTERCEPT_DIR=${WORKDIR}/intercept_scripts
52 export NATIVE_ROOT=${STAGING_DIR_NATIVE}
51 53
52 # Attempt to run preinsts 54 # Attempt to run preinsts
53 # Mark packages with preinst failures as unpacked 55 # Mark packages with preinst failures as unpacked
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index fc69b7edf4..8766d24181 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -69,6 +69,8 @@ fakeroot rootfs_ipk_do_rootfs () {
69 export OFFLINE_ROOT=${IMAGE_ROOTFS} 69 export OFFLINE_ROOT=${IMAGE_ROOTFS}
70 export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} 70 export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
71 export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} 71 export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
72 export INTERCEPT_DIR=${WORKDIR}/intercept_scripts
73 export NATIVE_ROOT=${STAGING_DIR_NATIVE}
72 74
73 package_install_internal_ipk 75 package_install_internal_ipk
74 76