From 06151c34f4f4cb669b2f93ebb2f78cfecf698355 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 10 Dec 2012 16:30:03 +0200 Subject: [PATCH] populate_sdk_(deb|ipk|rpm): export NATIVE_ROOT and INTERCEPT_DIR variables In order for the postinstall scripts to have access to the recent improvements when generating the target SDK sysroot, export these variables in populate_sdk. Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold --- meta/classes/populate_sdk_deb.bbclass | 2 ++ meta/classes/populate_sdk_ipk.bbclass | 2 ++ meta/classes/populate_sdk_rpm.bbclass | 2 ++ 3 files changed, 6 insertions(+) diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index 48a638e0f2..e1705e7bfb 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass @@ -34,6 +34,8 @@ populate_sdk_deb () { export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" export PACKAGES_LINGUAS_DEB="" export INSTALL_TASK_DEB="populate_sdk-target" + export INTERCEPT_DIR=${WORKDIR}/intercept_scripts + export NATIVE_ROOT=${STAGING_DIR_NATIVE} package_install_internal_deb diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass index 65a95e7a2b..3a5ecda268 100644 --- a/meta/classes/populate_sdk_ipk.bbclass +++ b/meta/classes/populate_sdk_ipk.bbclass @@ -26,6 +26,8 @@ populate_sdk_ipk() { export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} export IPKG_OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} + export INTERCEPT_DIR=${WORKDIR}/intercept_scripts + export NATIVE_ROOT=${STAGING_DIR_NATIVE} package_install_internal_ipk diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index 1c5404927f..b5aa601f5d 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass @@ -40,6 +40,8 @@ populate_sdk_rpm () { export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)" export INSTALL_TASK_RPM="populate_sdk-target" export INSTALL_COMPLEMENTARY_RPM="" + export INTERCEPT_DIR=${WORKDIR}/intercept_scripts + export NATIVE_ROOT=${STAGING_DIR_NATIVE} # Setup base system configuration mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ -- 2.40.1