Skip to contentSkip to conversation

package_rpm.bbclass: two fixes

PATCH Applied Robert Yang 2 participants 5 messages Sep 25, 2012 – Sep 27, 2012

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover package_rpm.bbclass: two fixes

* 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(-)
Signature · 1 line
1.7.11.2
author
#1 lore raw

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

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 <[email protected]>
---
 meta/classes/package_rpm.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/package_rpm.bbclass +2 -2
index 64689d8..be6bd45 100644
@@ -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}"
Signature · 1 line
1.7.11.2
Applied
#2 lore raw

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

Quoted 17 lines · 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 <[email protected]>
---
  meta/classes/package_rpm.bbclass | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/package_rpm.bbclass +0 -0
index 64689d8..be6bd45 100644

meta/classes/package_rpm.bbclass process_pkg_list_rpm() { · line 283

Quoted 10 lines
meta/classes/package_rpm.bbclass +2 -2
@@ -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!

author
#3 lore raw

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

In reply to 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 <[email protected]>
---
 meta/classes/package_rpm.bbclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
meta/classes/package_rpm.bbclass +7 -4
index be6bd45..49055f2 100644
@@ -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...
Signature · 1 line
1.7.11.2
#4 lore raw
In reply to Robert Yang
Quoted 15 lines · 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

Quoted 7 lines

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!