[PATCH 0/2] package_rpm.bbclass: two fixes

[PATCH 0/2] package_rpm.bbclass: two fixes

[Robert Yang]

* Two fixes
  - Change the arch's "-" to "_" in /etc/rpm/platform
  - Fix the incremental rpm image generation

// Robert

The following changes since commit 8b3aa00029e62df6d05710cf166fd5d09bdb29cf:

  documentation/poky-ref-manual/ref-variables.xml: Update B variable (2012-09-24 16:36:09 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib robert/rpm_arch_inc
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/rpm_arch_inc

Robert Yang (2):
  package_rpm.bbclass: change the arch's "-" to "_" for platform
  package_rpm.bbclass: no initial_solution in the second build

 meta/classes/package_rpm.bbclass | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

-- 
1.7.11.2

[PATCH 1/2] package_rpm.bbclass: change the arch's "-" to "_" for platform

[Robert Yang]

The platform and platform_extra will be written to /etc/rpm/platform,
the rpm's arch has changed the "-" to "_", so the value in platform
should also be updated.

[YOCTO #3159]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/package_rpm.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 64689d8..be6bd45 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -276,8 +276,8 @@ process_pkg_list_rpm() {
 package_install_internal_rpm () {
 
 	local target_rootfs="${INSTALL_ROOTFS_RPM}"
-	local platform="${INSTALL_PLATFORM_RPM}"
-	local platform_extra="${INSTALL_PLATFORM_EXTRA_RPM}"
+	local platform="`echo ${INSTALL_PLATFORM_RPM} | sed 's#-#_#g'`"
+	local platform_extra="`echo ${INSTALL_PLATFORM_EXTRA_RPM} | sed 's#-#_#g'`"
 	local confbase="${INSTALL_CONFBASE_RPM}"
 	local package_to_install="${INSTALL_PACKAGES_RPM}"
 	local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}"
-- 
1.7.11.2

Re: [PATCH 1/2] package_rpm.bbclass: change the arch's "-" to "_" for platform

[Saul Wold]

On 09/25/2012 06:38 AM, Robert Yang wrote:
> The platform and platform_extra will be written to /etc/rpm/platform,
> the rpm's arch has changed the "-" to "_", so the value in platform
> should also be updated.
>
> [YOCTO #3159]
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/classes/package_rpm.bbclass | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
> index 64689d8..be6bd45 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -276,8 +276,8 @@ process_pkg_list_rpm() {
>   package_install_internal_rpm () {
>
>   	local target_rootfs="${INSTALL_ROOTFS_RPM}"
> -	local platform="${INSTALL_PLATFORM_RPM}"
> -	local platform_extra="${INSTALL_PLATFORM_EXTRA_RPM}"
> +	local platform="`echo ${INSTALL_PLATFORM_RPM} | sed 's#-#_#g'`"
> +	local platform_extra="`echo ${INSTALL_PLATFORM_EXTRA_RPM} | sed 's#-#_#g'`"
>   	local confbase="${INSTALL_CONFBASE_RPM}"
>   	local package_to_install="${INSTALL_PACKAGES_RPM}"
>   	local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}"
>

Merged into OE-Core

Thanks
	Sau!

[PATCH 2/2] package_rpm.bbclass: no initial_solution in the second build

[Robert Yang]

There is no initial_solution.manifest in the second build when
incremental rpm image generation, since the initial solution has been
skipped. So we should check it before cat it.

[YOCTO #3128]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/package_rpm.bbclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index be6bd45..49055f2 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -317,10 +317,13 @@ package_install_internal_rpm () {
 		# we should add the previous solution manifest to the full "original" set to
 		# avoid duplicate install steps.
 		echo "Update original solution..."
-		cat ${target_rootfs}/install/initial_solution.manifest >> ${target_rootfs}/install/original_solution.manifest
-		cat ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/original_solution.manifest
-		rm ${target_rootfs}/install/initial_solution.manifest
-		rm ${target_rootfs}/install/total_solution.manifest
+		for m in ${target_rootfs}/install/initial_solution.manifest \
+			${target_rootfs}/install/total_solution.manifest; do
+			if [ -s $m ]; then
+				cat $m >> ${target_rootfs}/install/original_solution.manifest
+				rm -f $m
+			fi
+		done
 	fi
 
 	# Setup manifest of packages to install...
-- 
1.7.11.2

Re: [PATCH 0/2] package_rpm.bbclass: two fixes

[Saul Wold]

On 09/25/2012 06:38 AM, Robert Yang wrote:
> * Two fixes
>    - Change the arch's "-" to "_" in /etc/rpm/platform
>    - Fix the incremental rpm image generation
>
> // Robert
>
> The following changes since commit 8b3aa00029e62df6d05710cf166fd5d09bdb29cf:
>
>    documentation/poky-ref-manual/ref-variables.xml: Update B variable (2012-09-24 16:36:09 +0100)
>
> are available in the git repository at:
>
>    git://git.pokylinux.org/poky-contrib robert/rpm_arch_inc
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/rpm_arch_inc
>
> Robert Yang (2):
>    package_rpm.bbclass: change the arch's "-" to "_" for platform
>    package_rpm.bbclass: no initial_solution in the second build
>
>   meta/classes/package_rpm.bbclass | 15 +++++++++------
>   1 file changed, 9 insertions(+), 6 deletions(-)
>
Merged both into OE-Core

Thanks
	Sau!