diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2012-09-05 22:54:07 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 12:05:56 +0100 |
| commit | 2b3df2ec7979a49842df172be442a8794fe68fff (patch) | |
| tree | 4395a44c5332b23a176805d26d293485cebeba09 /meta/classes | |
| parent | 973e615ab4ee325ab568f84e001a5724f4b0dd01 (diff) | |
| download | openembedded-core-2b3df2ec7979a49842df172be442a8794fe68fff.tar.gz openembedded-core-2b3df2ec7979a49842df172be442a8794fe68fff.tar.bz2 openembedded-core-2b3df2ec7979a49842df172be442a8794fe68fff.zip | |
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@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | 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 43cdd572c3..5f0e1d01a8 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 |