package_rpm.bbclass: fix incremental rpm image generation

Test info:
# With INC_RPM_IMAGE_GEN = "1"

$ bitbake core-image-sato-sdk core-image-sato core-image-minimal \
	package-index meta-toolchain-sdk
# Build 3 times.
#
# Modified some packages and rebuild it, the incremental image
# generation works well.

# Without INC_RPM_IMAGE_GEN = "1"

$ bitbake core-image-sato-sdk core-image-sato core-image-minimal \
	package-index meta-toolchain-sdk

// Robert

The following changes since commit 99c85ba93075a1aff789cafabbacf42e6a93bd32:

build-appliance-image: Update to latest poky master (2012-09-04 18:04:40 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/rpm_inc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/rpm_inc

Robert Yang (1):
package_rpm.bbclass: fix incremental rpm image generation

 meta/classes/package_rpm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

* 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]

---
 meta/classes/package_rpm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 742f292..b2b8cee 100644
@@ -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

1.7.1

Merged into OE-Core

Thanks
Sau!