Skip to contentSkip to conversation

reorder variable

PATCH In review Trevor Woerner 2 participants 13 messages May 24, 2018 – May 31, 2018

lore
Share & tools
lore
#0 lore raw

cover reorder variable

When Andre McCurdy originally submitted the "rely on cmake.bbclass..." patches, he intermixed some formatting changes as well. A clean version of the "rely on cmake.bbclass..." patches have already been sent, this patchset adds in the formatting changes as well.

NOTE: there are slightly more formatting changes in this patchset than in Andre's original. These formatting changes are restricted to variable ordering as per: https://www.openembedded.org/wiki/Styleguide

Trevor Woerner (11):
poco: variable cleanup
libssh: variable cleanup
libftdi: variable cleanup
gflags: variable cleanup
ceres-solver: variable cleanup
openjpeg: variable cleanup
glm: variable cleanup
msgpack-c: variable cleanup
json-spirit: variable cleanup
capnproto: variable cleanup
openobex: variable cleanup

 .../obex/openobex_1.7.2.bb                    | 13 +++---
 .../capnproto/capnproto_0.6.1.bb              | 13 +++---
 .../json-spirit/json-spirit_4.08.bb           |  4 +-
 .../msgpack/msgpack-c_2.1.5.bb                |  7 ++-
 meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb  |  3 +-
 .../openjpeg/openjpeg_2.2.0.bb                |  5 +--
 .../ceres-solver/ceres-solver_1.14.bb         |  5 +--
 .../recipes-support/gflags/gflags_2.2.0.bb    |  3 +-
 .../recipes-support/libftdi/libftdi_1.4.bb    |  6 +--
 .../recipes-support/libssh/libssh_0.7.3.bb    | 16 +++----
 meta-oe/recipes-support/poco/poco_1.9.0.bb    | 44 +++++++++----------
 11 files changed, 54 insertions(+), 65 deletions(-)
Signature · 1 line
2.17.0.582.gccdcbd54c
#1 lore raw

PATCH 1/11 poco: variable cleanup

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-support/poco/poco_1.9.0.bb | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)
meta-oe/recipes-support/poco/poco_1.9.0.bb +22 -22
index 1016caef7c..a4f8a05188 100644
@@ -1,34 +1,22 @@
 SUMMARY = "Modern, powerful open source cross-platform C++ class libraries"
 DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems."
-SECTION = "libs"
 HOMEPAGE = "http://pocoproject.org/"
+SECTION = "libs"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
 
 # These dependencies are required by Foundation
 DEPENDS = "libpcre zlib"
 
-inherit cmake ptest
-
-BBCLASSEXTEND = "native"
-
-SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d"
 SRC_URI = " \
     git://github.com/pocoproject/poco.git \
     file://run-ptest \
    "
+SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
-                  -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \
-                 ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}"
-
-# For the native build we want to use the bundled version
-EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF"
-
-# do not use rpath
-EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON"
+inherit cmake ptest
 
 # By default the most commonly used poco components are built
 # Foundation is built anyway and doesn't need to be listed explicitly
@@ -60,6 +48,16 @@ PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OF
 PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF"
 PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF"
 
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
+                  -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \
+                 ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}"
+
+# For the native build we want to use the bundled version
+EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF"
+
+# do not use rpath
+EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON"
+
 python populate_packages_prepend () {
     poco_libdir = d.expand('${libdir}')
     pn = d.getVar("PN")
@@ -77,6 +75,14 @@ python populate_packages_prepend () {
     d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners))
 }
 
+do_install_ptest () {
+       cp -rf ${B}/bin/ ${D}${PTEST_PATH}
+       cp -f ${B}/lib/libCppUnit.so* ${D}${libdir}
+       cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/
+       find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \;
+       echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners"
+}
+
 PACKAGES_DYNAMIC = "poco-.*"
 
 # "poco" is a metapackage which pulls in all Poco components
@@ -89,10 +95,4 @@ ALLOW_EMPTY_${PN}-cppunit = "1"
 
 RDEPENDS_${PN}-ptest += "${PN}-cppunit"
 
-do_install_ptest () {
-       cp -rf ${B}/bin/ ${D}${PTEST_PATH}
-       cp -f ${B}/lib/libCppUnit.so* ${D}${libdir}
-       cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/
-       find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \;
-       echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners"
-}
+BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0.582.gccdcbd54c
#2 lore raw

PATCH 2/11 libssh: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
meta-oe/recipes-support/libssh/libssh_0.7.3.bb +8 -8
index e5ea2b8bfa..6064969ae0 100644
@@ -1,16 +1,21 @@
 SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol"
 HOMEPAGE = "http://www.libssh.org"
 SECTION = "libs"
-
-DEPENDS = "zlib openssl libgcrypt"
-
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
 
+DEPENDS = "zlib openssl libgcrypt"
+
 SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-7"
 SRCREV = "cdf7690e038230623cbbf6b024ece62f41efa98d"
+
 S = "${WORKDIR}/git"
 
+inherit cmake
+
+PACKAGECONFIG ??=""
+PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
+
 EXTRA_OECMAKE = " \
     -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
@@ -19,11 +24,6 @@ EXTRA_OECMAKE = " \
     -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
     "
 
-PACKAGECONFIG ??=""
-PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
-
-inherit cmake
-
 do_configure_prepend () {
     # Disable building of examples
     sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
Signature · 1 line
2.17.0.582.gccdcbd54c
#3 lore raw

PATCH 3/11 libftdi: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta-oe/recipes-support/libftdi/libftdi_1.4.bb +2 -4
index a1576b5617..98c5995a5f 100644
@@ -3,7 +3,6 @@ FT232BM/245BM, FT2232C/D and FT232/245R using libusb,\
 including the popular bitbang mode."
 HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/"
 SECTION = "libs"
-
 LICENSE = "LGPLv2.1 & GPLv2"
 LIC_FILES_CHKSUM= "\
     file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
@@ -13,17 +12,16 @@ LIC_FILES_CHKSUM= "\
 DEPENDS = "libusb1"
 
 SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2"
-
 SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2"
 SRC_URI[sha256sum] = "ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74"
 
 S = "${WORKDIR}/${BPN}1-${PV}"
 
+inherit cmake binconfig pkgconfig
+
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=off,boost"
 
-inherit cmake binconfig pkgconfig
-
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0.582.gccdcbd54c
#4 lore raw

PATCH 4/11 gflags: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-support/gflags/gflags_2.2.0.bb +1 -2
index b186326e9b..1571333323 100644
@@ -1,7 +1,5 @@
 DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used"
-
 HOMEPAGE = "https://github.com/gflags/gflags"
-
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
 
@@ -16,6 +14,7 @@ EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTAL
 
 PACKAGES =+ "${PN}-bash-completion"
 FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh"
+
 RDEPENDS_${PN}-bash-completion = "bash bash-completion"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.17.0.582.gccdcbd54c
#5 lore raw

PATCH 5/11 ceres-solver: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +2 -3
index a3444b934c..ad7c8f2a3b 100644
@@ -1,17 +1,16 @@
 DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems."
 AUTHOR = "Sameer Agarwal and Keir Mierle and Others"
 HOMEPAGE = "http://ceres-solver.org/"
-
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be"
 
+DEPENDS = "libeigen glog"
+
 SRC_URI = "git://github.com/ceres-solver/ceres-solver.git"
 SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libeigen glog"
-
 inherit cmake
 
 # Only a static library and headers are created
Signature · 1 line
2.17.0.582.gccdcbd54c
#6 lore raw

PATCH 6/11 openjpeg: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb +2 -3
index f749d62342..22b75d9623 100644
@@ -1,9 +1,10 @@
 DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec"
 HOMEPAGE = "http://www.openjpeg.org"
-
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
 
+DEPENDS = "libpng tiff lcms zlib"
+
 SRC_URI = "https://github.com/uclouvain/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \
            file://0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch \
           "
@@ -12,8 +13,6 @@ SRC_URI[sha256sum] = "6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b
 
 inherit cmake
 
-DEPENDS = "libpng tiff lcms zlib"
-
 # standard path for *.cmake
 EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_PACKAGE_DIR=${baselib}/cmake \
                   -DOPENJPEG_INSTALL_LIB_DIR:PATH=${libdir}"
Signature · 1 line
2.17.0.582.gccdcbd54c
#7 lore raw

PATCH 7/11 glm: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +1 -2
index dc0081d031..7f16708edb 100644
@@ -4,9 +4,7 @@ mathematics library for graphics software based on the OpenGL \
 Shading Language (GLSL) specifications."
 HOMEPAGE = "https://glm.g-truc.net"
 BUGTRACKER = "https://github.com/g-truc/glm/issues"
-
 SECTION = "libs"
-
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790"
 
@@ -16,6 +14,7 @@ SRC_URI = " \
     file://0002-glm-install-headers-only.patch \
 "
 SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7"
+
 S = "${WORKDIR}/git"
 
 inherit cmake
Signature · 1 line
2.17.0.582.gccdcbd54c
#8 lore raw

PATCH 8/11 msgpack-c: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +3 -4
index 3ae4c1f879..690a7f444b 100644
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \
 
 PV .= "+git${SRCPV}"
 
-SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449"
-
 SRC_URI = "git://github.com/msgpack/msgpack-c \
            file://0001-Fix-Werror-class-memaccess.patch \
            "
-
-inherit cmake pkgconfig
+SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449"
 
 S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
Signature · 1 line
2.17.0.582.gccdcbd54c
#9 lore raw

PATCH 9/11 json-spirit: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb +2 -2
index 3c1d8a9959..d6e42c81d5 100644
@@ -9,6 +9,8 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=278ef6183dec4aae1524fccc4b0113c9"
 
+DEPENDS = "boost"
+
 SRC_URI = "file://json_spirit_v${PV}.zip \
            file://0001-Adjust-the-cmake-files.patch \
            file://0001-Link-to-libatomic.patch \
@@ -16,8 +18,6 @@ SRC_URI = "file://json_spirit_v${PV}.zip \
 
 S = "${WORKDIR}/json_spirit_v${PV}"
 
-DEPENDS = "boost"
-
 inherit cmake
 
 BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.17.0.582.gccdcbd54c
#10 lore raw

Re: [meta-oe][master-next][PATCH 09/11] json-spirit: variable cleanup

I know this is unrelated however I see a gcc crash on mips

| /mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/recipe-sysroot-native/usr/bin/mips-bec-linux/mips-bec-linux-g++
-I/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/json_spirit_v4.08/json_spirit
-I/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/recipe-sysroot/usr/include
-meb -mabi=32 -mhard-float -march=mips32r2 -fstack-protector-strong
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
--sysroot=/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/recipe-sysroot
-O2 -pipe -g -feliminate-unused-debug-types
-fdebug-prefix-map=/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0=/usr/src/debug/json-spirit/4.08-r0 -fdebug-prefix-map=/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/recipe-sysroot= -fdebug-prefix-map=/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/recipe-sysroot-native=
-fvisibility-inlines-hidden -meb -mabi=32 -mhard-float
-march=mips32r2 -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security --sysroot=/mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/recipe-sysroot
-MD -MT json_spirit/CMakeFiles/json_spirit_static.dir/json_spirit_reader.cpp.o
-MF json_spirit/CMakeFiles/json_spirit_static.dir/json_spirit_reader.cpp.o.d
-o json_spirit/CMakeFiles/json_spirit_static.dir/json_spirit_reader.cpp.o
-c /mnt/jenkins/workspace/OpenEmbedded/build/tmp/work/mips32r2-bec-linux/json-spirit/4.08-r0/json_spirit_v4.08/json_spirit/json_spirit_reader.cpp | {standard input}: Assembler messages:
| {standard input}:732931: Warning: end of file not at end of a line;
newline inserted

| mips-bec-linux-g++: internal compiler error: Killed (program cc1plus)
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <https://gcc.gnu.org/bugs/> for instructions.

I wonder if someone else is seeing similar issue ?
it might be related to system load etc. at the time it was being built but interested in seeing if this is common enough trouble

Quoted 40 lines · Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb +2 -3
index 3c1d8a9959..d6e42c81d5 100644
@@ -9,6 +9,8 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=278ef6183dec4aae1524fccc4b0113c9"
 
+DEPENDS = "boost"
+
 SRC_URI = "file://json_spirit_v${PV}.zip \
            file://0001-Adjust-the-cmake-files.patch \
            file://0001-Link-to-libatomic.patch \
@@ -16,8 +18,6 @@ SRC_URI = "file://json_spirit_v${PV}.zip \
 
 S = "${WORKDIR}/json_spirit_v${PV}"
 
-DEPENDS = "boost"
-
 inherit cmake
 
 BBCLASSEXTEND = "nativesdk"
--

2.17.0.582.gccdcbd54c

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#11 lore raw

PATCH 10/11 capnproto: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 .../recipes-devtools/capnproto/capnproto_0.6.1.bb   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb +6 -7
index dfe19947c0..6ca3613db3 100644
@@ -2,24 +2,23 @@ SUMMARY = "Cap'n Proto serialization/RPC system"
 DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. "
 HOMEPAGE = "https://github.com/sandstorm-io/capnproto"
 SECTION = "console/tools"
-
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=0a5b5b742baf10cc1c158579eba7fb1d"
 
-SRCREV = "c949a18da5f041a36cc218c5c4b79c7705999b4f"
 SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}"
+SRCREV = "c949a18da5f041a36cc218c5c4b79c7705999b4f"
+
+S = "${WORKDIR}/git/c++"
+
+inherit cmake
 
 EXTRA_OECMAKE += "\
     -DBUILD_TESTING=OFF \
 "
 
-inherit cmake
-
-S = "${WORKDIR}/git/c++"
+FILES_${PN}-compiler = "${bindir}"
 
 PACKAGE_BEFORE_PN = "${PN}-compiler"
 RDEPENDS_${PN}-dev += "${PN}-compiler"
 
-FILES_${PN}-compiler = "${bindir}"
-
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.0.582.gccdcbd54c
#12 lore raw

PATCH 11/11 openobex: variable cleanup

In reply to Trevor Woerner

Reorder recipe variables according to:

https://www.openembedded.org/wiki/Styleguide

---
 meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +5 -8
index dcc2edf76e..3fb8cb1901 100644
@@ -2,29 +2,26 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \
 Object Exchange (OBEX) protocol."
 HOMEPAGE = "http://openobex.triq.net"
 SECTION = "libs"
-DEPENDS = "virtual/libusb0"
-DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
-
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 "
 
+DEPENDS = "virtual/libusb0"
+DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}-Source.tar.gz \
 "
-
 SRC_URI[md5sum] = "f6e0b6cb7dcfd731460a7e9a91429a3a"
 SRC_URI[sha256sum] = "158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc"
 
-inherit cmake pkgconfig
-
 S = "${WORKDIR}/${BP}-Source"
 
+inherit cmake pkgconfig
+
 EXTRA_OECONF = " -DCMAKE_SKIP_RPATH=ON "
 EXTRA_OECMAKE += "-DBUILD_DOCUMENTATION=OFF"
 
-#--enable-apps --enable-syslog
-
 ASNEEDED = ""
 
 do_install_append () {
Signature · 1 line
2.17.0.582.gccdcbd54c