[oe-commits] Robert Yang : package_rpm.bbclass: fix incremental rpm image generation
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 10 12:08:30 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 2b3df2ec7979a49842df172be442a8794fe68fff
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2b3df2ec7979a49842df172be442a8794fe68fff
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Wed Sep 5 22:54:07 2012 +0800
package_rpm.bbclass: fix incremental rpm image generation
* Check ${target_rootfs}/etc/passwd rather than
${target_rootfs}${rpmlibdir} to make sure that it has been previously
installed.
* Remove the "--nodeps" when incremental image generation, it should
take care of the dependencies. Still use "--replacefiles --replacepkgs" in
case there are conflicts.
[YOCTO #3047]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/package_rpm.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 43cdd57..5f0e1d0 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -191,7 +191,7 @@ rpm_update_pkg () {
# Attempt to install the incremental pkgs
if [ -s $installdir/incremental.manifest ]; then
- rpm_common_comand --nodeps --replacefiles --replacepkgs \
+ rpm_common_comand --replacefiles --replacepkgs \
-Uvh $installdir/incremental.manifest
fi
else
@@ -517,7 +517,7 @@ EOF
${target_rootfs}/install/original_solution_sorted.manifest > \
${target_rootfs}/install/diff.manifest
mv ${target_rootfs}/install/diff.manifest ${target_rootfs}/install/total_solution.manifest
- elif [ "${INC_RPM_IMAGE_GEN}" = "1" -a -d "${target_rootfs}${rpmlibdir}" ]; then
+ elif [ "${INC_RPM_IMAGE_GEN}" = "1" -a -f "${target_rootfs}/etc/passwd" ]; then
echo "Skipping pre install due to existing image"
else
# RPM is special. It can't handle dependencies and preinstall scripts correctly. Its
More information about the Openembedded-commits
mailing list