From patchwork Wed Sep 5 14:54:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] package_rpm.bbclass: fix incremental rpm image generation Date: Wed, 05 Sep 2012 14:54:07 -0000 From: Robert Yang X-Patchwork-Id: 35959 Message-Id: To: Cc: Zhenfeng.Zhao@windriver.com * 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 --- 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 742f292..b2b8cee 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