diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-02-15 22:56:13 -0600 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-02-16 07:34:51 -0800 |
| commit | ab0e1bed22b5054db5a2b62862134ad3b0714181 (patch) | |
| tree | 291945a5f5260eb8e75186b8f31af06a54761fc4 /meta/classes/populate_sdk_rpm.bbclass | |
| parent | 110f1f9418ba39ba4136d7aa7c3d52c2a10f47f0 (diff) | |
| download | openembedded-core-ab0e1bed22b5054db5a2b62862134ad3b0714181.tar.gz openembedded-core-ab0e1bed22b5054db5a2b62862134ad3b0714181.tar.bz2 openembedded-core-ab0e1bed22b5054db5a2b62862134ad3b0714181.zip | |
package_rpm: Fix solverdb generation
The RPM solverdb was potentially being generated multiple times.
Fix this by ensuring we only process each directory once.
Also correct an issue where the solution did not necessarily follow
the preferred architecture ordering, reverse the default Poky ordering
so that preferred is listed first.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
| -rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index e1abbad17b..d1797806e2 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass @@ -33,8 +33,7 @@ fakeroot populate_sdk_rpm () { #install target export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" - export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" - export INSTALL_PLATFORM_EXTRA_RPM="${PACKAGE_ARCHS}" + export INSTALL_PLATFORM_RPM="${PACKAGE_ARCHS}" export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" @@ -46,7 +45,6 @@ fakeroot populate_sdk_rpm () { export INSTALL_PLATFORM_RPM="${SDK_ARCH}" export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" - INSTALL_PLATFORM_EXTRA_RPM="" for arch in ${PACKAGE_ARCHS}; do sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` extension="-nativesdk" @@ -54,10 +52,9 @@ fakeroot populate_sdk_rpm () { extension="" fi if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then - INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $sdkarch" + INSTALL_PLATFORM_RPM="$INSTALL_PLATFORM_RPM $sdkarch" fi done - export INSTALL_PLATFORM_EXTRA_RPM package_install_internal_rpm populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} |