Skip to contentSkip to conversation

package_rpm: Fix Linux 6.1.0 perf 1.0 version mistranslation

PATCH New Marek Vasut 1 participant 1 message Dec 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package_rpm: Fix Linux 6.1.0 perf 1.0 version mistranslation

With Linux 6.1.0 and perf 1.0-r9, a build which includes perf-dev fails due to perf-dev depending on perf 6.6.1.0-r9 . This is because translate_vers() operates on perf-dev and mangles its version. The following scenario occurs:

ver=6.1.0-r9
pv=1.0
pkgv=6.1.0
reppv=6.1.0

With Linux 6.1.0, a corner case is hit where pv is a substring of ver, which yields this corrupted version 6.6.1.0-r9 . Example in python3:

Quoted 1 line
Quoted 1 line
Quoted 1 line

"6.1.0-r9".replace("1.0", "6.1.0")

'6.6.1.0-r9'

Quoted 1 line
Quoted 1 line
Quoted 1 line

"6.0.13-r9".replace("1.0", "6.0.13")

'6.0.13-r9'

The fix is to only replace pv with reppv in case pv is at the beginning of ver , instead of replacing all occurences.

---
Cc: Alexandre Belloni <[email protected]>
Cc: Pavel Zhukov <[email protected]>
Cc: Richard Purdie <[email protected]>

---
 meta/classes-global/package_rpm.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/classes-global/package_rpm.bbclass +3 -1
index 81a2060b68..39efcc328e 100644
@@ -159,7 +159,9 @@ python write_specfile () {
                             pv = subd['PV']
                             pkgv = subd['PKGV']
                             reppv = pkgv.replace('-', '+')
-                            ver = ver.replace(pv, reppv).replace(pkgv, reppv)
+                            if ver.startswith(pv):
+                                ver = ver.replace(pv, reppv)
+                            ver = ver.replace(pkgv, reppv)
                         if 'PKGR' in subd:
                             # Make sure PKGR rather than PR in ver
                             pr = '-' + subd['PR']
Signature · 1 line
2.35.1