Skip to contentSkip to conversation

debianutils: whitespace fixes

PATCH New Konrad Weihmann 2 participants 13 messages Jun 2, 2020 – Jun 3, 2020 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 1/1 debianutils: whitespace fixes

Added whitespaces around equation-signs

---
 .../debianutils/debianutils_4.9.1.bb             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
meta/recipes-support/debianutils/debianutils_4.9.1.bb +8 -8
index 904c52780f..768f28906f 100644
@@ -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"
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/1 libjpeg-turbo: whitespace fixes

In reply to a message not in the archive

Added the proper amount of blanks around equation-signs

---
 meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb +2 -2
index 1f49fd3d3b..62ad504270 100644
@@ -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"
Signature · 1 line
2.20.1
#3 lore raw

PATCH 1/1 cairo: remove trailing whitespace

In reply to a message not in the archive

Remove trailing whitespaces after line continuation

---
 meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +1 -1
index 092c77b826..71d1cb4ac6 100644
@@ -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 \
Signature · 1 line
2.20.1
#4 lore raw

PATCH 1/1 gtk-doc: remove trailing whitespace

In reply to a message not in the archive

remove unnecessary trailing whitespace

---
 meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +1 -1
index b508e62741..1eaf370ab0 100644
@@ -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
Signature · 1 line
2.20.1
#5 lore raw

PATCH 1/1 libxt: fix whitespaces

In reply to a message not in the archive

remove unnecessary whitespace and line breaks

---
 meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb +2 -2
index 42df435052..54384521c8 100644
@@ -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"
 
Signature · 1 line
2.20.1
#6 lore raw

PATCH 1/1 cogl: point to correct HOMEPAGE

In reply to a message not in the archive

As the previousy set wasn't reachable anymore

---
 meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/cogl/cogl-1.0.inc +1 -1
index d8d06651da..1c5d0b79cb 100644
@@ -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
Signature · 1 line
2.20.1
#7 lore raw

PATCH 1/1 ruby: properly append PACKAGECONFIG

In reply to a message not in the archive

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

---
 meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/ruby/ruby_2.7.1.bb +1 -1
index 3dd9fb0a62..3d7d095fbf 100644
@@ -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"
Signature · 1 line
2.20.1
#8 lore raw

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

Quoted 15 lines · 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

---
 meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/ruby/ruby_2.7.1.bb +0 -0
index 3dd9fb0a62..3d7d095fbf 100644

meta/recipes-devtools/ruby/ruby_2.7.1.bb SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909" · line 15

Quoted 5 lines
meta/recipes-devtools/ruby/ruby_2.7.1.bb +1 -1
@@ -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

#9 lore raw

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

In reply to Konrad Weihmann
Quoted 23 lines · 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

---
 meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-devtools/ruby/ruby_2.7.1.bb +0 -0

devtools/ruby/ruby_2.7.1.bb
index 3dd9fb0a62..3d7d095fbf 100644

meta/recipes-devtools/ruby/ruby_2.7.1.bb +0 -0
@@ -12,7 +12,7 @@ SRC_URI[md5sum] =

"debb9c325bf65021214451660f46e909"
SRC_URI[sha256sum] =
"d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"

PACKAGECONFIG ??= ""

meta/recipes-devtools/ruby/ruby_2.7.1.bb +1 -1
-PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES',
Quoted 1 line

'ipv6', d)}"

Shouldn't this just be:

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

?

Cheers,

Richard

#10 lore raw

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

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

Quoted 37 lines · Richard Purdie
Quoted 23 lines · 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

---
  meta/recipes-devtools/ruby/ruby_2.7.1.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-devtools/ruby/ruby_2.7.1.bb +0 -0

devtools/ruby/ruby_2.7.1.bb
index 3dd9fb0a62..3d7d095fbf 100644

meta/recipes-devtools/ruby/ruby_2.7.1.bb +0 -0
@@ -12,7 +12,7 @@ SRC_URI[md5sum] =

"debb9c325bf65021214451660f46e909"
SRC_URI[sha256sum] =
"d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"

PACKAGECONFIG ??= ""

meta/recipes-devtools/ruby/ruby_2.7.1.bb +1 -1
-PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES',
Quoted 1 line

'ipv6', d)}"

Shouldn't this just be:

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

?

Cheers,

Richard

#11 lore raw

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

Quoted 10 lines · 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.

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

#12 lore raw

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

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;[email protected]; Cc:
Subject:Re: [OE-core] [PATCH] ruby: properly append PACKAGECONFIG

Quoted 10 lines · 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.

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

#13 lore raw

PATCH 1/1 vim-tiny: properly append PACKAGECONFIG

In reply to a message not in the archive

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

---
 meta/recipes-support/vim/vim-tiny_8.2.bb | 2 +-
 meta/recipes-support/vim/vim.inc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/vim/vim-tiny_8.2.bb +1 -1
index e4c26d23f6..ed5631af91 100644
@@ -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
meta/recipes-support/vim/vim.inc +1 -1
index 9f3dc08027..6f64104ded 100644
@@ -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)} \
 "
Signature · 1 line
2.20.1