Skip to contentSkip to conversation

glibc: fix append in DEPENDS

PATCH In review Konrad Weihmann 3 participants 7 messages Oct 4, 2021 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 2/3 glibc: fix append in DEPENDS

fix the append with a leading blank, otherwise this messes up DEPENDS when globally inherited classes add dependecies of their own

---
 meta/recipes-core/glib-2.0/glib.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib.inc +1 -1
index a34776b083..3436645f15 100644
@@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
 
 inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages
 
-DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
+DEPENDS:append:class-target = " ${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
Signature · 1 line
2.25.1
#2 lore raw
Quoted 26 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Konrad Weihmann
Sent: den 4 oktober 2021 15:29
To: [email protected]
Cc: Konrad Weihmann <[email protected]>
Subject: [OE-core] [PATCH 2/3] glibc: fix append in DEPENDS

fix the append with a leading blank, otherwise this messes up DEPENDS when globally inherited classes add dependecies of their own

---
 meta/recipes-core/glib-2.0/glib.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib- renamed from meta/recipes-core/glib-2.0/glib.inc +0 -0

2.0/glib.inc
index a34776b083..3436645f15 100644

meta/recipes-core/glib-2.0/glib.inc +0 -0
@@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
 
 inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-

even bash-completion gio-module-cache manpages

meta/recipes-core/glib-2.0/glib.inc LEAD_SONAME = "libglib-2.0.*" · line 33

Quoted 2 lines
meta/recipes-core/glib-2.0/glib.inc +1 -1
-DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
+DEPENDS:append:class-target = " ${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"

This change is not needed as there already is a space inside the if statement (in ' gtk-doc').

Quoted 5 lines

GTKDOC_MESON_OPTION = "gtk_doc"

--
2.25.1

//Peter

#3 lore raw
Quoted 23 lines · Peter Kjellerstedt
Quoted 23 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Konrad Weihmann
Sent: den 4 oktober 2021 15:29
To: [email protected]
Cc: Konrad Weihmann <[email protected]>
Subject: [OE-core] [PATCH 2/3] glibc: fix append in DEPENDS

fix the append with a leading blank, otherwise this messes up DEPENDS when globally inherited classes add dependecies of their own

---
  meta/recipes-core/glib-2.0/glib.inc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib- renamed from meta/recipes-core/glib-2.0/glib.inc +0 -0

2.0/glib.inc
index a34776b083..3436645f15 100644

meta/recipes-core/glib-2.0/glib.inc +0 -0
@@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
 
Quoted 8 lines

meta/recipes-core/glib-2.0/glib.inc LEAD_SONAME = "libglib-2.0.*" · line 33

Quoted 5 lines
meta/recipes-core/glib-2.0/glib.inc +0 -0
  inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-

even bash-completion gio-module-cache manpages

meta/recipes-core/glib-2.0/glib.inc +1 -1
-DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
+DEPENDS:append:class-target = " ${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"

This change is not needed as there already is a space inside the if statement (in ' gtk-doc').

Still this is very prone to errors, so I personally rather have a space too much than to few (esp. as the else clause doesn't add a space).

IHMO it should be for readability purpose rather " ${@'gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" than like it is now - but that's just cosmetics and I'm sure one could discuss about that a lot

Quoted 9 lines
Quoted 6 lines

GTKDOC_MESON_OPTION = "gtk_doc"

--
2.25.1

//Peter

#4 lore raw
Quoted 1 line

Still this is very prone to errors, so I personally rather have a

space too much than to few (esp. as the else clause doesn't add a space).

The missing space in else clause is often intentional in cases like this, so that the append has no impact on value when not enabled
with GTKDOC_ENABLED. Why should it add useless space when not enabled? Just for the possibility of someone adding something to else clause without leading space there?

Quoted 67 lines · Konrad Weihmann
Quoted 11 lines · Peter Kjellerstedt
Quoted 11 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Konrad Weihmann
Sent: den 4 oktober 2021 15:29
To: [email protected]
Cc: Konrad Weihmann <[email protected]>
Subject: [OE-core] [PATCH 2/3] glibc: fix append in DEPENDS

fix the append with a leading blank, otherwise this messes up DEPENDS when globally inherited classes add dependecies of their own

Quoted 6 lines

Review

Quoted 6 lines
---
  meta/recipes-core/glib-2.0/glib.inc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta/recipes-core/glib-

Quoted 7 lines

meta/recipes-core/glib-2.0/glib.inc LEAD_SONAME = "libglib-2.0.*" · line 31

Quoted 7 lines

2.0/glib.inc
index a34776b083..3436645f15 100644

meta/recipes-core/glib-2.0/glib.inc +0 -0
@@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
 
  inherit meson gettext gtk-doc pkgconfig ptest-gnome

upstream-version-is-

Quoted 3 lines
Quoted 3 lines

even bash-completion gio-module-cache manpages

-DEPENDS:append:class-target = "${@' gtk-doc' if

d.getVar('GTKDOC_ENABLED') == 'True' else ''}"

Quoted 1 line
Quoted 1 line

+DEPENDS:append:class-target = " ${@' gtk-doc' if

d.getVar('GTKDOC_ENABLED') == 'True' else ''}"

Quoted 3 lines

This change is not needed as there already is a space inside the if statement (in ' gtk-doc').

Still this is very prone to errors, so I personally rather have a space too much than to few (esp. as the else clause doesn't add a space).

IHMO it should be for readability purpose rather " ${@'gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" than like it is now - but that's just cosmetics and I'm sure one could discuss about that a lot

Quoted 9 lines
Quoted 6 lines

GTKDOC_MESON_OPTION = "gtk_doc"

--
2.25.1

//Peter

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#156611):
https://lists.openembedded.org/g/openembedded-core/message/156611
Mute This Topic: https://lists.openembedded.org/mt/86066304/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw
Quoted 4 lines · Martin Jansa
Quoted 1 line

Still this is very prone to errors, so I personally rather have a

space too much than to few (esp. as the else clause doesn't add a space).

The missing space in else clause is often intentional in cases like this, so that the append has no impact on value when not enabled with GTKDOC_ENABLED. Why should it add useless space when not enabled? Just for the possibility of someone adding something to else clause without leading space there?

Partly yes, I found those conditionals rather hard to review, esp. for more complex scenarios, so I kind of would suggest to add the mandatory space for the append operation all the time and add no additional space in the stuff that is popping out of the conditional computation.

But I'm also fine with dropping the last 2 patches of the series.
Only the first patch solves a real world issue... the remaining two were just a result of a linter scan

Quoted 80 lines · On Mon, Oct 4, 2021 at 5:14 PM Konrad Weihmann <[email protected]…


    On 04.10.21 17:08, Peter Kjellerstedt wrote:
     >> -----Original Message-----
     >> From: [email protected]
    <mailto:[email protected]> <openembedded-
     >> [email protected]
    <mailto:[email protected]>> On Behalf Of Konrad Weihmann
     >> Sent: den 4 oktober 2021 15:29
     >> To: [email protected]
    <mailto:[email protected]>
     >> Cc: Konrad Weihmann <[email protected]
    <mailto:[email protected]>>
     >> Subject: [OE-core] [PATCH 2/3] glibc: fix append in DEPENDS
     >>
     >> fix the append with a leading blank, otherwise this messes up
     >> DEPENDS when globally inherited classes add dependecies of their own
     >>
     >> Signed-off-by: Konrad Weihmann <[email protected]
    <mailto:[email protected]>>
     >> ---
     >>   meta/recipes-core/glib-2.0/glib.inc | 2 +-
     >>   1 file changed, 1 insertion(+), 1 deletion(-)
     >>
     >> diff --git a/meta/recipes-core/glib-2.0/glib.inc
    b/meta/recipes-core/glib-
     >> 2.0/glib.inc
     >> index a34776b083..3436645f15 100644
     >> --- a/meta/recipes-core/glib-2.0/glib.inc
     >> +++ b/meta/recipes-core/glib-2.0/glib.inc
     >> @@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
     >>
     >>   inherit meson gettext gtk-doc pkgconfig ptest-gnome
    upstream-version-is-
     >> even bash-completion gio-module-cache manpages
     >>
     >> -DEPENDS:append:class-target = "${@' gtk-doc' if
    d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
     >> +DEPENDS:append:class-target = " ${@' gtk-doc' if
    d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
     >
     > This change is not needed as there already is a space inside
     > the if statement (in ' gtk-doc').

    Still this is very prone to errors, so I personally rather have a space
    too much than to few (esp. as the else clause doesn't add a space).

    IHMO it should be for readability purpose rather " ${@'gtk-doc' if
    d.getVar('GTKDOC_ENABLED') == 'True' else ''}" than like it is now -
    but
    that's just cosmetics and I'm sure one could discuss about that a lot

     >
     >>
     >>   GTKDOC_MESON_OPTION = "gtk_doc"
     >>
     >> --
     >> 2.25.1
     >
     > //Peter
     >

    -=-=-=-=-=-=-=-=-=-=-=-
    Links: You receive all messages sent to this group.
    View/Reply Online (#156611):
    https://lists.openembedded.org/g/openembedded-core/message/156611
    <https://lists.openembedded.org/g/openembedded-core/message/156611>
    Mute This Topic: https://lists.openembedded.org/mt/86066304/3617156
    <https://lists.openembedded.org/mt/86066304/3617156>
    Group Owner: [email protected]
    <mailto:openembedded-core%[email protected]>
    Unsubscribe:
    https://lists.openembedded.org/g/openembedded-core/unsub
    <https://lists.openembedded.org/g/openembedded-core/unsub>
    [[email protected] <mailto:[email protected]>]
    -=-=-=-=-=-=-=-=-=-=-=-
#6 lore raw

PATCH 3/3 update-rc.d: fix append in DEPENDS

In reply to a message not in the archive

fix the append with a leading blank, otherwise this messes up DEPENDS when globally inherited classes add dependecies of their own

---
 meta/classes/update-rc.d.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/update-rc.d.bbclass +1 -1
index 0a3a608662..921df98584 100644
@@ -1,6 +1,6 @@
 UPDATERCPN ?= "${PN}"
 
-DEPENDS:append:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}"
+DEPENDS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}"
 
 UPDATERCD = "update-rc.d"
 UPDATERCD:class-cross = ""
Signature · 1 line
2.25.1
#7 lore raw

RE: [OE-core] [PATCH 3/3] update-rc.d: fix append in DEPENDS

Quoted 22 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Konrad Weihmann
Sent: den 4 oktober 2021 15:29
To: [email protected]
Cc: Konrad Weihmann <[email protected]>
Subject: [OE-core] [PATCH 3/3] update-rc.d: fix append in DEPENDS

fix the append with a leading blank, otherwise this messes up DEPENDS when globally inherited classes add dependecies of their own

---
 meta/classes/update-rc.d.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/update- renamed from meta/classes/update-rc.d.bbclass +0 -0

rc.d.bbclass
index 0a3a608662..921df98584 100644

meta/classes/update-rc.d.bbclass line 3

Quoted 4 lines
meta/classes/update-rc.d.bbclass +1 -1
@@ -1,6 +1,6 @@
 UPDATERCPN ?= "${PN}"
 
-DEPENDS:append:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}"
+DEPENDS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}"

This change is not needed as there already is a space inside the if statement (in ' update-rc.d initscripts').

Quoted 5 lines
meta/classes/update-rc.d.bbclass +0 -1
 UPDATERCD = "update-rc.d"
 UPDATERCD:class-cross = ""
--

2.25.1

//Peter