diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-12-10 16:30:03 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 15:18:43 +0000 |
| commit | 0496ba3a9b0120eefefbc6e5f8390436f1ccb2c3 (patch) | |
| tree | 590bd91d6f124c08c4dee72603c1dc9489af6b22 | |
| parent | 4809890ae56f428413601072852e81f9a59ff891 (diff) | |
| download | poky-0496ba3a9b0120eefefbc6e5f8390436f1ccb2c3.tar.gz | |
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.
(From OE-Core rev: 06151c34f4f4cb669b2f93ebb2f78cfecf698355)
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/populate_sdk_deb.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_ipk.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 2 |
3 files changed, 6 insertions, 0 deletions
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 () { | |||
| 34 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" | 34 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" |
| 35 | export PACKAGES_LINGUAS_DEB="" | 35 | export PACKAGES_LINGUAS_DEB="" |
| 36 | export INSTALL_TASK_DEB="populate_sdk-target" | 36 | export INSTALL_TASK_DEB="populate_sdk-target" |
| 37 | export INTERCEPT_DIR=${WORKDIR}/intercept_scripts | ||
| 38 | export NATIVE_ROOT=${STAGING_DIR_NATIVE} | ||
| 37 | 39 | ||
| 38 | package_install_internal_deb | 40 | package_install_internal_deb |
| 39 | 41 | ||
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() { | |||
| 26 | export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} | 26 | export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} |
| 27 | export IPKG_OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} | 27 | export IPKG_OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} |
| 28 | export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} | 28 | export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} |
| 29 | export INTERCEPT_DIR=${WORKDIR}/intercept_scripts | ||
| 30 | export NATIVE_ROOT=${STAGING_DIR_NATIVE} | ||
| 29 | 31 | ||
| 30 | package_install_internal_ipk | 32 | package_install_internal_ipk |
| 31 | 33 | ||
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 () { | |||
| 40 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)" | 40 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)" |
| 41 | export INSTALL_TASK_RPM="populate_sdk-target" | 41 | export INSTALL_TASK_RPM="populate_sdk-target" |
| 42 | export INSTALL_COMPLEMENTARY_RPM="" | 42 | export INSTALL_COMPLEMENTARY_RPM="" |
| 43 | export INTERCEPT_DIR=${WORKDIR}/intercept_scripts | ||
| 44 | export NATIVE_ROOT=${STAGING_DIR_NATIVE} | ||
| 43 | 45 | ||
| 44 | # Setup base system configuration | 46 | # Setup base system configuration |
| 45 | mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ | 47 | mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ |
