Re: [OE-core] [PATCH v2 2/4] package_deb: Revert versioned providers workaround

2023-10-07 Thread Pavel Zhukov 

Peter Kjellerstedt  writes:

>> -Original Message-
>> From: openembedded-core@lists.openembedded.org 
>>  On Behalf Of Pavel Zhukov
>> Sent: den 6 oktober 2023 21:10
>> To: openembedded-core@lists.openembedded.org
>> Cc: Pavel Zhukov 
>> Subject: [OE-core] [PATCH v2 2/4] package_deb: Revert versioned providers 
>> workaround
>> 
>> dpkg and apt seem to handle versioned provides correctly now [1] so this
>> workaround is not needed anymore.
>> This fixes [Yocto #14995] for package_deb.
>> 
>> [1]
>
> Was there supposed to be a reference here?
>
Yes, there supposed to be link to the documentation...
https://www.debian.org/doc/debian-policy/ch-relationships.html#virtual-packages-provides

>> Signed-off-by: Pavel Zhukov 
>> ---
>>  meta/classes-global/package_deb.bbclass | 9 +
>>  1 file changed, 1 insertion(+), 8 deletions(-)
>> 
>
> //Peter


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188796): 
https://lists.openembedded.org/g/openembedded-core/message/188796
Mute This Topic: https://lists.openembedded.org/mt/101804515/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v2 2/4] package_deb: Revert versioned providers workaround

2023-10-06 Thread Peter Kjellerstedt 
> -Original Message-
> From: openembedded-core@lists.openembedded.org 
>  On Behalf Of Pavel Zhukov
> Sent: den 6 oktober 2023 21:10
> To: openembedded-core@lists.openembedded.org
> Cc: Pavel Zhukov 
> Subject: [OE-core] [PATCH v2 2/4] package_deb: Revert versioned providers 
> workaround
> 
> dpkg and apt seem to handle versioned provides correctly now [1] so this
> workaround is not needed anymore.
> This fixes [Yocto #14995] for package_deb.
> 
> [1]

Was there supposed to be a reference here?

> Signed-off-by: Pavel Zhukov 
> ---
>  meta/classes-global/package_deb.bbclass | 9 +
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 

//Peter

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188789): 
https://lists.openembedded.org/g/openembedded-core/message/188789
Mute This Topic: https://lists.openembedded.org/mt/101804515/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2 2/4] package_deb: Revert versioned providers workaround

2023-10-06 Thread Pavel Zhukov 
dpkg and apt seem to handle versioned provides correctly now [1] so this
workaround is not needed anymore.
This fixes [Yocto #14995] for package_deb.

[1]
Signed-off-by: Pavel Zhukov 
---
 meta/classes-global/package_deb.bbclass | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/meta/classes-global/package_deb.bbclass 
b/meta/classes-global/package_deb.bbclass
index 5aba3837bd..d7bbfae3fb 100644
--- a/meta/classes-global/package_deb.bbclass
+++ b/meta/classes-global/package_deb.bbclass
@@ -184,8 +184,6 @@ def deb_write_pkg(pkg, d):
 #   '<' = less or equal
 #   '>' = greater or equal
 # adjust these to the '<<' and '>>' equivalents
-# Also, "=" specifiers only work if they have the PR in, so 1.2.3 
!= 1.2.3-r0
-# so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0"
 for dep in list(var.keys()):
 if '(' in dep or '/' in dep:
 newdep = re.sub(r'[(:)/]', '__', dep)
@@ -200,10 +198,6 @@ def deb_write_pkg(pkg, d):
 var[dep][i] = var[dep][i].replace("< ", "<< ")
 elif (v or "").startswith("> "):
 var[dep][i] = var[dep][i].replace("> ", ">> ")
-elif (v or "").startswith("= ") and "-r" not in v:
-ver = var[dep][i].replace("= ", "")
-var[dep][i] = var[dep][i].replace("= ", ">= ")
-var[dep].append("<< " + ver + ".0")
 
 rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") 
or "")
 debian_cmp_remap(rdepends)
@@ -220,8 +214,7 @@ def deb_write_pkg(pkg, d):
 del rrecommends[dep]
 rsuggests = 
bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS") or "")
 debian_cmp_remap(rsuggests)
-# Deliberately drop version information here, not wanted/supported by 
deb
-rprovides = 
dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or 
""), [])
+rprovides = 
bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or "")
 # Remove file paths if any from rprovides, debian does not support 
custom providers
 for key in list(rprovides.keys()):
 if key.startswith('/'):
-- 
2.41.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188778): 
https://lists.openembedded.org/g/openembedded-core/message/188778
Mute This Topic: https://lists.openembedded.org/mt/101804515/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-