Skip to contentSkip to conversation

Fix rpm typo for multilib

PATCH Applied Yu Ke 5 participants 6 messages Aug 1, 2011

lore
Share & tools
lore

Yu Ke

author
#0 lore raw

cover Fix rpm typo for multilib

The following changes since commit f94b781695cd8fa387daff16ecbf3987a0883018:
Bruce Ashfield (1):
poky.conf: explicitly referenced preferred linux-yocto version

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kyu3/ml-rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/ml-rpm

Yu Ke (1):
package_rpm.bbclass: fix one typo

 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
author
#1 lore raw

PATCH 1/1 package_rpm.bbclass: fix one typo

fix the MLPREFIX referrence typo which cause multilib rpm do_rootfs failure

CC Mark Hatle <[email protected]>
Signed-off-by Yu Ke <[email protected]>
---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/package_rpm.bbclass +1 -1
index 0377100..ded744b 100644
@@ -248,7 +248,7 @@ package_install_internal_rpm () {
 			echo "Processing $pkg..."
 
 			archvar=base_package_archs
-			ml_pkg=$(echo ${pkg} | sed "s,$^{MLPREFIX}\(.*\),\1,")
+			ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
 			if [ "${ml_pkg}" != "${pkg}" ]; then
 				archvar=ml_package_archs
 			fi
Signature · 1 line
1.7.0.4
#4 lore raw
In reply to Yu Ke

Op 1 aug. 2011, om 13:54 heeft Yu Ke het volgende geschreven:

Quoted 8 lines

The following changes since commit f94b781695cd8fa387daff16ecbf3987a0883018:
Bruce Ashfield (1):
poky.conf: explicitly referenced preferred linux-yocto version

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kyu3/ml-rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/ml-rpm

When submitting patches to oe-core please base them against oe-core, not poky.

#5 lore raw
Quoted 7 lines · Koen Kooi

Op 1 aug. 2011, om 13:54 heeft Yu Ke het volgende geschreven:

Quoted 4 lines

The following changes since commit f94b781695cd8fa387daff16ecbf3987a0883018:
Bruce Ashfield (1):
poky.conf: explicitly referenced preferred linux-yocto version

Quoted 6 lines
Quoted 4 lines

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kyu3/ml-rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/ml-rpm

When submitting patches to oe-core please base them against oe-core, not poky.

Fair enough. here is the new branch:

http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=kyu3/oecore/ml-rpm

Regards
Ke

Applied
#2 lore raw

Re: [PATCH 1/1] package_rpm.bbclass: fix one typo

In reply to Yu Ke
Quoted 9 lines · Yu Ke

fix the MLPREFIX referrence typo which cause multilib rpm do_rootfs failure

CC Mark Hatle <[email protected]>
Signed-off-by Yu Ke <[email protected]>
---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Acked-by on v1 1/1
#3 lore raw

Re: [PATCH 1/1] package_rpm.bbclass: fix one typo

In reply to Yu Ke
Acked-by Mark Hatle <[email protected]>
Quoted 23 lines · Yu Ke

fix the MLPREFIX referrence typo which cause multilib rpm do_rootfs failure

CC Mark Hatle <[email protected]>
Signed-off-by Yu Ke <[email protected]>
---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/package_rpm.bbclass +1 -1
index 0377100..ded744b 100644
@@ -248,7 +248,7 @@ package_install_internal_rpm () {
 			echo "Processing $pkg..."
 
 			archvar=base_package_archs
-			ml_pkg=$(echo ${pkg} | sed "s,$^{MLPREFIX}\(.*\),\1,")
+			ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
 			if [ "${ml_pkg}" != "${pkg}" ]; then
 				archvar=ml_package_archs
 			fi