diff options
Diffstat (limited to 'meta')
-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 () { | |||
191 | 191 | ||
192 | # Attempt to install the incremental pkgs | 192 | # Attempt to install the incremental pkgs |
193 | if [ -s $installdir/incremental.manifest ]; then | 193 | if [ -s $installdir/incremental.manifest ]; then |
194 | rpm_common_comand --nodeps --replacefiles --replacepkgs \ | 194 | rpm_common_comand --replacefiles --replacepkgs \ |
195 | -Uvh $installdir/incremental.manifest | 195 | -Uvh $installdir/incremental.manifest |
196 | fi | 196 | fi |
197 | else | 197 | else |
@@ -517,7 +517,7 @@ EOF | |||
517 | ${target_rootfs}/install/original_solution_sorted.manifest > \ | 517 | ${target_rootfs}/install/original_solution_sorted.manifest > \ |
518 | ${target_rootfs}/install/diff.manifest | 518 | ${target_rootfs}/install/diff.manifest |
519 | mv ${target_rootfs}/install/diff.manifest ${target_rootfs}/install/total_solution.manifest | 519 | mv ${target_rootfs}/install/diff.manifest ${target_rootfs}/install/total_solution.manifest |
520 | elif [ "${INC_RPM_IMAGE_GEN}" = "1" -a -d "${target_rootfs}${rpmlibdir}" ]; then | 520 | elif [ "${INC_RPM_IMAGE_GEN}" = "1" -a -f "${target_rootfs}/etc/passwd" ]; then |
521 | echo "Skipping pre install due to existing image" | 521 | echo "Skipping pre install due to existing image" |
522 | else | 522 | else |
523 | # RPM is special. It can't handle dependencies and preinstall scripts correctly. Its | 523 | # RPM is special. It can't handle dependencies and preinstall scripts correctly. Its |