diff mbox series

[meta-networking,kirkstone,02/22] lksctp-tools: upgrade 1.0.19 -> 1.0.20

Message ID 20250929130425.2912077-3-skandigraun@gmail.com
State New
Headers show
Series Cherry-picks from Master Batch E | expand

Commit Message

Gyorgy Sarvari Sept. 29, 2025, 1:04 p.m. UTC 
From: Yi Zhao <yi.zhao@windriver.com>

ChangeLog:
https://github.com/sctp/lksctp-tools/blob/v1.0.20/ChangeLog

Drop redundant variables LK_REL, SOLIBVERSION and SOLIBMAJORVERSION in
recipe.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 162039c327f065d87730565b18fdc3986844a065)

Adapted to Kirkstone.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 ...lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
 rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} (80%)

Comments

Khem Raj Sept. 29, 2025, 4:55 p.m. UTC | #1 
On Mon, Sep 29, 2025 at 6:05 AM Gyorgy Sarvari via
lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org>
wrote:
>
> From: Yi Zhao <yi.zhao@windriver.com>
>
> ChangeLog:
> https://github.com/sctp/lksctp-tools/blob/v1.0.20/ChangeLog
>
> Drop redundant variables LK_REL, SOLIBVERSION and SOLIBMAJORVERSION in
> recipe.
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> (cherry picked from commit 162039c327f065d87730565b18fdc3986844a065)
>
> Adapted to Kirkstone.
>
> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
> ---
>  ...lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
>  rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} (80%)
>
> diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
> similarity index 80%
> rename from meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
> rename to meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
> index 4a9d2f54d9..51d9605624 100644
> --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
> +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
> @@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = " \
>      file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
>  "
>
> -SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225"
> +SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8"
>
>  PV .= "+git${SRCPV}"
> -LK_REL = "1.0.19"
>
>  SRC_URI = " \
>      git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
> @@ -34,19 +33,14 @@ do_install_ptest () {
>      done
>  }
>
> -SOLIBVERSION="${LK_REL}"
> -SOLIBMAJORVERSION="1"
> -
>  PACKAGES =+ "${PN}-withsctp ${PN}-utils"
>
>  FILES:${PN} = " \
> -    ${libdir}/libsctp.so.${SOLIBVERSION} \
> -    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
> +    ${libdir}/libsctp.so.* \

do the versioned shared libs still follow same conventions as prior release ?

>  "
>
>  FILES:${PN}-withsctp = " \
> -    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
> -    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
> +    ${libdir}/lksctp-tools/libwithsctp.so.* \
>  "
>
>  FILES:${PN}-dev += " \
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#120015): https://lists.openembedded.org/g/openembedded-devel/message/120015
> Mute This Topic: https://lists.openembedded.org/mt/115494436/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Gyorgy Sarvari Sept. 29, 2025, 6:11 p.m. UTC | #2 
On 9/29/25 18:55, Khem Raj wrote:
> On Mon, Sep 29, 2025 at 6:05 AM Gyorgy Sarvari via
> lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org>
> wrote:
>> From: Yi Zhao <yi.zhao@windriver.com>
>>
>> ChangeLog:
>> https://github.com/sctp/lksctp-tools/blob/v1.0.20/ChangeLog
>>
>> Drop redundant variables LK_REL, SOLIBVERSION and SOLIBMAJORVERSION in
>> recipe.
>>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> (cherry picked from commit 162039c327f065d87730565b18fdc3986844a065)
>>
>> Adapted to Kirkstone.
>>
>> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
>> ---
>>  ...lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} | 12 +++---------
>>  1 file changed, 3 insertions(+), 9 deletions(-)
>>  rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} (80%)
>>
>> diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
>> similarity index 80%
>> rename from meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
>> rename to meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
>> index 4a9d2f54d9..51d9605624 100644
>> --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
>> +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
>> @@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = " \
>>      file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
>>  "
>>
>> -SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225"
>> +SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8"
>>
>>  PV .= "+git${SRCPV}"
>> -LK_REL = "1.0.19"
>>
>>  SRC_URI = " \
>>      git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
>> @@ -34,19 +33,14 @@ do_install_ptest () {
>>      done
>>  }
>>
>> -SOLIBVERSION="${LK_REL}"
>> -SOLIBMAJORVERSION="1"
>> -
>>  PACKAGES =+ "${PN}-withsctp ${PN}-utils"
>>
>>  FILES:${PN} = " \
>> -    ${libdir}/libsctp.so.${SOLIBVERSION} \
>> -    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
>> +    ${libdir}/libsctp.so.* \
> do the versioned shared libs still follow same conventions as prior release ?

Yes, all the installed files are the same, only the .so version changed.
If you feel this is too invasive on the recipe, I won't argue.

>>  "
>>
>>  FILES:${PN}-withsctp = " \
>> -    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
>> -    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
>> +    ${libdir}/lksctp-tools/libwithsctp.so.* \
>>  "
>>
>>  FILES:${PN}-dev += " \
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#120015): https://lists.openembedded.org/g/openembedded-devel/message/120015
>> Mute This Topic: https://lists.openembedded.org/mt/115494436/1997914
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
Khem Raj Sept. 29, 2025, 6:26 p.m. UTC | #3 
On Mon, Sep 29, 2025 at 11:11 AM Gyorgy Sarvari <skandigraun@gmail.com> wrote:
>
> On 9/29/25 18:55, Khem Raj wrote:
> > On Mon, Sep 29, 2025 at 6:05 AM Gyorgy Sarvari via
> > lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org>
> > wrote:
> >> From: Yi Zhao <yi.zhao@windriver.com>
> >>
> >> ChangeLog:
> >> https://github.com/sctp/lksctp-tools/blob/v1.0.20/ChangeLog
> >>
> >> Drop redundant variables LK_REL, SOLIBVERSION and SOLIBMAJORVERSION in
> >> recipe.
> >>
> >> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> (cherry picked from commit 162039c327f065d87730565b18fdc3986844a065)
> >>
> >> Adapted to Kirkstone.
> >>
> >> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
> >> ---
> >>  ...lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} | 12 +++---------
> >>  1 file changed, 3 insertions(+), 9 deletions(-)
> >>  rename meta-networking/recipes-support/lksctp-tools/{lksctp-tools_1.0.19.bb => lksctp-tools_1.0.20.bb} (80%)
> >>
> >> diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
> >> similarity index 80%
> >> rename from meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
> >> rename to meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
> >> index 4a9d2f54d9..51d9605624 100644
> >> --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
> >> +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
> >> @@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = " \
> >>      file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
> >>  "
> >>
> >> -SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225"
> >> +SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8"
> >>
> >>  PV .= "+git${SRCPV}"
> >> -LK_REL = "1.0.19"
> >>
> >>  SRC_URI = " \
> >>      git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
> >> @@ -34,19 +33,14 @@ do_install_ptest () {
> >>      done
> >>  }
> >>
> >> -SOLIBVERSION="${LK_REL}"
> >> -SOLIBMAJORVERSION="1"
> >> -
> >>  PACKAGES =+ "${PN}-withsctp ${PN}-utils"
> >>
> >>  FILES:${PN} = " \
> >> -    ${libdir}/libsctp.so.${SOLIBVERSION} \
> >> -    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
> >> +    ${libdir}/libsctp.so.* \
> > do the versioned shared libs still follow same conventions as prior release ?
>
> Yes, all the installed files are the same, only the .so version changed.

OK that makes it fine.

> If you feel this is too invasive on the recipe, I won't argue.

>
> >>  "
> >>
> >>  FILES:${PN}-withsctp = " \
> >> -    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
> >> -    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
> >> +    ${libdir}/lksctp-tools/libwithsctp.so.* \
> >>  "
> >>
> >>  FILES:${PN}-dev += " \
> >>
> >> -=-=-=-=-=-=-=-=-=-=-=-
> >> Links: You receive all messages sent to this group.
> >> View/Reply Online (#120015): https://lists.openembedded.org/g/openembedded-devel/message/120015
> >> Mute This Topic: https://lists.openembedded.org/mt/115494436/1997914
> >> Group Owner: openembedded-devel+owner@lists.openembedded.org
> >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> >> -=-=-=-=-=-=-=-=-=-=-=-
> >>
>
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
similarity index 80%
rename from meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
rename to meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
index 4a9d2f54d9..51d9605624 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb
@@ -8,10 +8,9 @@  LIC_FILES_CHKSUM = " \
     file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
 "
 
-SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225"
+SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8"
 
 PV .= "+git${SRCPV}"
-LK_REL = "1.0.19"
 
 SRC_URI = " \
     git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
@@ -34,19 +33,14 @@  do_install_ptest () {
     done
 }
 
-SOLIBVERSION="${LK_REL}"
-SOLIBMAJORVERSION="1"
-
 PACKAGES =+ "${PN}-withsctp ${PN}-utils"
 
 FILES:${PN} = " \
-    ${libdir}/libsctp.so.${SOLIBVERSION} \
-    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
+    ${libdir}/libsctp.so.* \
 "
 
 FILES:${PN}-withsctp = " \
-    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
-    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
+    ${libdir}/lksctp-tools/libwithsctp.so.* \
 "
 
 FILES:${PN}-dev += " \