From patchwork Wed Sep 19 11:49:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC, 3/7] rootfs generation: export two new variables to postinst scriptlets Date: Wed, 19 Sep 2012 11:49:21 -0000 From: Laurentiu Palcu X-Patchwork-Id: 36915 Message-Id: <1a402da6c75d4db884c7f92e2e88cd3d1bf3b194.1348052899.git.laurentiu.palcu@intel.com> To: openembedded-core@lists.openembedded.org 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. Signed-off-by: Laurentiu Palcu --- meta/classes/package_rpm.bbclass | 2 ++ meta/classes/rootfs_deb.bbclass | 2 ++ meta/classes/rootfs_ipk.bbclass | 2 ++ 3 files changed, 6 insertions(+) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 61f0117..8122243 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -468,6 +468,8 @@ export D="${target_rootfs}" export OFFLINE_ROOT="\$D" export IPKG_OFFLINE_ROOT="\$D" export OPKG_OFFLINE_ROOT="\$D" +export INTERCEPT_DIR="${WORKDIR}/intercept_scripts" +export NATIVE_ROOT=${STAGING_DIR_NATIVE} \$2 \$1/\$3 \$4 if [ \$? -ne 0 ]; then diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 881fdbd..955382f 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -48,6 +48,8 @@ fakeroot rootfs_deb_do_rootfs () { export OFFLINE_ROOT=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} + export INTERCEPT_DIR=${WORKDIR}/intercept_scripts + export NATIVE_ROOT=${STAGING_DIR_NATIVE} # Attempt to run preinsts # Mark packages with preinst failures as unpacked diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 6cdd8f6..3b1b120 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -69,6 +69,8 @@ fakeroot rootfs_ipk_do_rootfs () { export OFFLINE_ROOT=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} + export INTERCEPT_DIR=${WORKDIR}/intercept_scripts + export NATIVE_ROOT=${STAGING_DIR_NATIVE} package_install_internal_ipk