meta-openembedded: fix trailing whitespace
cover meta-openembedded: fix trailing whitespace
Fix trailing whitespace warnings reported by bitbake during parsing in meta-oe and meta-multimedia layers.
Whitespace warning will introduce as part below
https://patchwork.yoctoproject.org/project/bitbake/patch/[email protected]/
Same inline change has been merged in oe-core as well
21 files fixed across 2 patches:
- meta-oe (20 files)
- meta-multimedia (1 file)
Jaipaul Cheernam (2):
meta-oe: fix trailing whitespace
meta-multimedia: fix trailing whitespace
meta-multimedia/conf/layer.conf | 2 +- meta-oe/recipes-bsp/ledmon/ledmon_1.1.0.bb | 2 +- meta-oe/recipes-connectivity/iwd/iwd_3.12.bb | 2 +- .../wvdial/wvstreams_4.6.1.bb | 2 +- .../flatbuffers/flatbuffers.bb | 2 +- .../nlohmann-fifo/nlohmann-fifo_git.bb | 2 +- meta-oe/recipes-extended/minio/src_uri.inc | 204 +++++++++--------- .../rsyslog/librelp_1.12.0.bb | 2 +- .../drm-framebuffer/drm-framebuffer_1.0.0.bb | 2 +- .../graphviz/graphviz_15.1.0.bb | 2 +- .../libforms/libforms_1.2.5pre1.bb | 2 +- meta-oe/recipes-support/fftw/fftw_3.3.11.bb | 2 +- meta-oe/recipes-support/lcov/lcov_2.5.bb | 2 +- .../recipes-support/libpcre/libpcre_8.45.bb | 2 +- .../libsimplelog/libsimplelog_1.1.0.bb | 4 +- .../libtinyxml2/libtinyxml2_11.0.0.bb | 4 +- .../openldap/openldap_2.6.13.bb | 2 +- .../recipes-support/pcp/pcp-native_6.3.8.bb | 6 +- meta-oe/recipes-support/pcp/pcp_6.3.8.bb | 4 +- meta-oe/recipes-support/pv/pv_1.11.0.bb | 2 +- .../xorg-xrdp/xorgxrdp_0.10.5.bb | 2 +- 21 files changed, 127 insertions(+), 127 deletions(-)
PATCH 1/2 meta-oe: fix trailing whitespace
Fix trailing whitespace in meta-oe recipe files to resolve bitbake parsing warnings.
--- meta-oe/recipes-bsp/ledmon/ledmon_1.1.0.bb | 2 +- meta-oe/recipes-connectivity/iwd/iwd_3.12.bb | 2 +- .../wvdial/wvstreams_4.6.1.bb | 2 +- .../flatbuffers/flatbuffers.bb | 2 +- .../nlohmann-fifo/nlohmann-fifo_git.bb | 2 +- meta-oe/recipes-extended/minio/src_uri.inc | 204 +++++++++--------- .../rsyslog/librelp_1.12.0.bb | 2 +- .../drm-framebuffer/drm-framebuffer_1.0.0.bb | 2 +- .../graphviz/graphviz_15.1.0.bb | 2 +- .../libforms/libforms_1.2.5pre1.bb | 2 +- meta-oe/recipes-support/fftw/fftw_3.3.11.bb | 2 +- meta-oe/recipes-support/lcov/lcov_2.5.bb | 2 +- .../recipes-support/libpcre/libpcre_8.45.bb | 2 +- .../libsimplelog/libsimplelog_1.1.0.bb | 4 +- .../libtinyxml2/libtinyxml2_11.0.0.bb | 4 +- .../openldap/openldap_2.6.13.bb | 2 +- .../recipes-support/pcp/pcp-native_6.3.8.bb | 6 +- meta-oe/recipes-support/pcp/pcp_6.3.8.bb | 4 +- meta-oe/recipes-support/pv/pv_1.11.0.bb | 2 +- .../xorg-xrdp/xorgxrdp_0.10.5.bb | 2 +- 20 files changed, 126 insertions(+), 126 deletions(-)
meta-oe/recipes-bsp/ledmon/ledmon_1.1.0.bb +1 -1
@@ -27,6 +27,6 @@ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-sy EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" -# The ledmon sources include headers in ${S}/config to build but not in CFLAGS. +# The ledmon sources include headers in ${S}/config to build but not in CFLAGS. # We need to add this include path in CFLAGS. CFLAGS += "-I${S}/config"
meta-oe/recipes-connectivity/iwd/iwd_3.12.bb +1 -1
@@ -7,7 +7,7 @@ DEPENDS = "dbus" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ - file://iwd \ + file://iwd \ " SRC_URI[sha256sum] = "d89a5e45c7180170e19be828f9e944a768c593758094fc57a358d0e7c4cb1a49"
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +1 -1
@@ -27,7 +27,7 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" -# The code.google.com/archive page is generated using Javascript from a JSON file and does not +# The code.google.com/archive page is generated using Javascript from a JSON file and does not # allow devtool to find the latest version UPSTREAM_VERSION_UNKNOWN = "1"
meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb +1 -1
@@ -15,7 +15,7 @@ RDEPENDS:${PN}-dev += "${PN}-compiler" EXTRA_OECMAKE += " \ - -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ " EXTRA_OECMAKE:append:class-target = " -DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/flatc"
meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb +1 -1
@@ -26,5 +26,5 @@ CXXFLAGS:append:toolchain-clang:runtime-llvm = " -DCATCH_CONFIG_CPP11_NO_SHUFFLE do_install() { install -d ${D}${includedir} - install -m 0644 ${S}/src/fifo_map.hpp ${D}${includedir} + install -m 0644 ${S}/src/fifo_map.hpp ${D}${includedir} }
meta-oe/recipes-extended/minio/src_uri.inc +102 -102
611 lines not on this page · raw message
meta-oe/recipes-extended/rsyslog/librelp_1.12.0.bb +1 -1
@@ -28,7 +28,7 @@ PACKAGECONFIG[tls] = "--enable-tls,--disable-tls,gnutls nettle" PACKAGECONFIG[tls-openssl] = "--enable-tls-openssl,--disable-tls-openssl,openssl" PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind," -# For ptests, copy source tests/*.sh scripts, Makefile and +# For ptests, copy source tests/*.sh scripts, Makefile and # executables and run them with make on target. TESTDIR = "tests" do_compile_ptest() {
meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_1.0.0.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/embear-engineering/drm-framebuffer;protocol=https;br SRCREV = "09df30960552f23d0fa7471be0caf7f095fcd522" -inherit cmake pkgconfig +inherit cmake pkgconfig DEPENDS = "libdrm"
meta-oe/recipes-graphics/graphviz/graphviz_15.1.0.bb +1 -1
@@ -44,7 +44,7 @@ EXTRA_OECONF:class-target = "\ --disable-sharp \ " EXTRA_OECONF:class-nativesdk = "\ - --with-expatincludedir=${STAGING_INCDIR} \ + --with-expatincludedir=${STAGING_INCDIR} \ --with-expatlibdir=${STAGING_LIBDIR} \ --without-included-ltdl \ --disable-java \
meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb +1 -1
@@ -23,7 +23,7 @@ S = "${UNPACKDIR}/xforms-${PV}" DEPENDS = "libxpm jpeg libx11 virtual/libgl" RDEPENDS:${PN} = "bash" -EXTRA_OECONF = "--with-extra-inc=${S}/lib" +EXTRA_OECONF = "--with-extra-inc=${S}/lib" do_compile:append() { sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps
meta-oe/recipes-support/fftw/fftw_3.3.11.bb +1 -1
@@ -43,7 +43,7 @@ do_configure() { cd ${B} # configure only oe_runconf --enable-long-double - mv ${B} ${WORKDIR}/build-fftwl + mv ${B} ${WORKDIR}/build-fftwl # configure fftwf rm -rf ${WORKDIR}/build-fftwf
meta-oe/recipes-support/lcov/lcov_2.5.bb +1 -1
@@ -37,7 +37,7 @@ RDEPENDS:${PN} += " \ perl-module-getopt-std \ perl-module-list-util \ perl-module-load \ - perl-module-metadata \ + perl-module-metadata \ perl-module-mro \ perl-module-overload \ perl-module-overload-numbers \
meta-oe/recipes-support/libpcre/libpcre_8.45.bb +1 -1
@@ -68,7 +68,7 @@ do_install_ptest() { # Skip the fr_FR locale test. If the locale fr_FR is found, it is tested. # If not found, the test is skipped. The test program assumes fr_FR is non-UTF-8 # locale so the test fails if fr_FR is UTF-8 locale. - sed -i -e 's:do3=yes:do3=no:g' ${D}${PTEST_PATH}/RunTest + sed -i -e 's:do3=yes:do3=no:g' ${D}${PTEST_PATH}/RunTest } RDEPENDS:${PN}-ptest += "make"
meta-oe/recipes-support/libsimplelog/libsimplelog_1.1.0.bb +2 -2
@@ -23,7 +23,7 @@ EXTRA_OECMAKE += "-DUNIX_LINUX=1 -D__LINUX__=1 -D_GNU_SOURCE=1" # You can use as below without any problem # EXTRA_OECMAKE += "-DUNIX_LINUX=1" -# Drop 0001-allow-build-with-cmake-4.patch as it is now integrated upstream. -# Please see branch "main", commit "4827c4325063266f6d2a7e133a9d3a9050ff6a3c" by +# Drop 0001-allow-build-with-cmake-4.patch as it is now integrated upstream. +# Please see branch "main", commit "4827c4325063266f6d2a7e133a9d3a9050ff6a3c" by # Author: Alper Ak <[email protected]>
meta-oe/recipes-support/libtinyxml2/libtinyxml2_11.0.0.bb +2 -2
@@ -14,8 +14,8 @@ inherit cmake ptest EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtinyxml2_BUILD_TESTING=ON', '', d)}" PACKAGECONFIG ?= "shared-libs" -PACKAGECONFIG[shared-libs] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF" - +PACKAGECONFIG[shared-libs] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF" + CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" do_install_ptest() {
meta-oe/recipes-support/openldap/openldap_2.6.13.bb +1 -1
@@ -65,7 +65,7 @@ EXTRA_OECONF += "--enable-crypt" # Backends="asyncmeta dnssrv ldap mdb meta null passwd perl relay sock sql wt" # # Note that multiple backends can be built. The ldbm backend requires a -# build-time choice of database API. To use the gdbm (or other) API the +# build-time choice of database API. To use the gdbm (or other) API the # Berkely database module must be removed from the build. md = "${libexecdir}/openldap" #
meta-oe/recipes-support/pcp/pcp-native_6.3.8.bb +3 -3
@@ -1,6 +1,6 @@ require pcp.inc -inherit python3native native -#autotools-brokensep +inherit python3native native +#autotools-brokensep DEPENDS = "python3-native python3-setuptools-native flex-native bison-native readline-native ncurses-native" export PCP_DIR = "${D}"
@@ -13,7 +13,7 @@ do_configure:prepend() { export SED=${HOSTTOOLS_DIR}/sed export AR=${HOSTTOOLS_DIR}/ar # export PYTHON=python3 - + rm -rf ${S}/include/pcp/configsz.h rm -rf ${S}/include/pcp/platformsz.h
meta-oe/recipes-support/pcp/pcp_6.3.8.bb +2 -2
@@ -80,7 +80,7 @@ do_compile:prepend() { } do_compile() { - oe_runmake default_pcp + oe_runmake default_pcp } do_install () {
@@ -115,7 +115,7 @@ PACKAGES =+ " ${PN}-export-zabbix-agent ${PN}-testsuite \ FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ " FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ -" +" FILES:libpcp-gui2-dev = " \ ${libdir}/libpcp_gui.so \ ${libdir}/libpcp_gui.a \
meta-oe/recipes-support/pv/pv_1.11.0.bb +1 -1
@@ -58,7 +58,7 @@ do_install_ptest() { rm -f ${testsdir}/Memory* # test requires at least 3GB free on /tmp rm -f ${testsdir}/Integrity_-_Large_file_support.test - # fails due to our prompt: + # fails due to our prompt: rm -f ${testsdir}/Terminal_-_Detect_width.test # # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.5.bb +1 -1
@@ -3,7 +3,7 @@ SUMMARY = "Xorg drivers for xrdp." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=a2523660329fdca3d954c0a87390e007" -inherit autotools pkgconfig +inherit autotools pkgconfig DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native"
PATCH 2/2 meta-multimedia: fix trailing whitespace
In reply to Jaipaul CheernamFix trailing whitespace in meta-multimedia layer.conf to resolve bitbake parsing warnings.
--- meta-multimedia/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/conf/layer.conf +1 -1
@@ -5,7 +5,7 @@ # Therefore if you want a given layer to be considered high priority # for the .inc and .conf etc. then consider it adding at the beginning # of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve -# the recipe contention so the order of directories in BBFILES does +# the recipe contention so the order of directories in BBFILES does # not matter. # We have a conf and classes directory, append to BBPATH