summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-09-05 22:54:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 13:01:48 +0100
commit092895cdb1adbe4e2155c4ba40ad2986734b0044 (patch)
tree947f2ff83374f30b28cb6aae3eddd6e0366b18a2 /meta
parentd401258b819f6c74717a07cacd3103ca2a5a6583 (diff)
downloadpoky-092895cdb1adbe4e2155c4ba40ad2986734b0044.tar.gz
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] (From OE-Core rev: 2b3df2ec7979a49842df172be442a8794fe68fff) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass4
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