[PATCH] debianutils: whitespace fixes

[PATCH] debianutils: whitespace fixes

[Konrad Weihmann]

Added whitespaces around equation-signs

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 .../debianutils/debianutils_4.9.1.bb             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-support/debianutils/debianutils_4.9.1.bb b/meta/recipes-support/debianutils/debianutils_4.9.1.bb
index 904c52780f..768f28906f 100644
--- a/meta/recipes-support/debianutils/debianutils_4.9.1.bb
+++ b/meta/recipes-support/debianutils/debianutils_4.9.1.bb
@@ -35,7 +35,7 @@ FILES_${PN}-run-parts = "${base_bindir}/run-parts.debianutils"
 RDEPENDS_${PN} += "${PN}-run-parts"
 RDEPENDS_${PN}_class-native = ""
 
-ALTERNATIVE_PRIORITY="30"
+ALTERNATIVE_PRIORITY = "30"
 ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which"
 
 ALTERNATIVE_PRIORITY_${PN}-run-parts = "60"
@@ -44,12 +44,12 @@ ALTERNATIVE_${PN}-run-parts = "run-parts"
 ALTERNATIVE_${PN}-doc = "which.1"
 ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1"
 
-ALTERNATIVE_LINK_NAME[add-shell]="${sbindir}/add-shell"
-ALTERNATIVE_LINK_NAME[installkernel]="${sbindir}/installkernel"
-ALTERNATIVE_LINK_NAME[remove-shell]="${sbindir}/remove-shell"
-ALTERNATIVE_LINK_NAME[run-parts]="${base_bindir}/run-parts"
-ALTERNATIVE_LINK_NAME[savelog]="${bindir}/savelog"
-ALTERNATIVE_LINK_NAME[tempfile]="${base_bindir}/tempfile"
-ALTERNATIVE_LINK_NAME[which]="${bindir}/which"
+ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell"
+ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel"
+ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell"
+ALTERNATIVE_LINK_NAME[run-parts] = "${base_bindir}/run-parts"
+ALTERNATIVE_LINK_NAME[savelog] = "${bindir}/savelog"
+ALTERNATIVE_LINK_NAME[tempfile] = "${base_bindir}/tempfile"
+ALTERNATIVE_LINK_NAME[which] = "${bindir}/which"
 
 BBCLASSEXTEND = "native"
-- 
2.20.1

[PATCH] libjpeg-turbo: whitespace fixes

[Konrad Weihmann]

Added the proper amount of blanks around equation-signs

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb
index 1f49fd3d3b..62ad504270 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231
                     file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \
 "
 DEPENDS_append_x86-64_class-target = " nasm-native"
-DEPENDS_append_x86_class-target    = " nasm-native"
+DEPENDS_append_x86_class-target = " nasm-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://0001-libjpeg-turbo-fix-package_qa-error.patch \
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
 UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
 
-PE= "1"
+PE = "1"
 
 # Drop-in replacement for jpeg
 PROVIDES = "jpeg"
-- 
2.20.1

[PATCH] cairo: remove trailing whitespace

[Konrad Weihmann]

Remove trailing whitespaces after line continuation

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index 092c77b826..71d1cb4ac6 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
-           file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ 
+           file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
            file://CVE-2018-19876.patch \
            file://CVE-2019-6461.patch \
            file://CVE-2019-6462.patch \
-- 
2.20.1

[PATCH] gtk-doc: remove trailing whitespace

[Konrad Weihmann]

remove unnecessary trailing whitespace

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index b508e62741..1eaf370ab0 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
@@ -40,7 +40,7 @@ do_install_append () {
     # configure values for python3 and pkg-config encoded in scripts
     for fn in ${bindir}/gtkdoc-depscan \
         ${bindir}/gtkdoc-mkhtml2 \
-        ${datadir}/gtk-doc/python/gtkdoc/config.py; do 
+        ${datadir}/gtk-doc/python/gtkdoc/config.py; do
         sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \
             -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
             -i ${D}$fn
-- 
2.20.1

[PATCH] libxt: fix whitespaces

[Konrad Weihmann]

remove unnecessary whitespace and line breaks

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb
index 42df435052..54384521c8 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb
@@ -22,8 +22,8 @@ PE = "1"
 
 XORG_PN = "libXt"
 
-SRC_URI +=  "file://libxt_fix_for_x32.patch \
-            "
+SRC_URI += "file://libxt_fix_for_x32.patch"
+
 SRC_URI[md5sum] = "a9019421d3ee8b4937b6afd9025f018a"
 SRC_URI[sha256sum] = "b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831"
 
-- 
2.20.1

[PATCH] cogl: point to correct HOMEPAGE

[Konrad Weihmann]

As the previousy set wasn't reachable anymore

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index d8d06651da..1c5d0b79cb 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Cogl is a small open source library for using 3D graphics \
 hardware for rendering. The API departs from the flat state machine style of \
 OpenGL and is designed to make it easy to write orthogonal components that \
 can render without stepping on each others toes."
-HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+HOMEPAGE = "https://gitlab.gnome.org/GNOME/cogl"
 LICENSE = "MIT"
 
 inherit clutter features_check upstream-version-is-even gobject-introspection
-- 
2.20.1

[PATCH] ruby: properly append PACKAGECONFIG

[Konrad Weihmann]

As ??= assignment will be overwritten by += in any case,
one can't define a default of PACKAGECONFIG in this recipe.
Using _append instead mitigates chances of accidental overwriting
the default

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/ruby/ruby_2.7.1.bb b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
index 3dd9fb0a62..3d7d095fbf 100644
--- a/meta/recipes-devtools/ruby/ruby_2.7.1.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
@@ -12,7 +12,7 @@ SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909"
 SRC_URI[sha256sum] = "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 
 PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
 PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp"
-- 
2.20.1

[PATCH] vim-tiny: properly append PACKAGECONFIG

[Konrad Weihmann]

As ??= assignment will be overwritten by += in any case,
one can't define a default of PACKAGECONFIG in this recipe.
Using _append instead mitigates chances of accidental overwriting
the default

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-support/vim/vim-tiny_8.2.bb | 2 +-
 meta/recipes-support/vim/vim.inc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/vim/vim-tiny_8.2.bb b/meta/recipes-support/vim/vim-tiny_8.2.bb
index e4c26d23f6..ed5631af91 100644
--- a/meta/recipes-support/vim/vim-tiny_8.2.bb
+++ b/meta/recipes-support/vim/vim-tiny_8.2.bb
@@ -2,7 +2,7 @@ require vim.inc
 
 SUMMARY += " (with tiny features)"
 
-PACKAGECONFIG += "tiny"
+PACKAGECONFIG_append = " tiny"
 
 do_install() {
     install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 9f3dc08027..6f64104ded 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -51,7 +51,7 @@ do_compile() {
 
 #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
 PACKAGECONFIG ??= ""
-PACKAGECONFIG += " \
+PACKAGECONFIG_append = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
 "
-- 
2.20.1

Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

[Richard Purdie]

On Tue, 2020-06-02 at 22:44 +0200, Konrad Weihmann wrote:
> As ??= assignment will be overwritten by += in any case,
> one can't define a default of PACKAGECONFIG in this recipe.
> Using _append instead mitigates chances of accidental overwriting
> the default
> 
> Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
> ---
>  meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/ruby/ruby_2.7.1.bb b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
> index 3dd9fb0a62..3d7d095fbf 100644
> --- a/meta/recipes-devtools/ruby/ruby_2.7.1.bb
> +++ b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
> @@ -12,7 +12,7 @@ SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909"
>  SRC_URI[sha256sum] = "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
>  
>  PACKAGECONFIG ??= ""
> -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
> +PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"

Shouldn't this just be:

PACKAGECONFIG_append ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6',
d)}"

?

Cheers,

Richard

Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

[Richard Purdie]

On Tue, 2020-06-02 at 22:44 +0200, Konrad Weihmann wrote:
> As ??= assignment will be overwritten by += in any case,
> one can't define a default of PACKAGECONFIG in this recipe.
> Using _append instead mitigates chances of accidental overwriting
> the default
> 
> Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
> ---
>  meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/ruby/ruby_2.7.1.bb b/meta/recipes-
> devtools/ruby/ruby_2.7.1.bb
> index 3dd9fb0a62..3d7d095fbf 100644
> --- a/meta/recipes-devtools/ruby/ruby_2.7.1.bb
> +++ b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
> @@ -12,7 +12,7 @@ SRC_URI[md5sum] =
> "debb9c325bf65021214451660f46e909"
>  SRC_URI[sha256sum] =
> "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
>  
>  PACKAGECONFIG ??= ""
> -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
> +PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES',
> 'ipv6', d)}"

Shouldn't this just be:

PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"

?

Cheers,

Richard

Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

[Konrad Weihmann]

Well I see a valid point in keeping them separated.
PACKAGECONFIG is just a static list of things, while the other setting 
is based on DISTRO_FEATURES. If we merge them, we kind force any 
override from local or distro.conf to copy the DISTRO_FEATURES block 
into their code or remove the DISTRO_FEATURES check - none of the 
options is a good one IMHO.
With that in mind I personally would like to keep them separate and just 
fix the append.

Regards
Konrad

On 03.06.20 10:44, Richard Purdie wrote:
> On Tue, 2020-06-02 at 22:44 +0200, Konrad Weihmann wrote:
>> As ??= assignment will be overwritten by += in any case,
>> one can't define a default of PACKAGECONFIG in this recipe.
>> Using _append instead mitigates chances of accidental overwriting
>> the default
>>
>> Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
>> ---
>>   meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/ruby/ruby_2.7.1.bb b/meta/recipes-
>> devtools/ruby/ruby_2.7.1.bb
>> index 3dd9fb0a62..3d7d095fbf 100644
>> --- a/meta/recipes-devtools/ruby/ruby_2.7.1.bb
>> +++ b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
>> @@ -12,7 +12,7 @@ SRC_URI[md5sum] =
>> "debb9c325bf65021214451660f46e909"
>>   SRC_URI[sha256sum] =
>> "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
>>   
>>   PACKAGECONFIG ??= ""
>> -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
>> +PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES',
>> 'ipv6', d)}"
> 
> Shouldn't this just be:
> 
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
> 
> ?
> 
> Cheers,
> 
> Richard
> 
> 

Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

[Richard Purdie]

On Wed, 2020-06-03 at 13:03 +0200, Konrad Weihmann wrote:
> Well I see a valid point in keeping them separated.
> PACKAGECONFIG is just a static list of things, while the other
> setting 
> is based on DISTRO_FEATURES. If we merge them, we kind force any 
> override from local or distro.conf to copy the DISTRO_FEATURES block 
> into their code or remove the DISTRO_FEATURES check - none of the 
> options is a good one IMHO.
> With that in mind I personally would like to keep them separate and
> just 
> fix the append.

There are two sides to that, its also near impossible for the user to
configure this option other than changing DISTRO_FEATURES if we use
append, we can't win.

Cheers,

Richard

Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

[Konrad Weihmann]

[-- Attachment #1: Type: text/plain, Size: 1187 bytes --]

Agree. But I think that's the nature of DISTRO_FEATURES to be all or nothing. Also there's the infamous _remove that can be used to get rid of DISTRO_FEATURES based flags.

So what do you suggest to do here? Merge them or keep them separately?

------ Original message------
From: Richard Purdie
Date: Wed, Jun 3, 2020 13:19
To: Konrad Weihmann;openembedded-core@lists.openembedded.org;
Cc:
Subject:Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

On Wed, 2020-06-03 at 13:03 +0200, Konrad Weihmann wrote:
> Well I see a valid point in keeping them separated.
> PACKAGECONFIG is just a static list of things, while the other
> setting
> is based on DISTRO_FEATURES. If we merge them, we kind force any
> override from local or distro.conf to copy the DISTRO_FEATURES block
> into their code or remove the DISTRO_FEATURES check - none of the
> options is a good one IMHO.
> With that in mind I personally would like to keep them separate and
> just
> fix the append.

There are two sides to that, its also near impossible for the user to
configure this option other than changing DISTRO_FEATURES if we use
append, we can't win.

Cheers,

Richard


[-- Attachment #2: Type: text/html, Size: 2136 bytes --]