diff mbox series

[meta-oe,1/2] redis: restore Upstream-Status

Message ID 20240130103458.819774-1-martin.jansa@gmail.com
State Accepted
Headers show
Series [meta-oe,1/2] redis: restore Upstream-Status | expand

Commit Message

Martin Jansa Jan. 30, 2024, 10:34 a.m. UTC
* accidentally dropped in:
  https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
---
 .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
 1 file changed, 2 insertions(+)

Comments

Khem Raj Jan. 30, 2024, 5:28 p.m. UTC | #1
On 1/30/24 2:34 AM, Martin Jansa wrote:
> * accidentally dropped in:
>    https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
> ---
>   .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> index b562e2522c..48a8bb5b4b 100644
> --- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> +++ b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>   Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
>   
>   ---
> +Upstream-Status: Pending

I think it might be better to move it above the scissor to avoid getting 
lost in next devtool based upgrade.

> +
>    deps/Makefile         |  1 -
>    deps/lua/Makefile     |  1 -
>    deps/lua/src/Makefile | 16 ++++++----------
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108492): https://lists.openembedded.org/g/openembedded-devel/message/108492
> Mute This Topic: https://lists.openembedded.org/mt/104051095/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Martin Jansa Jan. 30, 2024, 6:23 p.m. UTC | #2
On Tue, Jan 30, 2024 at 6:28 PM Khem Raj <raj.khem@gmail.com> wrote:

> On 1/30/24 2:34 AM, Martin Jansa wrote:
> > * accidentally dropped in:
> >
> https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
> > ---
> >   .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git
> a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> > index b562e2522c..48a8bb5b4b 100644
> > ---
> a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> > +++
> b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
> > @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
> >   Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
> >
> >   ---
> > +Upstream-Status: Pending
>
> I think it might be better to move it above the scissor to avoid getting
> lost in next devtool based upgrade.
>

As you wish, resent all 3 as v2 with it moved.

FWIW: in
https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc
I've moved all Upstream-Statuses in LGE layers bellow, because too often
developers applied them with Upstream-Status into the component source git
repo where it doesn't belong and then it was already too late to remove it
there (while with Upstream-Status lost in rebase/devtool there is still
time to get warning from QA check and once this check is enabled by default
in all the builds it will prevent people overlooking this by accident).
Randy MacLeod March 22, 2024, 12:55 a.m. UTC | #3
Would the new license scheme described here:

https://redis.com/blog/redis-adopts-dual-source-available-licensing/

prevent us from accepting the 7.4 release? I suspect it should but I 
need more time to
read the new terms.

../Randy


On 2024-01-30 1:23 p.m., Martin Jansa via lists.openembedded.org wrote:
> On Tue, Jan 30, 2024 at 6:28 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>     On 1/30/24 2:34 AM, Martin Jansa wrote:
>     > * accidentally dropped in:
>     >
>     https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
>     > ---
>     >  .../lua-update-Makefile-to-use-environment-build-setting.patch
>     | 2 ++
>     >   1 file changed, 2 insertions(+)
>     >
>     > diff --git
>     a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>     b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>     > index b562e2522c..48a8bb5b4b 100644
>     > ---
>     a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>     > +++
>     b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>     > @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>     >   Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
>     >
>     >   ---
>     > +Upstream-Status: Pending
>
>     I think it might be better to move it above the scissor to avoid
>     getting
>     lost in next devtool based upgrade.
>
>
> As you wish, resent all 3 as v2 with it moved.
>
> FWIW: in 
> https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc 
> I've moved all Upstream-Statuses in LGE layers bellow, because too 
> often developers applied them with Upstream-Status into the component 
> source git repo where it doesn't belong and then it was already too 
> late to remove it there (while with Upstream-Status lost in 
> rebase/devtool there is still time to get warning from QA check and 
> once this check is enabled by default in all the builds it will 
> prevent people overlooking this by accident).
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108499):https://lists.openembedded.org/g/openembedded-devel/message/108499
> Mute This Topic:https://lists.openembedded.org/mt/104051095/3616765
> Group Owner:openembedded-devel+owner@lists.openembedded.org
> Unsubscribe:https://lists.openembedded.org/g/openembedded-devel/unsub  [randy.macleod@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj March 22, 2024, 2:20 a.m. UTC | #4
On Thu, Mar 21, 2024 at 5:55 PM Randy MacLeod via
lists.openembedded.org
<randy.macleod=windriver.com@lists.openembedded.org> wrote:
>
> Would the new license scheme described here:
>
> https://redis.com/blog/redis-adopts-dual-source-available-licensing/
>
> prevent us from accepting the 7.4 release? I suspect it should but I need more time to
> read the new terms.
>

Good point. I saw the announcement today as well. I think we need to
certainly change to
use new license, if we can distribute it or not, perhaps it needs some
closer look.

> ../Randy
>
>
> On 2024-01-30 1:23 p.m., Martin Jansa via lists.openembedded.org wrote:
>
> On Tue, Jan 30, 2024 at 6:28 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On 1/30/24 2:34 AM, Martin Jansa wrote:
>> > * accidentally dropped in:
>> >    https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
>> > ---
>> >   .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
>> >   1 file changed, 2 insertions(+)
>> >
>> > diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > index b562e2522c..48a8bb5b4b 100644
>> > --- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > +++ b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>> >   Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
>> >
>> >   ---
>> > +Upstream-Status: Pending
>>
>> I think it might be better to move it above the scissor to avoid getting
>> lost in next devtool based upgrade.
>
>
> As you wish, resent all 3 as v2 with it moved.
>
> FWIW: in https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc I've moved all Upstream-Statuses in LGE layers bellow, because too often developers applied them with Upstream-Status into the component source git repo where it doesn't belong and then it was already too late to remove it there (while with Upstream-Status lost in rebase/devtool there is still time to get warning from QA check and once this check is enabled by default in all the builds it will prevent people overlooking this by accident).
>
>
>
> --
> # Randy MacLeod
> # Wind River Linux
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#109507): https://lists.openembedded.org/g/openembedded-devel/message/109507
> Mute This Topic: https://lists.openembedded.org/mt/105077570/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Tim Orling March 22, 2024, 3:09 a.m. UTC | #5
On Thu, Mar 21, 2024 at 5:55 PM Randy MacLeod via lists.openembedded.org
<randy.macleod=windriver.com@lists.openembedded.org> wrote:

> Would the new license scheme described here:
>
> https://redis.com/blog/redis-adopts-dual-source-available-licensing/
>
> prevent us from accepting the 7.4 release? I suspect it should but I need
> more time to
> read the new terms.
>

Fedora has a rather long thread about this already:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/XVFFKU2NYB2Q3BQUYNANSDNE4VCJQ6KF/


>
> ../Randy
>
>
> On 2024-01-30 1:23 p.m., Martin Jansa via lists.openembedded.org wrote:
>
> On Tue, Jan 30, 2024 at 6:28 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>> On 1/30/24 2:34 AM, Martin Jansa wrote:
>> > * accidentally dropped in:
>> >
>> https://git.openembedded.org/meta-openembedded/commit/?id=e91fa668ed1dd4a3f6b06bcb099f70dbdd2a50b4
>> > ---
>> >   .../lua-update-Makefile-to-use-environment-build-setting.patch  | 2 ++
>> >   1 file changed, 2 insertions(+)
>> >
>> > diff --git
>> a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > index b562e2522c..48a8bb5b4b 100644
>> > ---
>> a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > +++
>> b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
>> > @@ -16,6 +16,8 @@ updated to work wtih 6.2.1
>> >   Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
>> >
>> >   ---
>> > +Upstream-Status: Pending
>>
>> I think it might be better to move it above the scissor to avoid getting
>> lost in next devtool based upgrade.
>>
>
> As you wish, resent all 3 as v2 with it moved.
>
> FWIW: in
> https://github.com/webosose/meta-webosose/commit/2c78e37ad9ceb9e236c03b44cca5b38e9d9eb2fc
> I've moved all Upstream-Statuses in LGE layers bellow, because too often
> developers applied them with Upstream-Status into the component source git
> repo where it doesn't belong and then it was already too late to remove it
> there (while with Upstream-Status lost in rebase/devtool there is still
> time to get warning from QA check and once this check is enabled by default
> in all the builds it will prevent people overlooking this by accident).
>
>
> --
> # Randy MacLeod
> # Wind River Linux
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#109507):
> https://lists.openembedded.org/g/openembedded-devel/message/109507
> Mute This Topic: https://lists.openembedded.org/mt/105077570/924729
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
index b562e2522c..48a8bb5b4b 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
@@ -16,6 +16,8 @@  updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 
 ---
+Upstream-Status: Pending
+
  deps/Makefile         |  1 -
  deps/lua/Makefile     |  1 -
  deps/lua/src/Makefile | 16 ++++++----------