[oe] [PATCH] hplip: add runtime dependency on ghostscript
The fax/filters/pstotiff program invokes /usr/bin/gs and therefore has a runtime dependency on ghostscript: fax/filters/pstotiff 24 gs_command = "/usr/bin/gs" + " " + font + " " + device 25 26 exit_code = os.system(gs_command) Signed-off-by: Trevor Woerner --- meta-oe/recipes-extended/hplip/hplip_3.22.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index d8e249f04796..23cc5197fa51 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -72,7 +72,7 @@ RDEPENDS:${PN} += " \ python3-resource \ python3-terminal \ " -RDEPENDS:${PN}-filter += "perl" +RDEPENDS:${PN}-filter += "perl ghostscript" # need to snag the debug file or OE will fail on backend package FILES:${PN}-dbg += "\ -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101465): https://lists.openembedded.org/g/openembedded-devel/message/101465 Mute This Topic: https://lists.openembedded.org/mt/97502894/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 2/2] cups-filters: fix ghostscript handling
ghostscript is not needed at build-time (it only needs to be enabled in the configuration step) but it is required at run-time for two of this recipe's packages. Signed-off-by: Trevor Woerner --- meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb index 0d3560b9c2ac..fd82bb39c2d4 100644 --- a/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb +++ b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d77679ce6a2cc4d873d4ebbf2a401e6" SECTION = "console/utils" -DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms ghostscript poppler qpdf libpng libexif" +DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms poppler qpdf libpng libexif" DEPENDS:class-native = "poppler-native glib-2.0-native dbus-native pkgconfig-native gettext-native libpng-native" SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ @@ -51,6 +51,7 @@ PACKAGES =+ "\ FILES:${PN}-gst = "\ ${libexecdir}/cups/filter/gsto* \ " +RDEPENDS:${PN}-gst += "ghostscript" FILES:${PN}-data = "\ ${datadir}/cups/data \ @@ -71,6 +72,8 @@ FILES:${PN} += "\ ${datadir}/cups/ppdc \ ${datadir}/cups/banners \ " +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "ghostscript" do_install:append() { # remove braille dir @@ -79,5 +82,3 @@ do_install:append() { # remove sysroot path contamination from pkgconfig file sed -i -e 's:${STAGING_DIR_TARGET}::' ${D}/${libdir}/pkgconfig/libcupsfilters.pc } - -RDEPENDS:${PN} += "bash" -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101460): https://lists.openembedded.org/g/openembedded-devel/message/101460 Mute This Topic: https://lists.openembedded.org/mt/97500996/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 1/2] cups-filters: remove duplicate configure option
The '--enable-ghostscript' configure option is specified twice and doesn't need to be. It's simply a boolean; it's not the sort of option whose position is relevant, or an option which modifies its immediate neighbours. Signed-off-by: Trevor Woerner --- meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb index 22de3d544127..0d3560b9c2ac 100644 --- a/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb +++ b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d818 inherit autotools-brokensep gettext pkgconfig github-releases -EXTRA_OECONF += " --enable-ghostscript --disable-ldap \ +EXTRA_OECONF += " --disable-ldap \ --with-pdftops=hybrid --enable-imagefilters \ --enable-ghostscript --with-gs-path=${bindir}/gs \ --with-pdftops-path=${bindir}/gs \ -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101459): https://lists.openembedded.org/g/openembedded-devel/message/101459 Mute This Topic: https://lists.openembedded.org/mt/97500994/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] psqlodbc: fix HOMEPAGE
The HOMEPAGE URL is no longer valid, update it to point to the correct location. Signed-off-by: Trevor Woerner --- meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02..bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02..bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02..bb index 299abee000c9..57ade6162b4d 100644 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02..bb +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02..bb @@ -14,7 +14,7 @@ DESCRIPTION = "\ software to accept ODBC clients. \ " SECTION = "libs" -HOMEPAGE = "http://psqlodbc.projects.postgresql.org/; +HOMEPAGE = "https://odbc.postgresql.org/; LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" -- 2.36.0.rc2.17.g4027e30c53 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100711): https://lists.openembedded.org/g/openembedded-devel/message/100711 Mute This Topic: https://lists.openembedded.org/mt/96475267/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vk-gl-cts: fix soname linking
The code/build explicitly links to the GL library names instead of their sonames. Update the names that are used for linking so the libraries are found at runtime. Signed-off-by: Trevor Woerner --- ...0001-use-library-sonames-for-linking.patch | 126 ++ .../vk-gl-cts/khronos-cts.inc | 1 + 2 files changed, 127 insertions(+) create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch new file mode 100644 index 0..cb396c37d --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch @@ -0,0 +1,126 @@ +From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner +Date: Thu, 23 Sep 2021 19:36:43 -0400 +Subject: [PATCH] use library sonames for linking + +The recommended "best practices" for applications is to link to library +sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This +ensures that applications don't try to use libraries if an incompatible ABI +change occurs. + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] +Signed-off-by: Trevor Woerner +--- + framework/egl/egluGLContextFactory.cpp | 4 ++-- + framework/egl/wrapper/eglwLibrary.cpp | 2 +- + framework/platform/android/tcuAndroidPlatform.cpp | 2 +- + framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- + .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- + framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/framework/egl/egluGLContextFactory.cpp b/framework/egl/egluGLContextFactory.cpp +index 8fbea2af1..8d42f19eb 100644 +--- a/framework/egl/egluGLContextFactory.cpp b/framework/egl/egluGLContextFactory.cpp +@@ -63,7 +63,7 @@ using std::vector; + # if (DE_OS == DE_OS_WIN32) + # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" + # else +-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + # endif + #endif + +@@ -75,7 +75,7 @@ using std::vector; + # if (DE_OS == DE_OS_WIN32) + # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" + # else +-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + # endif + #endif + +diff --git a/framework/egl/wrapper/eglwLibrary.cpp b/framework/egl/wrapper/eglwLibrary.cpp +index d7e07fe18..ebdf68b14 100644 +--- a/framework/egl/wrapper/eglwLibrary.cpp b/framework/egl/wrapper/eglwLibrary.cpp +@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) + const char* DefaultLibrary::getLibraryFileName (void) + { + #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) +- return "libEGL.so"; ++ return "libEGL.so.1"; + #elif (DE_OS == DE_OS_WIN32) + return "libEGL.dll"; + #else +diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp +index b9a4c716f..05cec0b49 100644 +--- a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp +@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capability WINDOW_CAPABILITIES = (eglu::Nativ + class NativeDisplay : public eglu::NativeDisplay + { + public: +- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} ++ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} + virtual ~NativeDisplay (void) {} + + virtual EGLNativeDisplayTypegetLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } +diff --git a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +index 009c05e18..237c5e16f 100644 +--- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibrary + { + public: + Library (void) +- : eglw::DefaultLibrary("libEGL.so") ++ : eglw::DefaultLibrary("libEGL.so.1") + { + } + +diff --git a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
[oe] [meta-oe][PATCH v3] vk-gl-cts: allow the user to specify the target
When building opengl-es-cts (for example), instead of hard-coding a specific target to build (surfaceless), leave the choice empty by default which instructs the package's build system to search the sysroot and try to determine which target to use (i.e. the "Default" target). Provide overrides (in the form of PACAKGECONFIGs) to allow the user to specify a specific target to build (if they don't want the target selected automatically). Signed-off-by: Trevor Woerner --- changes in v3: - incorporate feedback from Saur: - use the 6th argument to PACKAGECONFIG to enforce mutual exclusion - use bb.utils.contains_any() instead of checking for 0 packageconfigs - the code works as-is, but would have to be re-written if more packageconfigs are added, especially if they don't have anything to do with the cts targets - not to mention these updates are more elegant than my original code changes in v2: - add logic to try to guess which dependencies (x11/wayland) will be required in the case where the user doesn't set a target explicitly - add comments to explain the code, and explain how the newly added PACKAGECONFIGs work --- .../vk-gl-cts/khronos-cts.inc | 29 +-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index f61921473..881d6ca82 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check -REQUIRED_DISTRO_FEATURES += "opengl" +ANY_OF_DISTRO_FEATURES += "opengl wayland" -DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" +DEPENDS += "libpng zlib virtual/libgles2" SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ @@ -36,7 +36,30 @@ SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " -EXTRA_OECMAKE:append = " -DDEQP_TARGET=surfaceless" +# The best thing for the user to do is to not specify any of the following +# PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own +# probing and build what it thinks is appropriate. +# However, if you want, you can specify one of the following PACKAGECONFIGs +# to override this behaviour. +PACKAGECONFIG ??= "" +PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,wayland x11_egl x11_glx x11_egl_glx" +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland,,,surfaceless x11_egl x11_glx x11_egl_glx" +PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_glx x11_egl_glx" +PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx" +PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx" + +python __anonymous() { +# if the user doesn't specify any PACKAGECONFIG then the cts build system +# is going to probe the sysroot to try to figure out what to build +# in this case we try to guess whether the user is building for wayland +# or x11 and add the required dependencies automatically +distrofeatures = (d.getVar("DISTRO_FEATURES") or "") +if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d): +if "wayland" in distrofeatures: +d.appendVar("DEPENDS", " wayland ") +if "x11" in distrofeatures: +d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") +} CTSDIR = "/usr/lib/${BPN}" -- 2.30.0.rc0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93112): https://lists.openembedded.org/g/openembedded-devel/message/93112 Mute This Topic: https://lists.openembedded.org/mt/85825374/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v2] vk-gl-cts: allow the user to specify the target
On Thu 2021-09-23 @ 07:24:07 PM, Peter Kjellerstedt wrote: > > -Original Message- > > From: openembedded-devel@lists.openembedded.org > de...@lists.openembedded.org> On Behalf Of Trevor Woerner > > Sent: den 23 september 2021 20:55 > > To: openembedded-devel@lists.openembedded.org > > Subject: [oe] [meta-oe][PATCH v2] vk-gl-cts: allow the user to specify the > > target > > > > When building opengl-es-cts (for example), instead of hard-coding a > > specific target to build (surfaceless), leave the choice empty by default > > which instructs the package's build system to search the sysroot and try > > to > > determine which target to use (i.e. the "Default" target). > > > > Provide overrides (in the form of PACAKGECONFIGs) to allow the user to > > specify a specific target to build (if they don't want the target selected > > automatically). > > > > Signed-off-by: Trevor Woerner > > --- > > changes in v2: > > - add logic to try to guess which dependencies (x11/wayland) will be > > required in the case where the user doesn't set a target explicitly > > - add comments to explain the code, and explain how the newly added > > PACKAGECONFIGs work > > --- > > .../vk-gl-cts/khronos-cts.inc | 33 +-- > > 1 file changed, 30 insertions(+), 3 deletions(-) > > > > diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta- > > oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > index f61921473..903f006db 100644 > > --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" > > > > inherit pkgconfig cmake features_check > > > > -REQUIRED_DISTRO_FEATURES += "opengl" > > +ANY_OF_DISTRO_FEATURES += "opengl wayland" > > > > -DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" > > +DEPENDS += "libpng zlib virtual/libgles2" > > > > SRC_URI += > > "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src > > \ > > > > file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts > > \ > > @@ -36,7 +36,34 @@ SRC_URI:append:toolchain-clang = "\ > > file://fix-clang-private-operator.patch \ > > " > > > > -EXTRA_OECMAKE:append = " -DDEQP_TARGET=surfaceless" > > +# The best thing for the user to do is to not specify any of the following > > +# PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its > > own > > +# probing and build what it thinks is appropriate. > > +# However, if you want, you can specify one of the following PACKAGECONFIGs > > +# to override this behaviour. > > +PACKAGECONFIG ??= "" > > +PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,," > > +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland" > > +PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 > > virtual/egl" > > +PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11" > > +PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 > > virtual/egl" > > + > > +python __anonymous() { > > +packageconfig = (d.getVar("PACKAGECONFIG") or "").split() > > +if len(packageconfig) > 1: > > +bb.fatal("only one PACKAGECONFIG of 'surfaceless wayland x11_egl > > x11_glx x11_egl_glx' can be specified at a time") > > If they are mutually exclusive, it is better to use the sixth argument for There's a *sixth* argument to PACKAGECONFIG??! What kind of sorcery is this??! > the PACKAGECONFIG varflags, which allows you to specify other incompatible > varflags. I.e, the above would then become: > > PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless, wayland x11_egl > x11_glx x11_egl_glx" > PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,, wayland,,, surfaceless > x11_egl x11_glx x11_egl_glx" > PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,, virtual/libx11 > virtual/egl,,, surfaceless wayland x11_glx x11_egl_glx" > PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,, virtual/libx11,,, > surfaceless wayland x11_egl x11_egl_glx" > PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,, virtual/libx11 > virtual/egl,,, surfaceless wayland x11_egl x11_glx" > > This allows other PACKAGECONFIGs to be added withou
[oe] [meta-oe][PATCH v2] vk-gl-cts: allow the user to specify the target
When building opengl-es-cts (for example), instead of hard-coding a specific target to build (surfaceless), leave the choice empty by default which instructs the package's build system to search the sysroot and try to determine which target to use (i.e. the "Default" target). Provide overrides (in the form of PACAKGECONFIGs) to allow the user to specify a specific target to build (if they don't want the target selected automatically). Signed-off-by: Trevor Woerner --- changes in v2: - add logic to try to guess which dependencies (x11/wayland) will be required in the case where the user doesn't set a target explicitly - add comments to explain the code, and explain how the newly added PACKAGECONFIGs work --- .../vk-gl-cts/khronos-cts.inc | 33 +-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index f61921473..903f006db 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check -REQUIRED_DISTRO_FEATURES += "opengl" +ANY_OF_DISTRO_FEATURES += "opengl wayland" -DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" +DEPENDS += "libpng zlib virtual/libgles2" SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ @@ -36,7 +36,34 @@ SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " -EXTRA_OECMAKE:append = " -DDEQP_TARGET=surfaceless" +# The best thing for the user to do is to not specify any of the following +# PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own +# probing and build what it thinks is appropriate. +# However, if you want, you can specify one of the following PACKAGECONFIGs +# to override this behaviour. +PACKAGECONFIG ??= "" +PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,," +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland" +PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl" +PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11" +PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl" + +python __anonymous() { +packageconfig = (d.getVar("PACKAGECONFIG") or "").split() +if len(packageconfig) > 1: +bb.fatal("only one PACKAGECONFIG of 'surfaceless wayland x11_egl x11_glx x11_egl_glx' can be specified at a time") + +# if the user doesn't specify any PACKAGECONFIG then the cts build system +# is going to probe the sysroot to try to figure out what to build +# in this case we try to guess whether the user is building for wayland +# or x11 and add the required dependencies automatically +distrofeatures = (d.getVar("DISTRO_FEATURES") or "") +if len(packageconfig) == 0: +if "wayland" in distrofeatures: +d.appendVar("DEPENDS", " wayland ") +if "x11" in distrofeatures: +d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") +} CTSDIR = "/usr/lib/${BPN}" -- 2.30.0.rc0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93109): https://lists.openembedded.org/g/openembedded-devel/message/93109 Mute This Topic: https://lists.openembedded.org/mt/85821661/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] vk-gl-cts: allow the user to specify the target
On Thu 2021-09-23 @ 08:52:14 AM, Khem Raj wrote: > > > On 9/23/21 8:00 AM, Trevor Woerner wrote: > > When building opengl-es-cts (for example), allow the user to pick which > > target to build instead of hard-coding the 'surfaceless' target. > > > > Signed-off-by: Trevor Woerner > > --- > > .../recipes-graphics/vk-gl-cts/khronos-cts.inc | 17 ++--- > > 1 file changed, 14 insertions(+), 3 deletions(-) > > > > diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > index f61921473..a9c41f1f7 100644 > > --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc > > @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" > > inherit pkgconfig cmake features_check > > -REQUIRED_DISTRO_FEATURES += "opengl" > > +ANY_OF_DISTRO_FEATURES += "opengl wayland" > > -DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" > > +DEPENDS += "libpng zlib virtual/libgles2" > > SRC_URI += > > "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src > > \ > > > > file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts > > \ > > @@ -36,7 +36,18 @@ SRC_URI:append:toolchain-clang = "\ > > file://fix-clang-private-operator.patch \ > > " > > -EXTRA_OECMAKE:append = " -DDEQP_TARGET=surfaceless" > > +PACKAGECONFIG ??= "" ^^ the default is to not specify anything, which picks the "Default" target, in which case the cmake scripts in the source try to automatically detect what's in your sysroot and make sensible decisions. So the best option for users is to not specify anything. But I added PACKAGECONFIGs in case users want to force an option. …hmm but then the dependencies won't get handled correctly, unless I either: 1) try to do the detection myself based on IMAGE_FEATURES etc 2) add all dependencies to DEPENDS, although that might confuse the cmake probing > > +PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,," > > +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland" > > +PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 > > virtual/egl" > > +PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11" > > +PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 > > virtual/egl" > > + > > +python __anonymous() { > > +packageconfig = (d.getVar("PACKAGECONFIG") or "").split() > > +if len(packageconfig) > 1: > > +bb.fatal("only one PACKAGECONFIG of 'surfaceless wayland x11_egl > > x11_glx x11_egl_glx' can be specified at a time") > > +} > > Looks an improvement, but there is no default now, so what will happen by > default, and can be make some intelligent defaults based on wayland/x11 > distro features etc. > > > CTSDIR = "/usr/lib/${BPN}" > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93104): https://lists.openembedded.org/g/openembedded-devel/message/93104 Mute This Topic: https://lists.openembedded.org/mt/85815970/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] vk-gl-cts: allow the user to specify the target
When building opengl-es-cts (for example), allow the user to pick which target to build instead of hard-coding the 'surfaceless' target. Signed-off-by: Trevor Woerner --- .../recipes-graphics/vk-gl-cts/khronos-cts.inc | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index f61921473..a9c41f1f7 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -18,9 +18,9 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check -REQUIRED_DISTRO_FEATURES += "opengl" +ANY_OF_DISTRO_FEATURES += "opengl wayland" -DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" +DEPENDS += "libpng zlib virtual/libgles2" SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ @@ -36,7 +36,18 @@ SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " -EXTRA_OECMAKE:append = " -DDEQP_TARGET=surfaceless" +PACKAGECONFIG ??= "" +PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,," +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland" +PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl" +PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11" +PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl" + +python __anonymous() { +packageconfig = (d.getVar("PACKAGECONFIG") or "").split() +if len(packageconfig) > 1: +bb.fatal("only one PACKAGECONFIG of 'surfaceless wayland x11_egl x11_glx x11_egl_glx' can be specified at a time") +} CTSDIR = "/usr/lib/${BPN}" -- 2.30.0.rc0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#93102): https://lists.openembedded.org/g/openembedded-devel/message/93102 Mute This Topic: https://lists.openembedded.org/mt/85815970/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] glmark2: fix precision handling bugs
This patch comes from Alyssa Rosenzweig and fixes/clarifies glmark2's handling of fp16 overflows which result in corrupted rendering on some drivers. See: https://github.com/glmark2/glmark2/pull/132 Signed-off-by: Trevor Woerner --- .../0003-fix-precision-handling-bugs.patch| 138 ++ .../recipes-benchmark/glmark2/glmark2_git.bb | 1 + 2 files changed, 139 insertions(+) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch diff --git a/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch b/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch new file mode 100644 index 0..af88f6cd2 --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch @@ -0,0 +1,138 @@ +From 90e837ffd1ff5c9add1074d69de23e58a3a4810e Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig +Date: Wed, 11 Nov 2020 09:26:03 -0500 +Subject: [PATCH 1/3] terrain: Fix precision bug in light rendering + +Resulting in overly bright rendering when mediump is implemented as +fp16. + +Signed-off-by: Alyssa Rosenzweig +--- + data/shaders/terrain.frag | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/data/shaders/terrain.frag b/data/shaders/terrain.frag +index 84d085c..58f17ea 100644 +--- a/data/shaders/terrain.frag b/data/shaders/terrain.frag +@@ -67,7 +67,12 @@ void main() { + vec3 pointSpecular = vec3( 0.0 ); + for ( int i = 0; i < MAX_POINT_LIGHTS; i ++ ) { + vec4 lPosition = viewMatrix * vec4( pointLightPosition[ i ], 1.0 ); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++// should be highp for correct behaviour if mediump is implemented as fp16 ++highp vec3 lVector = lPosition.xyz + vViewPosition.xyz; ++#else + vec3 lVector = lPosition.xyz + vViewPosition.xyz; ++#endif + float lDistance = 1.0; + if ( pointLightDistance[ i ] > 0.0 ) + lDistance = 1.0 - min( ( length( lVector ) / pointLightDistance[ i ] ), 1.0 ); + +From 1edd76fda77edabd49d713912aee49b8360c86c3 Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig +Date: Wed, 11 Nov 2020 09:49:52 -0500 +Subject: [PATCH 2/3] terrain: Fix precision handling in noise shader + +Another overflow resulting in infinity in mediump. Note this bug is +masked if the driver clamps infinity to MAX_FLOAT, but it's still our +bug. + +Signed-off-by: Alyssa Rosenzweig +--- + data/shaders/terrain-noise.frag | 6 ++ + 1 file changed, 6 insertions(+) + +diff --git a/data/shaders/terrain-noise.frag b/data/shaders/terrain-noise.frag +index 7fea5c0..9535e58 100644 +--- a/data/shaders/terrain-noise.frag b/data/shaders/terrain-noise.frag +@@ -17,7 +17,13 @@ uniform float time; + uniform MEDIUMP vec2 uvScale; + varying vec2 vUv; + ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++// x should be passed as highp since the intermediate multiplications can ++// overflow with mediump ++vec4 permute(highp vec4 x) ++#else + vec4 permute(vec4 x) ++#endif + { + return mod(((x * 34.0) + 1.0) * x, 289.0); + } + +From e866cc633ffc450e5358b2742f32ca360e4f3f12 Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig +Date: Wed, 11 Nov 2020 09:35:21 -0500 +Subject: [PATCH 3/3] loop,function,conditionals: Fix mediump overflow + +The multiplication can produce infinity. + +Signed-off-by: Alyssa Rosenzweig +--- + data/shaders/conditionals.frag | 9 - + data/shaders/function.frag | 9 - + data/shaders/loop.frag | 9 - + 3 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/data/shaders/conditionals.frag b/data/shaders/conditionals.frag +index 3bd2507..e902263 100644 +--- a/data/shaders/conditionals.frag b/data/shaders/conditionals.frag +@@ -2,7 +2,14 @@ varying vec4 dummy; + + void main(void) + { +-float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++// should be declared highp since the multiplication can overflow in ++// mediump, particularly if mediump is implemented as fp16 ++highp vec2 FragCoord = gl_FragCoord.xy; ++#else ++vec2 FragCoord = gl_FragCoord.xy; ++#endif ++float d = fract(FragCoord.x * FragCoord.y * 0.0001); + + $MAIN$ + +diff --git a/data/shaders/function.frag b/data/shaders/function.frag +index 3e3c74f..9d0230e 100644 +--- a/data/shaders/function.frag b/data/shaders/function.frag +@@ -8,7 +8,14 @@ $PROCESS$ + + void main(void) + { +-float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++// should be declared highp since the multiplication can overflow in ++// mediump, particularly if mediump is implemented as fp16 ++highp vec2 FragCoord = gl_FragCoord.xy; ++#else ++vec2 FragCoord = gl_FragCoord.xy; ++#endif ++float d = fract(FragCoord.x * FragCoord.y * 0.0001); + + $MAIN$ + +diff --git a/data/shaders/loop.frag b/data/shaders/loop.frag +index 31ae23e..9a6afd2 100644 +--- a/data/s
[oe] [meta-oe][PATCH] glmark2: revert to previous behaviour
- use "drm-gles2" as the default PACKAGECONFIG outside of any defined DISTRO_FEATURES - use a version string that includes the full date of the latest git change (not just: .) Signed-off-by: Trevor Woerner --- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 46634634d..44bce9fb5 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native', '', d)}" -PV = "2020.11+${SRCPV}" +PV = "20201114+${SRCPV}" SRC_URI = " \ git://github.com/glmark2/glmark2.git;protocol=https \ @@ -26,9 +26,10 @@ inherit waf pkgconfig features_check ANY_OF_DISTRO_FEATURES = "opengl dispmanx" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2 drm-gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2 drm-gles2', '', d)} \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'dispmanx', 'dispmanx', '', d)} \ + drm-gles2 \ " PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" -- 2.28.0.497.g54e85e7af1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88275): https://lists.openembedded.org/g/openembedded-devel/message/88275 Mute This Topic: https://lists.openembedded.org/mt/78873397/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v3 2/3] glmark2: update to latest
On Thu 2020-12-10 @ 09:52:56 PM, Trevor Woerner via lists.openembedded.org wrote: > On Thu 2020-12-10 @ 12:34:17 PM, Khem Raj wrote: > > On Thu, Dec 10, 2020 at 11:39 AM Trevor Woerner wrote: > > > > > > On Tue, Dec 8, 2020 at 6:55 PM Khem Raj wrote: > > >> > > >> while I have applied v3, please send a v4 addressing this change. > > > > > > > > > I had wanted to try going in a different direction, one that didn't need > > > the DISTRO_FEATURE thing. > > > > all I wanted was to fix PV as a followup > > Ah sorry, an update to 2/3. Okay, coming shortly. > > Can we drop 3/3? I'd like to give it another go without the "dispmanx" > DISTRO_FEATURES. Oops, too late. Okay, I'll submit a new patch. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88274): https://lists.openembedded.org/g/openembedded-devel/message/88274 Mute This Topic: https://lists.openembedded.org/mt/78702803/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v3 2/3] glmark2: update to latest
On Thu 2020-12-10 @ 12:34:17 PM, Khem Raj wrote: > On Thu, Dec 10, 2020 at 11:39 AM Trevor Woerner wrote: > > > > On Tue, Dec 8, 2020 at 6:55 PM Khem Raj wrote: > >> > >> while I have applied v3, please send a v4 addressing this change. > > > > > > I had wanted to try going in a different direction, one that didn't need > > the DISTRO_FEATURE thing. > > all I wanted was to fix PV as a followup Ah sorry, an update to 2/3. Okay, coming shortly. Can we drop 3/3? I'd like to give it another go without the "dispmanx" DISTRO_FEATURES. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88273): https://lists.openembedded.org/g/openembedded-devel/message/88273 Mute This Topic: https://lists.openembedded.org/mt/78702803/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v3 2/3] glmark2: update to latest
On Tue, Dec 8, 2020 at 6:55 PM Khem Raj wrote: > while I have applied v3, please send a v4 addressing this change. I had wanted to try going in a different direction, one that didn't need the DISTRO_FEATURE thing. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88271): https://lists.openembedded.org/g/openembedded-devel/message/88271 Mute This Topic: https://lists.openembedded.org/mt/78702803/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v2 2/3] glmark2: update to latest
On Thu, Dec 3, 2020 at 5:48 PM Khem Raj wrote: > I am seeing this error > > https://errors.yoctoproject.org/Errors/Details/539076/ > > all across machines. Perhaps it needs to depend on wayland-scanner > Excellent, thanks for testing. Sorry, I hadn't tried building for wayland. Please see V3 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88238): https://lists.openembedded.org/g/openembedded-devel/message/88238 Mute This Topic: https://lists.openembedded.org/mt/78685033/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH v3 3/3] glmark2: add support for dispmanx
Upstream glmark2 includes support for running glmark2 on a RaspberryPi via the dispmanx interface, as is provided by "userland". The build depends on x11, but this is a quirk of the upstream sources. One can easily build a minimal image without any x11/wayland on which to run dispmanx applications directly (including glmark2). NOTE: unlike with other flavours, one can only build the dispmanx-eglv2 flavour on its own (this is a constraint of the glmark2 build) Signed-off-by: Trevor Woerner --- changes from v1 to v2: - None. changes from v2 to v3: - None. The diff context was updated due to v2->v3 changes in patch 2/3. --- .../files/0001-fix-dispmanx-build.patch | 125 ++ .../files/0002-run-dispmanx-fullscreen.patch | 30 + .../recipes-benchmark/glmark2/glmark2_git.bb | 20 ++- 3 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch new file mode 100644 index 0..e9b880c26 --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch @@ -0,0 +1,125 @@ +From 56e4959f0bc3e442c813d78e8ab6b3bf64b4ac66 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Wed, 2 Dec 2020 20:27:42 + +Subject: [PATCH] fix dispmanx build + +For when the user is building "--with-flavors dispmanx-glesv2", fixes a bunch +of "redeclared as different kind of symbol" problems. + +This patch is almost entirely from: + https://github.com/glmark2/glmark2/commit/3b1a0f78d03ae126b78ee52a7c434809115e5993 + +Which was created by: Alexandros Frantzis + +See: + https://github.com/glmark2/glmark2/issues/80 + +My contribution is to tweak the wscript to link all the required libraries. + +Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Signed-off-by: Trevor Woerner +--- + src/native-state-dispmanx.cpp | 22 +- + src/native-state-dispmanx.h | 7 +++ + wscript | 2 +- + 3 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +index 2117386..49f74e7 100644 +--- a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +@@ -23,13 +23,25 @@ + #include "native-state-dispmanx.h" + #include "log.h" + ++#include "EGL/egl.h" ++ + #include + #include + ++struct NativeStateDispmanx::Private ++{ ++Private() ++{ ++ memset(_dispmanx_window, 0, sizeof(egl_dispmanx_window)); ++} ++ ++EGL_DISPMANX_WINDOW_T egl_dispmanx_window; ++}; ++ + NativeStateDispmanx::NativeStateDispmanx() ++: priv{std::make_unique()} + { + memset(_, 0, sizeof(properties_)); +-memset(_dispmanx_window, 0, sizeof(egl_dispmanx_window)); + } + + NativeStateDispmanx::~NativeStateDispmanx() +@@ -99,9 +111,9 @@ NativeStateDispmanx::create_window(WindowProperties const& properties) + 0 /*clamp*/, + DISPMANX_NO_ROTATE); + +-egl_dispmanx_window.element = dispmanx_element; +-egl_dispmanx_window.width = dst_rect.width; +-egl_dispmanx_window.height = dst_rect.height; ++priv->egl_dispmanx_window.element = dispmanx_element; ++priv->egl_dispmanx_window.width = dst_rect.width; ++priv->egl_dispmanx_window.height = dst_rect.height; + vc_dispmanx_update_submit_sync(dispmanx_update); + + return true; +@@ -111,7 +123,7 @@ void* + NativeStateDispmanx::window(WindowProperties ) + { + properties = properties_; +-return _dispmanx_window; ++return >egl_dispmanx_window; + } + + void +diff --git a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +index a6ed3d4..794b2d3 100644 +--- a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +@@ -24,10 +24,8 @@ + #define GLMARK2_NATIVE_STATE_DISPMANX_H_ + + #include ++#include + #include "bcm_host.h" +-#include "GLES/gl.h" +-#include "EGL/egl.h" +-#include "EGL/eglext.h" + + #include "native-state.h" + +@@ -46,11 +44,12 @@ public: + void flip(); + + private: ++struct Private; + DISPMANX_DISPLAY_HANDLE_T dispmanx_display; + DISPMANX_UPDATE_HANDLE_T dispmanx_update; + DISPMANX_ELEMENT_HANDLE_T dispmanx_element; +-EGL_DISPMANX_WINDOW_T egl_dispmanx_window; + WindowProperties properties_; ++std::unique_ptr priv; + }; + + #endif /* GLMARK2_NATIVE_STATE_DISPMANX_H_ */ +diff --git a/wscript b/wscript +index e09fa78..6c3869c 100644 +--- a/wscript b/wscript +@@ -205,7 +205,7 @@ def configure_linux(ctx): + + ctx.check_cxx(lib = 'brcmGLESv
[oe] [meta-oe][PATCH v3 1/3] glmark2: update information
According to https://launchpad.net/glmark2 the preferred "home" and bugtracker for the project are on github. Signed-off-by: Trevor Woerner --- changes from v1 to v2: - Added. I had forgotten to submit this the first time. changes from v2 to v3: - None. --- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 2e727a01c..320d07dfc 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -1,8 +1,8 @@ SUMMARY = "OpenGL (ES) 2.0 benchmark" DESCRIPTION = "glmark2 is a benchmark for OpenGL (ES) 2.0. \ It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0." -HOMEPAGE = "https://launchpad.net/glmark2; -BUGTRACKER = "https://bugs.launchpad.net/glmark2; +HOMEPAGE = "https://github.com/glmark2/glmark2; +BUGTRACKER = "https://github.com/glmark2/glmark2/issues; LICENSE = "GPLv3+ & SGIv1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -- 2.28.0.497.g54e85e7af1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88235): https://lists.openembedded.org/g/openembedded-devel/message/88235 Mute This Topic: https://lists.openembedded.org/mt/78702802/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH v3 2/3] glmark2: update to latest
Signed-off-by: Trevor Woerner --- changes from v1 to v2: - Added. I had forgotten to submit this the first time. changes from v2 to v3: - Fixed do_compile for wayland. --- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 320d07dfc..209230572 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -9,13 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" DEPENDS = "libpng jpeg udev" +DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native', '', d)}" -PV = "20191226+${SRCPV}" +PV = "2020.11+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" -SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" +SRCREV = "784aca755a469b144acf3cae180b6e613b7b057a" S = "${WORKDIR}/git" -- 2.28.0.497.g54e85e7af1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88236): https://lists.openembedded.org/g/openembedded-devel/message/88236 Mute This Topic: https://lists.openembedded.org/mt/78702803/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH v2 1/3] glmark2: update information
According to https://launchpad.net/glmark2 the preferred "home" and bugtracker for the project are on github. Signed-off-by: Trevor Woerner --- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 2e727a01c..320d07dfc 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -1,8 +1,8 @@ SUMMARY = "OpenGL (ES) 2.0 benchmark" DESCRIPTION = "glmark2 is a benchmark for OpenGL (ES) 2.0. \ It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0." -HOMEPAGE = "https://launchpad.net/glmark2; -BUGTRACKER = "https://bugs.launchpad.net/glmark2; +HOMEPAGE = "https://github.com/glmark2/glmark2; +BUGTRACKER = "https://github.com/glmark2/glmark2/issues; LICENSE = "GPLv3+ & SGIv1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -- 2.28.0.497.g54e85e7af1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88221): https://lists.openembedded.org/g/openembedded-devel/message/88221 Mute This Topic: https://lists.openembedded.org/mt/78685032/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH v2 3/3] glmark2: add support for dispmanx
Upstream glmark2 includes support for running glmark2 on a RaspberryPi via the dispmanx interface, as is provided by "userland". The build depends on x11, but this is a quirk of the upstream sources. One can easily build a minimal image without any x11/wayland on which to run dispmanx applications directly (including glmark2). NOTE: unlike with other flavours, one can only build the dispmanx-eglv2 flavour on its own (this is a constraint of the glmark2 build) Signed-off-by: Trevor Woerner --- .../files/0001-fix-dispmanx-build.patch | 125 ++ .../files/0002-run-dispmanx-fullscreen.patch | 30 + .../recipes-benchmark/glmark2/glmark2_git.bb | 20 ++- 3 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch new file mode 100644 index 0..e9b880c26 --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch @@ -0,0 +1,125 @@ +From 56e4959f0bc3e442c813d78e8ab6b3bf64b4ac66 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Wed, 2 Dec 2020 20:27:42 + +Subject: [PATCH] fix dispmanx build + +For when the user is building "--with-flavors dispmanx-glesv2", fixes a bunch +of "redeclared as different kind of symbol" problems. + +This patch is almost entirely from: + https://github.com/glmark2/glmark2/commit/3b1a0f78d03ae126b78ee52a7c434809115e5993 + +Which was created by: Alexandros Frantzis + +See: + https://github.com/glmark2/glmark2/issues/80 + +My contribution is to tweak the wscript to link all the required libraries. + +Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Signed-off-by: Trevor Woerner +--- + src/native-state-dispmanx.cpp | 22 +- + src/native-state-dispmanx.h | 7 +++ + wscript | 2 +- + 3 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +index 2117386..49f74e7 100644 +--- a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +@@ -23,13 +23,25 @@ + #include "native-state-dispmanx.h" + #include "log.h" + ++#include "EGL/egl.h" ++ + #include + #include + ++struct NativeStateDispmanx::Private ++{ ++Private() ++{ ++ memset(_dispmanx_window, 0, sizeof(egl_dispmanx_window)); ++} ++ ++EGL_DISPMANX_WINDOW_T egl_dispmanx_window; ++}; ++ + NativeStateDispmanx::NativeStateDispmanx() ++: priv{std::make_unique()} + { + memset(_, 0, sizeof(properties_)); +-memset(_dispmanx_window, 0, sizeof(egl_dispmanx_window)); + } + + NativeStateDispmanx::~NativeStateDispmanx() +@@ -99,9 +111,9 @@ NativeStateDispmanx::create_window(WindowProperties const& properties) + 0 /*clamp*/, + DISPMANX_NO_ROTATE); + +-egl_dispmanx_window.element = dispmanx_element; +-egl_dispmanx_window.width = dst_rect.width; +-egl_dispmanx_window.height = dst_rect.height; ++priv->egl_dispmanx_window.element = dispmanx_element; ++priv->egl_dispmanx_window.width = dst_rect.width; ++priv->egl_dispmanx_window.height = dst_rect.height; + vc_dispmanx_update_submit_sync(dispmanx_update); + + return true; +@@ -111,7 +123,7 @@ void* + NativeStateDispmanx::window(WindowProperties ) + { + properties = properties_; +-return _dispmanx_window; ++return >egl_dispmanx_window; + } + + void +diff --git a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +index a6ed3d4..794b2d3 100644 +--- a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +@@ -24,10 +24,8 @@ + #define GLMARK2_NATIVE_STATE_DISPMANX_H_ + + #include ++#include + #include "bcm_host.h" +-#include "GLES/gl.h" +-#include "EGL/egl.h" +-#include "EGL/eglext.h" + + #include "native-state.h" + +@@ -46,11 +44,12 @@ public: + void flip(); + + private: ++struct Private; + DISPMANX_DISPLAY_HANDLE_T dispmanx_display; + DISPMANX_UPDATE_HANDLE_T dispmanx_update; + DISPMANX_ELEMENT_HANDLE_T dispmanx_element; +-EGL_DISPMANX_WINDOW_T egl_dispmanx_window; + WindowProperties properties_; ++std::unique_ptr priv; + }; + + #endif /* GLMARK2_NATIVE_STATE_DISPMANX_H_ */ +diff --git a/wscript b/wscript +index e09fa78..6c3869c 100644 +--- a/wscript b/wscript +@@ -205,7 +205,7 @@ def configure_linux(ctx): + + ctx.check_cxx(lib = 'brcmGLESv2', uselib_store = 'glesv2', libpath='/opt/vc/lib') + ctx.check_cxx(lib = ['brcmEGL', 'brcmGLESv2'], uselib_store = 'egl', lib
[oe] [meta-oe][PATCH v2 2/3] glmark2: update to latest
Signed-off-by: Trevor Woerner --- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 320d07dfc..da8ca9e2b 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "20191226+${SRCPV}" +PV = "2020.11+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" -SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" +SRCREV = "784aca755a469b144acf3cae180b6e613b7b057a" S = "${WORKDIR}/git" -- 2.28.0.497.g54e85e7af1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88222): https://lists.openembedded.org/g/openembedded-devel/message/88222 Mute This Topic: https://lists.openembedded.org/mt/78685033/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] glmark2: add support for dispmanx
whoa!! brain fart! This patch was supposed to be part of a series, resending with a v2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88220): https://lists.openembedded.org/g/openembedded-devel/message/88220 Mute This Topic: https://lists.openembedded.org/mt/78684384/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] glmark2: add support for dispmanx
Upstream glmark2 includes support for running glmark2 on a RaspberryPi via the dispmanx interface, as is provided by "userland". The build depends on x11, but this is a quirk of the upstream sources. One can easily build a minimal image without any x11/wayland on which to run dispmanx applications directly (including glmark2). NOTE: unlike with other flavours, one can only build the dispmanx-eglv2 flavour on its own (this is a constraint of the glmark2 build) Signed-off-by: Trevor Woerner --- .../files/0001-fix-dispmanx-build.patch | 125 ++ .../files/0002-run-dispmanx-fullscreen.patch | 30 + .../recipes-benchmark/glmark2/glmark2_git.bb | 20 ++- 3 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch new file mode 100644 index 0..e9b880c26 --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch @@ -0,0 +1,125 @@ +From 56e4959f0bc3e442c813d78e8ab6b3bf64b4ac66 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Wed, 2 Dec 2020 20:27:42 + +Subject: [PATCH] fix dispmanx build + +For when the user is building "--with-flavors dispmanx-glesv2", fixes a bunch +of "redeclared as different kind of symbol" problems. + +This patch is almost entirely from: + https://github.com/glmark2/glmark2/commit/3b1a0f78d03ae126b78ee52a7c434809115e5993 + +Which was created by: Alexandros Frantzis + +See: + https://github.com/glmark2/glmark2/issues/80 + +My contribution is to tweak the wscript to link all the required libraries. + +Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Signed-off-by: Trevor Woerner +--- + src/native-state-dispmanx.cpp | 22 +- + src/native-state-dispmanx.h | 7 +++ + wscript | 2 +- + 3 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +index 2117386..49f74e7 100644 +--- a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +@@ -23,13 +23,25 @@ + #include "native-state-dispmanx.h" + #include "log.h" + ++#include "EGL/egl.h" ++ + #include + #include + ++struct NativeStateDispmanx::Private ++{ ++Private() ++{ ++ memset(_dispmanx_window, 0, sizeof(egl_dispmanx_window)); ++} ++ ++EGL_DISPMANX_WINDOW_T egl_dispmanx_window; ++}; ++ + NativeStateDispmanx::NativeStateDispmanx() ++: priv{std::make_unique()} + { + memset(_, 0, sizeof(properties_)); +-memset(_dispmanx_window, 0, sizeof(egl_dispmanx_window)); + } + + NativeStateDispmanx::~NativeStateDispmanx() +@@ -99,9 +111,9 @@ NativeStateDispmanx::create_window(WindowProperties const& properties) + 0 /*clamp*/, + DISPMANX_NO_ROTATE); + +-egl_dispmanx_window.element = dispmanx_element; +-egl_dispmanx_window.width = dst_rect.width; +-egl_dispmanx_window.height = dst_rect.height; ++priv->egl_dispmanx_window.element = dispmanx_element; ++priv->egl_dispmanx_window.width = dst_rect.width; ++priv->egl_dispmanx_window.height = dst_rect.height; + vc_dispmanx_update_submit_sync(dispmanx_update); + + return true; +@@ -111,7 +123,7 @@ void* + NativeStateDispmanx::window(WindowProperties ) + { + properties = properties_; +-return _dispmanx_window; ++return >egl_dispmanx_window; + } + + void +diff --git a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +index a6ed3d4..794b2d3 100644 +--- a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +@@ -24,10 +24,8 @@ + #define GLMARK2_NATIVE_STATE_DISPMANX_H_ + + #include ++#include + #include "bcm_host.h" +-#include "GLES/gl.h" +-#include "EGL/egl.h" +-#include "EGL/eglext.h" + + #include "native-state.h" + +@@ -46,11 +44,12 @@ public: + void flip(); + + private: ++struct Private; + DISPMANX_DISPLAY_HANDLE_T dispmanx_display; + DISPMANX_UPDATE_HANDLE_T dispmanx_update; + DISPMANX_ELEMENT_HANDLE_T dispmanx_element; +-EGL_DISPMANX_WINDOW_T egl_dispmanx_window; + WindowProperties properties_; ++std::unique_ptr priv; + }; + + #endif /* GLMARK2_NATIVE_STATE_DISPMANX_H_ */ +diff --git a/wscript b/wscript +index e09fa78..6c3869c 100644 +--- a/wscript b/wscript +@@ -205,7 +205,7 @@ def configure_linux(ctx): + + ctx.check_cxx(lib = 'brcmGLESv2', uselib_store = 'glesv2', libpath='/opt/vc/lib') + ctx.check_cxx(lib = ['brcmEGL', 'brcmGLESv2'], uselib_store = 'egl', lib
[oe] [meta-perl][PATCH] packagegroup-meta-perl: fix package name
There is no libcrypt-openssl-guess package, but there is a libcrypt-openssl-guess-perl. Signed-off-by: Trevor Woerner --- meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb b/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb index 9d0e33baf..9b2406ba6 100644 --- a/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb +++ b/meta-perl/recipes-perl/packagegroups/packagegroup-meta-perl.bb @@ -16,7 +16,7 @@ RDEPENDS_packagegroup-meta-perl = "\ libtext-wrapi18n-perl liblocale-gettext-perl libdata-hexdump-perl \ libextutils-installpaths-perl libextutils-helpers-perl libextutils-parsexs-perl \ libextutils-config-perl libextutils-cppguess-perl libimport-into-perl \ -libcrypt-openssl-rsa-perl libcrypt-openssl-guess libcrypt-openssl-random-perl \ +libcrypt-openssl-rsa-perl libcrypt-openssl-guess-perl libcrypt-openssl-random-perl \ libxml-sax-writer-perl libxml-libxml-perl libxml-filter-buffertext-perl \ adduser \ libauthen-sasl-perl libnet-ldap-perl libnet-dns-perl \ -- 2.25.0.114.g5b0ca878e0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python3-bitarray: fix name
This recipe's filename is missing a trailing 'b'. Signed-off-by: Trevor Woerner --- .../{python3-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-python/recipes-devtools/python/{python3-bitarray_1.2.1.b => python3-bitarray_1.2.1.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python3-bitarray_1.2.1.b b/meta-python/recipes-devtools/python/python3-bitarray_1.2.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-bitarray_1.2.1.b rename to meta-python/recipes-devtools/python/python3-bitarray_1.2.1.bb -- 2.25.0.114.g5b0ca878e0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] mpv: 0.26.0 -> 0.32.0
Okay, I'll take a look. Thanks! On Mon, Feb 10, 2020 at 10:40 AM Khem Raj wrote: > Trevor > > Its failing for one of builds with musl/arm > http://errors.yoctoproject.org/Errors/Details/390554/ > > On Sat, Feb 8, 2020 at 11:24 AM Trevor Woerner wrote: > > > > Remove mpv from the PNBLACKLIST by updating to the latest release and > using a > > newer, python3-aware waf for building (copied from glmark2). > > > > The name of the license file changed, but the licence of the software > itself > > did not. > > > > Added mime-xdg to inherit to handle mime artifacts. > > > > Added to the FILES command to scoop up additional files being generated > by > > the build. > > > > Re-added 'mpv' back to LICENSE_FLAGS_WHITELIST search list in > > packagegroup-meta-oe. > > > > Extensively fixed and cleaned up the PACKAGECONFIG options to reflect the > > current options available when configuring mpv. Also cleaned up any > configure > > options which are no longer available. > > > > Added the correct dependencies so mpv builds under wayland. > > > > Tested with core-image-x11 on a rock-pi-4 with > > PACKAGECONFIG = "libass x11 opengl egl drm gbm vaapi vdpau" > > # mpv --vo=help > > Available video outputs: > > libmpv render API for libmpv > > gpu Shader-based GPU Renderer > > vdpauVDPAU with X11 > > vaapiVA API with X11 > > x11 X11 (slow, old crap) > > null Null video output > > imageWrite video frames to image files > > tct true-color terminals > > drm Direct Rendering Manager > > > > Tested with core-image-weston on a rock-pi-4 with: > > PACKAGECONFIG = "libass wayland x11 opengl" > > # mpv -vo=help > > Available video outputs: > > libmpv render API for libmpv > > gpu Shader-based GPU Renderer > > wlshmWayland SHM video output > > x11 X11 (slow, old crap) > > null Null video output > > imageWrite video frames to image files > > tct true-color terminals > > > > Signed-off-by: Trevor Woerner > > --- > > > > changes in v2: > > > > - Martin Jansa pointed out that this patch should also re-add mpv to the > > LICENSE_FLAGS_WHITELIST list in packagegroup-meta-oe > > > https://git.openembedded.org/meta-openembedded/commit/?id=0c182e58775966699c303c1e2561c273197bf445 > > > > - Khem Raj pointed out that this recipe fails to build with wayland > > https://errors.yoctoproject.org/Errors/Details/390294/ > > --- > > .../packagegroups/packagegroup-meta-oe.bb | 2 +- > > .../mplayer/mpv/python3.patch | 12 > > .../mplayer/{mpv_0.26.0.bb => mpv_0.32.0.bb} | 60 ++- > > 3 files changed, 58 insertions(+), 16 deletions(-) > > create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/python3.patch > > rename meta-oe/recipes-multimedia/mplayer/{mpv_0.26.0.bb => > mpv_0.32.0.bb} (46%) > > > > diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > index d5789a758..865cbb0bf 100644 > > --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > @@ -207,7 +207,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ > > sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ > > ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol > xsp", "", d)} \ > > libmikmod \ > > -${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", > "libmad faad2", "", d)} \ > > +${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", > "libmad faad2 mpv", "", d)} \ > > " > > RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" > > > > diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch > b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch > > new file mode 100644 > > index 0..df208cf87 > > --- /dev/null > > +++ b/meta-oe/recipes-multimedia/mplayer/mpv/python3.
[oe] [meta-oe][PATCH v2] mpv: 0.26.0 -> 0.32.0
Remove mpv from the PNBLACKLIST by updating to the latest release and using a newer, python3-aware waf for building (copied from glmark2). The name of the license file changed, but the licence of the software itself did not. Added mime-xdg to inherit to handle mime artifacts. Added to the FILES command to scoop up additional files being generated by the build. Re-added 'mpv' back to LICENSE_FLAGS_WHITELIST search list in packagegroup-meta-oe. Extensively fixed and cleaned up the PACKAGECONFIG options to reflect the current options available when configuring mpv. Also cleaned up any configure options which are no longer available. Added the correct dependencies so mpv builds under wayland. Tested with core-image-x11 on a rock-pi-4 with PACKAGECONFIG = "libass x11 opengl egl drm gbm vaapi vdpau" # mpv --vo=help Available video outputs: libmpv render API for libmpv gpu Shader-based GPU Renderer vdpauVDPAU with X11 vaapiVA API with X11 x11 X11 (slow, old crap) null Null video output imageWrite video frames to image files tct true-color terminals drm Direct Rendering Manager Tested with core-image-weston on a rock-pi-4 with: PACKAGECONFIG = "libass wayland x11 opengl" # mpv -vo=help Available video outputs: libmpv render API for libmpv gpu Shader-based GPU Renderer wlshmWayland SHM video output x11 X11 (slow, old crap) null Null video output imageWrite video frames to image files tct true-color terminals Signed-off-by: Trevor Woerner --- changes in v2: - Martin Jansa pointed out that this patch should also re-add mpv to the LICENSE_FLAGS_WHITELIST list in packagegroup-meta-oe https://git.openembedded.org/meta-openembedded/commit/?id=0c182e58775966699c303c1e2561c273197bf445 - Khem Raj pointed out that this recipe fails to build with wayland https://errors.yoctoproject.org/Errors/Details/390294/ --- .../packagegroups/packagegroup-meta-oe.bb | 2 +- .../mplayer/mpv/python3.patch | 12 .../mplayer/{mpv_0.26.0.bb => mpv_0.32.0.bb} | 60 ++- 3 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/python3.patch rename meta-oe/recipes-multimedia/mplayer/{mpv_0.26.0.bb => mpv_0.32.0.bb} (46%) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d5789a758..865cbb0bf 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -207,7 +207,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \ libmikmod \ -${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2", "", d)} \ +${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \ " RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch new file mode 100644 index 0..df208cf87 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch @@ -0,0 +1,12 @@ +Use Python 3 instead of Python 2. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/waf b/waf +index 6ce2a24..de3c898 100755 +--- a/waf b/waf +@@ -1 +1 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb similarity index 46% rename from meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb rename to meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index c98aa7ab0..bd2e389fe 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -9,22 +9,23 @@ DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ REQUIRED_DISTRO_FEATURES = "x11" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" -SRCREV_mpv = "4db82f04502cbcd20d9a975df9dfde91d8c
Re: [oe] [meta-oe][PATCH] mpv: 0.26.0 -> 0.32.0
On Wed 2020-02-05 @ 06:02:36 PM, Trevor Woerner wrote: > On Wed 2020-02-05 @ 10:07:07 PM, Martin Jansa wrote: > > Also was this sent with -M? -M2 works better, I'll use that for v2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] mpv: 0.26.0 -> 0.32.0
On Wed, Feb 5, 2020 at 6:32 PM Khem Raj wrote: > On Wed, Feb 5, 2020 at 3:02 PM Trevor Woerner wrote: > > > > On Wed 2020-02-05 @ 10:07:07 PM, Martin Jansa wrote: > > > Thanks, > > > > > > would you mind undoing: > > > > http://git.openembedded.org/meta-openembedded/commit/?id=0c182e58775966699c303c1e2561c273197bf445 > > > in the same commit? > > > > Sure, no problem. > > v2 on the way > > > > > Also was this sent with -M? > > > > haha, I know exactly what you mean! I did the format-patch twice just to > > convince myself I had used the -M (and I had, twice). I don't understand > why > > there's no similarity :-( > > also please take a look at > https://errors.yoctoproject.org/Errors/Details/390294/ > okay -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] mpv: 0.26.0 -> 0.32.0
On Wed 2020-02-05 @ 10:07:07 PM, Martin Jansa wrote: > Thanks, > > would you mind undoing: > http://git.openembedded.org/meta-openembedded/commit/?id=0c182e58775966699c303c1e2561c273197bf445 > in the same commit? Sure, no problem. v2 on the way > Also was this sent with -M? haha, I know exactly what you mean! I did the format-patch twice just to convince myself I had used the -M (and I had, twice). I don't understand why there's no similarity :-( -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mpv: 0.26.0 -> 0.32.0
Remove mpv from the PNBLACKLIST by updating to the latest release and using a newer, python3-aware waf for building (copied from glmark2). The name of the license file changed, but the licence of the software itself did not. Added mime-xdg to inherit to handle mime artifacts. Added to the FILES command to scoop up additional files being generated by the build. Extensively fixed and cleaned up the PACKAGECONFIG options to reflect the current options available when configuring mpv. Also cleaned up any configure options which are no longer available. Tested with core-image-x11 on a rock-pi-4 with PACKAGECONFIG = "libass x11 opengl egl drm gbm vaapi vdpau" # mpv --vo=help Available video outputs: libmpv render API for libmpv gpu Shader-based GPU Renderer vdpauVDPAU with X11 vaapiVA API with X11 x11 X11 (slow, old crap) null Null video output imageWrite video frames to image files tct true-color terminals drm Direct Rendering Manager Signed-off-by: Trevor Woerner --- .../mplayer/mpv/python3.patch | 12 ++ .../recipes-multimedia/mplayer/mpv_0.26.0.bb | 85 - .../recipes-multimedia/mplayer/mpv_0.32.0.bb | 115 ++ 3 files changed, 127 insertions(+), 85 deletions(-) create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv/python3.patch delete mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb create mode 100644 meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch new file mode 100644 index 0..df208cf87 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/python3.patch @@ -0,0 +1,12 @@ +Use Python 3 instead of Python 2. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/waf b/waf +index 6ce2a24..de3c898 100755 +--- a/waf b/waf +@@ -1 +1 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb deleted file mode 100644 index c98aa7ab0..0 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "Open Source multimedia player" -DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more." -SECTION = "multimedia" -HOMEPAGE = "http://www.mpv.io/; -DEPENDS = "zlib ffmpeg jpeg virtual/libx11 xsp libxv \ - libxscrnsaver libv4l libxinerama \ -" - -REQUIRED_DISTRO_FEATURES = "x11" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" - -# While this item does not require it, it depends on ffmpeg which does -LICENSE_FLAGS = "commercial" - -SRCREV_mpv = "4db82f04502cbcd20d9a975df9dfde91d8c389e3" -SRC_URI = " \ -git://github.com/mpv-player/mpv;name=mpv \ - http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=git \ -" -SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" -SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" - -S = "${WORKDIR}/git" - -inherit waf pkgconfig python3native features_check - -LUA ?= "lua" -LUA_mips64 = "" -LUA_aarch64 = "" -LUA_powerpc64 = "" -LUA_powerpc64le = "" -LUA_powerpc = "" - -# Note: both lua and libass are required to get on-screen-display (controls) -PACKAGECONFIG ??= " \ -${LUA} \ -libass \ -${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ -" - -PACKAGECONFIG_remove_aarch64 = "lua" -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/mesa" -PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" -PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" -PACKAGECONFIG[vaapi] = "--enable-vaapi, --disable-vaapi,libva" -PACKAGECONFIG[vdpau] = "--enable-vdpau, --disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland,wayland libxkbcommon" - -SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" - -EXTRA_OECONF = " \ ---prefix=${prefix} \ ---target=${SIMPLE_TARGET_SYS} \ ---confdir=${sysconfdir} \ ---datadir=${datadir} \ ---disable-manpage-build \ ---disabl
Re: [oe] [meta-oe][PATCH] packagegrop-meta-oe: remove blacklisted mpv
On Sat 2020-01-25 @ 12:42:21 PM, Tim Orling wrote: > If someone cares, it has been updated to python3 > https://github.com/mpv-player/mpv/releases/tag/v0.31.0 I'm looking into this now. Is anyone else? (no point multiple people looking into this) > On Sat, Jan 25, 2020 at 12:24 PM Martin Jansa > wrote: > > > * it's blacklisted with: > > mpv_0.26.0.bb:PNBLACKLIST[mpv] = "Needs forward porting to use python3" > > > > Signed-off-by: Martin Jansa > > --- > > meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > index 865cbb0bfc..d5789a758d 100644 > > --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb > > @@ -207,7 +207,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ > > sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ > > ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol > > xsp", "", d)} \ > > libmikmod \ > > -${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad > > faad2 mpv", "", d)} \ > > +${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad > > faad2", "", d)} \ > > " > > RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" > > > > -- > > 2.20.1 > > > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] glibc broken when linked with gold Was: State of OE World, 2019-03-16
An image built with gold fails on the hardware. I was able to build core-image-minimal with gold enabled: configuration: Build Configuration: BB_VERSION = "1.40.0" BUILD_SYS= "x86_64-linux" NATIVELSBSTRING = "opensuseleap-15.0" TARGET_SYS = "arm-oe-linux-gnueabi" MACHINE = "imx233-olinuxino-maxi" DISTRO = "nodistro" DISTRO_VERSION = "nodistro.0" TUNE_FEATURES= "arm armv5 thumb dsp" TARGET_FPU = "soft" meta-fsl-arm-extra = "master:b4d2c8462220e7038adffc0a151767ef8da07c5d" meta-freescale = "master:08173f472244817b85fe4af8ab2add7a0090b122" meta = "master:aeaca9bb1b1c8bf44818945dc4b2cbd6d4b5cef2" conf/local.conf addition: DISTRO_FEATURES_append = " ld-is-gold" When run, the kernel is unable to run init, and panics: [4.05] Freeing unused kernel memory: 308K [4.05] This architecture does not have kernel memory protection. [4.06] Run /sbin/init as init process [4.12] hub 1-1:1.0: USB hub found [4.13] hub 1-1:1.0: 3 ports detected [4.14] Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b [4.14] CPU: 0 PID: 1 Comm: init Not tainted 5.0.3-fslc+g20d8efe36350 #1 [4.14] Hardware name: Freescale MXS (Device Tree) [4.14] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [4.14] [] (show_stack) from [] (panic+0xec/0x2d8) [4.14] [] (panic) from [] (do_exit+0xa44/0xaa4) [4.14] [] (do_exit) from [] (do_group_exit+0x38/0xbc) [4.14] [] (do_group_exit) from [] (get_signal+0x110/0x98c) [4.14] [] (get_signal) from [] (do_work_pending+0x120/0x5fc) [4.14] [] (do_work_pending) from [] (slow_work_pending+0xc/0x20) [4.14] Exception stack(0xc343dfb0 to 0xc343dff8) [4.14] dfa0: bebd7f10 484113c4 48431fd0 [4.14] dfc0: 0934 00021504 bebd7f0c [4.14] dfe0: 48431fd0 bebd7ed0 48410a40 484113f4 0010 [4.14] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b ]--- -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] glibc broken when linked with gold Was: State of OE World, 2019-03-16
On Thu 2019-03-28 @ 03:40:33 PM, Martin Jansa wrote: > Send for oe-core: > https://patchwork.openembedded.org/patch/159874/ > but more information might be needed before it gets applied to oe-core > as discussed with RP. I'll try to get serial cable working on my Nexus 5 > to test it there in runtime, but maybe someone could beat me to it with > some more easily hackable 32bit arm board. > > > > Can someone confirm that glibc built with gold works for him on arm > > > (I haven't seen this on x86, aarch64)? Or should we just force bfd in > > > oe-core recipe? I have an Olimex imx233-olinuxino-maxi that I build for and test regularly (arm926ej-s, ARMv5). Yesterday I performed two builds from master with the following configuration: Build Configuration: BB_VERSION = "1.40.0" BUILD_SYS= "x86_64-linux" NATIVELSBSTRING = "opensuseleap-15.0" TARGET_SYS = "arm-oe-linux-gnueabi" MACHINE = "imx233-olinuxino-maxi" DISTRO = "nodistro" DISTRO_VERSION = "nodistro.0" TUNE_FEATURES= "arm armv5 thumb dsp" TARGET_FPU = "soft" meta-freescale = "master:08173f472244817b85fe4af8ab2add7a0090b122" meta-fsl-arm-extra = "master:b4d2c8462220e7038adffc0a151767ef8da07c5d" meta = "master:aeaca9bb1b1c8bf44818945dc4b2cbd6d4b5cef2" meta-oe meta-python meta-networking = "master:24dd9328f7ec964bbad25b7061366f9f2ff6194d" Both builds explicitly included gobject-introspection. The first build was done as-is (i.e. using the bfd linker). The second build had the following in conf/local.conf: DISTRO_FEATURES_append = " ld-is-gold" The default build succeeded. The gold build failed as expected while running qemu trying to build gobject-introspection. The good build boots on the hardware and runs fine (as far as I can tell): OpenEmbedded nodistro.0 imx233-olinuxino-maxi ttyAMA0 imx233-olinuxino-maxi login: root root@imx233-olinuxino-maxi:~# uname -a Linux imx233-olinuxino-maxi 5.0.3-fslc+g20d8efe36350 #1 Thu Mar 28 17:09:20 UTC 2019 armv5tejl armv5tejl armv5tejl GNU/Linux root@imx233-olinuxino-maxi:~# g-ir-compiler --help Usage: g-ir-compiler [OPTION?] Help Options: -h, --helpShow help options Application Options: --includedir include directories in GIR search path -o, --output=FILE output file -m, --module=NAME module to compile -l, --shared-library=FILE shared library --debug show debug messages --verbose show verbose messages -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] OE Summit report from SCaLE17x
Hi, Earlier this week I got back from SCaLE17x during which I taught an E-ALE class on Buildroot, was a TA for the other E-ALE classes, organized and ran the first ever (hopefully of more to come) OE Summit, and gave a general intro talk on OE. I wasn't planning on giving an OE talk at SCaLE, but the person who was supposed to talk wasn't able to make it. I had travelled to SCaLE with a backup talk prepared as a "plan B", and it was good that I did. I'm quite happy with how the inaugural OpenEmbedded Summit went. Everything went off without a hitch, and there was a lot of interaction and feedback between the speakers and the audience. We had 4 speakers: myself (Togan Labs): Using OE Drew Moseley (mender.io): Mechanisms for Enabling and Configuring WiFi in OE Alistair Francis (Western Digital): RISC-V and OE Jon Mason (ARM): Kernel Development Workflows Using OE Counting attendance is a bit tricky because people sometimes wander in and out. Do we count someone who wanders in partway through but leaves before the end? My talk was the least attended. I forgot to count the audience members (since I was giving the talk), but I did notice that a couple people wandered in during the talk. Behan counted 12; like I said, I didn't think to get a specific number myself. In any case, my talk wasn't in the programme, since I was filling in for someone who didn't make it to the conference. Drew's and Jon's talks had roughly 20 audience members each, and Alistair's talk was about 30. It's too bad the OE Summit was pitted against SCaLE's "Embedded Track". I think we ended up "competing" for audience members between the two of us. The OE Summit was put in a rather large room. Between teaching and helping out with E-ALE and running the OE Summit, I didn't attend a single talk at the conference nor spend time in any other part of the conference except for these two rooms (which were beside each other). I have been told anecdotally, however, that the attendance numbers we saw for the OE Summit were in-line with the numbers of attendees for several of the other talks, but I can't comment personally. As we were still setting up for my OE talk, the very first talk of the OE Summit, one of the audience members put up his hand and asked what the difference is between "Yocto" and "OE". We weren't specifically prepared to comment off-the-cuff about the relationship between the two projects; it's not as if we had a prepared statement to read on the topic. We tried to fumble through a satisfactory answer while remaining as neutral as possible on the topic. But it sure would be great if the two projects could get together and put out an official statement on the matter to which we could point all such curious people. Interestingly enough, this person was sure that The Yocto Project pre-dated OE, which we had to correct. Then he assumed these were two projects that had simply forked from each other at some point in the past. It was probably actually more confusing to him that OE and YP are two separate projects, but with almost all the same developers, working on almost all the same code. In any case, The Yocto Project's Community Manager was on-hand, thankfully, and I don't think he had any objections to any of the things we said in answering this question. My talk was a general introduction talk about OE, but all the other talks assumed the audience knew something about OE. This turned out to not be the case. Pretty much all the speakers had to field questions along the lines of "so what is OE anyway?". Sadly, in many cases, saying "it's like Buildroot" is often what would help the person asking the question the most. I think it's noteworthy that more people seem to know what Buildroot is, but not OE/YP. Although I realize this is just one conference, and a very small sample set, so it wouldn't be fair to generalize from these numbers. But it is true that these are the sorts of questions we were frequently asked, so it's noteworthy in that respect. Oddly enough, when I was finished the slides portion of the Buildroot class, the very first statement a student made was to complain about how terribly difficult Yocto is to learn and use. Why this came up in a class about Buildroot is confusing to me too, maybe he looked me up online and found my affiliation with OE? I don't know. I was careful to not mention the words "OE" or "Yocto" at all in my Buildroot talk. In any case, in his opinion, using Yocto requires a masters degree. Obviously he's exaggerating for effect. I'd like to personally thank the speakers who agreed to give a talk at a conference that didn't exist prior to last weekend, who worked hard on their talks, and who put together some very interesting presentations. I think we all walked away having learned a bit more about OE. I'd like to thank Behan and Tom King who helped organize. Behan who setup his recording equipment to record the talks (just in case there's an issue with
Re: [oe] OE Summit report from SCaLE17x
On Fri, Mar 15, 2019 at 10:27 AM Trevor Woerner wrote: > I'd like to thank the OE Board of Directors who > gave me permission to create and run a mini-conference on their behalf. > ... and provided funding!! (without which this event would never have been able to happen) So thanks to the Board for the funding, and to everyone who has contributed financially to OE who provide this funding. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] OE Summit @ SCaLE 17x - Sunday March 10th 2019 - Pasadena CA
On Thu, Jan 31, 2019 at 5:40 AM Andrea Galbusera wrote: > On Thu, Jan 31, 2019 at 8:26 AM Trevor Woerner wrote: > > The schedule for the OE Summit has been posted: > > https://www.socallinuxexpo.org/scale/17x/schedule/sunday > > https://www.socallinuxexpo.org/scale/17x/open-embedded-summit-0 > > To whoever can double check and fix the schedule... it looks like > there's a typo at the second link, where Alistair's talk is listed > twice. From the first link "Lokesh Kumar Goel > OpenEmbedded in LG Products" should be at 11.30am instead. > Thanks. There are a bunch of other snafus with the webpages (i.e. the title of Alistair's talk is actually "RISC-V and OpenEmbedded", and some of the links to the speakers' bios doesn't seem to work properly). I had notified the organizers even before I sent out this email, but didn't want to wait even longer to let everyone know about this event. Hopefully the organizers can get around to fixing them soon-ish. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] OE Summit @ SCaLE 17x - Sunday March 10th 2019 - Pasadena CA
We're excited to announce the inaugural "OpenEmbedded Summit" taking place Sunday March 10th 2019 as part of the Southern California Linux Expo (SCaLE) 17x at the Pasadena Convention Center. For the past few years there's been an ever-growing OpenEmbedded event as part of SCaLE. This year, with the missing Spring ELC, we felt it was time to do something more "formally" so OE enthusiasts could get together without having to wait until August. The initial suggestion for this summit came at last year's OEDEM in Edinburgh. At that time an idea was also floated to hold this year's OEDAM at the same time. Just to be absolutely clear: this suggestion was rejected; there will be no OEDAM at the OE Summit at SCaLE 17x. However, this summit is taking place with the full approval of the OpenEmbedded Board of Directors, many of whom have also been helping out with its organization. The schedule for the OE Summit has been posted: https://www.socallinuxexpo.org/scale/17x/schedule/sunday https://www.socallinuxexpo.org/scale/17x/open-embedded-summit-0 So if you're in the Southern California area, or are generally interested in hanging out with some OpenEmbedded people, please join us in Pasadena on March 10th! Your OE Summit organizing committee: Tom King Behan Webster Trevor Woerner -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [Openembedded-architecture] Dropping armv5 and armv5e tunes in 2.7
Hello Khem, Thanks for pointing this out. On Thu, Jan 3, 2019 at 5:02 PM Khem Raj wrote: > Secondly, I would also like to drop armv4t, and keep armv5te as lowest > supported tune > Fortunately I don't have any ARMv4 boards. But, just for informational purposes, I wanted to point out that I do have a couple ARM926EJ-S boards (i.MX233, LPC32xx) which are ARMv5TE which I am actively working with and maintaining. Therefore, thank you for keeping this one around. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] bpftool: add new recipe
On Wed, Jun 27, 2018 at 1:43 PM, Daniel Díaz wrote: > +PROVIDES = "virtual/bpftool" > I'm curious about the above PROVIDES line. Are there more bpftools other than the one in the linux kernel sources? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] bpftool: add new recipe
On Wed, Sep 19, 2018 at 12:36 AM, akuster808 wrote: > On 09/18/2018 09:23 PM, Trevor Woerner wrote: > > This recipe only works for kernels > 4.14-ish. > > Some BSP layers aren't there yet (e.g. meta-qcom, meta-raspberrypi) > > Is there an elegant way to handle this situation? > Can you rdpends on a kernel version ? > Interesting, I hadn't noticed versioned RDEPENDS before. I'm not sure what I'd use as the package. linux? linux-image? I've tried a bunch of variations on the following incantation, but nothing seems to trigger (testing specifically with rpi): RDEPENDS_${PN} = "kernel-image-zimage (>= 4.15)" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] bpftool: add new recipe
This recipe only works for kernels > 4.14-ish. Some BSP layers aren't there yet (e.g. meta-qcom, meta-raspberrypi) Is there an elegant way to handle this situation? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] OEDEM Sunday, 21 October 2018 in Edinburgh (before ELCE) - Update
On Thu, Sep 6, 2018 at 5:39 AM, Alexander Kanavin wrote: > And the link for signing up is...? :) > https://www.openembedded.org/wiki/OEDEM_2018 or email Armin -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] Add recipe for cereal, a header-only C++11 serialization library.
On Wed, Jun 27, 2018 at 7:44 AM, Fritjof Jonsson wrote: > meta/recipes-support/libcereal/libcereal_1.2.2.bb | 16 Is this recipe supposed to be orphaned all by itself in meta-openembedded/meta ?? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package
On Fri, May 25, 2018 at 10:45 PM, Trevor Woerner <twoer...@gmail.com> wrote: > Sounds good; I'll take a look. Thanks! > Oops, spoke too soon; looks like someone beat me to it :-) -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package
On Fri, May 25, 2018 at 3:58 PM, Andre McCurdy <armccu...@gmail.com> wrote: > On Fri, May 25, 2018 at 8:22 AM, Trevor Woerner <twoer...@gmail.com> > wrote: > > As Anuj pointed out with patch 16/17 of this series (opencv: rely on > > cmake.bbclass...), so too is this patch wrong and shouldn't be applied. > > Sorry! > > > > Looking closer at this recipe (on an unrelated issue) do we really want > the > > include files being part of FILES_${PN}? > > No, we don't. It looks like it's been done that way as a workaround > for the libeigen build not creating anything which would normally go > in the main package. Setting: > > ALLOW_EMPTY_${PN} = "1" > > together with careful review of the packaging rules and probably > removing the RDEPENDS and RRECOMMENDS over-rides may be a better > solution. > > You should also carefully check that things work as expected when > libeigen is added to an SDK. That's a corner case which tests > dependencies between runtime and -dev packages which isn't tested > during a normal build (for what it's worth, creating an empty runtime > package by using ALLOW_EMPTY_${PN} = "1" has always been the easiest > solution whenever I've looked into this kind of issue in the past and > it "just works" for the SDK case). > Sounds good; I'll take a look. Thanks! -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package
As Anuj pointed out with patch 16/17 of this series (opencv: rely on cmake.bbclass...), so too is this patch wrong and shouldn't be applied. Sorry! Looking closer at this recipe (on an unrelated issue) do we really want the include files being part of FILES_${PN}? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][master-next][PATCH v3 16/17] opencv: rely on cmake.bbclass to put cmake package files in dev package
On Thu, May 24, 2018 at 11:19 PM, Anuj Mittal <anuj.mit...@intel.com> wrote: > On 05/24/2018 10:38 PM, Trevor Woerner wrote: > > The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and > > ${datadir}/cmake end up in the dev package, so recipes no longer need to > > provide custom packaging rules to handles these files. > > > > http://git.openembedded.org/openembedded-core/commit/?id= > d91dc483a96e9d03cbbd21b8a546f9069c93 > > > > Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> > > Signed-off-by: Trevor Woerner <twoer...@gmail.com> > > --- > > meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb > b/meta-oe/recipes-support/opencv/opencv_3.3.bb > > index ca62de7c8f..1cadbdb533 100644 > > --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb > > +++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb > > @@ -167,7 +167,7 @@ PACKAGES_DYNAMIC += "^libopencv-.*" > > > > FILES_${PN} = "" > > FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* > ${datadir}/OpenCV/samples/bin/.debug/*" > > -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig > ${datadir}/OpenCV/*.cmake" > > ${datadir}/OpenCV/*.cmake won't be handled by the bbclass and if you > remove this change, *.cmake files in OpenCV directory will go to > ${PN}-apps which is probably not the intention here. > Good catch, thank you! -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5] Do_install_append() with qmake
Maybe IMAGE_POSTPROCESS_COMMAND might help? https://www.yoctoproject.org/docs/2.5/ref-manual/ref-manual.html#var-IMAGE_POSTPROCESS_COMMAND There's an example of using it in: https://github.com/resin-os/meta-resin/blob/master/meta-resin-common/recipes-core/images/resin-image.bb -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][master-next][PATCH 1/2] grpc: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb index e9491c45a9..4b6028dbfb 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb @@ -4,12 +4,11 @@ Provides gRPC libraries for multiple languages written on top of shared C core l HOMEPAGE = "https://github.com/grpc/grpc; SECTION = "libs" LICENSE = "Apache-2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl" DEPENDS_append_class-target = " gtest grpc-native " -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz \ file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \ -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][master-next][PATCH 2/2] c-ares: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb index defbeaa623..934c8454d5 100644 --- a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb +++ b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb @@ -4,13 +4,14 @@ HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/; SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f4b026880834eb01c035c5e5cb47ccac" -SRCREV = "3be1924221e1326df520f8498d704a5c4c8d0cce" + PV = "1.13.0+gitr${SRCPV}" SRC_URI = "\ git://github.com/c-ares/c-ares.git \ file://cmake-install-libcares.pc.patch \ " +SRCREV = "3be1924221e1326df520f8498d704a5c4c8d0cce" S = "${WORKDIR}/git" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 11/11] openobex: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index dcc2edf76e..3fb8cb1901 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -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 () { -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 08/11] msgpack-c: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb index 3ae4c1f879..690a7f444b 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb @@ -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 -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 09/11] json-spirit: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb index 3c1d8a9959..d6e42c81d5 100644 --- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb +++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb @@ -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 Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 10/11] capnproto: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- .../recipes-devtools/capnproto/capnproto_0.6.1.bb | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb index dfe19947c0..6ca3613db3 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb @@ -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" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 07/11] glm: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb index dc0081d031..7f16708edb 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb @@ -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 -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 02/11] libssh: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb index e5ea2b8bfa..6064969ae0 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb @@ -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 \ -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 06/11] openjpeg: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb index f749d62342..22b75d9623 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb @@ -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}" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 05/11] ceres-solver: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index a3444b934c..ad7c8f2a3b 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -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 -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 04/11] gflags: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb index b186326e9b..157123 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb @@ -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" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 01/11] poco: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/poco/poco_1.9.0.bb | 44 +++--- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/meta-oe/recipes-support/poco/poco_1.9.0.bb b/meta-oe/recipes-support/poco/poco_1.9.0.bb index 1016caef7c..a4f8a05188 100644 --- a/meta-oe/recipes-support/poco/poco_1.9.0.bb +++ b/meta-oe/recipes-support/poco/poco_1.9.0.bb @@ -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" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 00/11] 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(-) -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH 03/11] libftdi: variable cleanup
Reorder recipe variables according to: https://www.openembedded.org/wiki/Styleguide Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb index a1576b5617..98c5995a5f 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb @@ -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" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 01/17] libwebsockets: rely on cmake.bbclass to put cmake package files in dev package
On Mon 2018-05-21 @ 11:10:59 AM, Andre McCurdy wrote: > It hasn't been updated to give ordering for PACKAGECONFIG or > BBCLASSEXTEND but the conventions for those (based on recipes in > oe-core) seem to be: > > - PACKAGECONFIG lines go between "inherit ..." and EXTRA_OECONF > - BBCLASSEXTEND goes at the end of the recipe Done. Thanks for the pointers/tips :-) -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] meta-openembedded maintainer ship change.
Thanks to everyone for making this such a great community. Thanks especially to Armin and Khem (and all past and future maintainers of meta-openembedded!!) for allowing the project to keep moving forward. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 17/17] libeigen: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb b/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb index bc3b32e384..2ffaea63ad 100644 --- a/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb +++ b/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/eigen-eigen-5a0156e40feb" inherit cmake FILES_${PN} = "${includedir} ${libdir}" -FILES_${PN}-dev = "${datadir}/eigen3/cmake ${datadir}/cmake/Modules ${datadir}/pkgconfig" +FILES_${PN}-dev = "${datadir}/pkgconfig" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 16/17] opencv: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/opencv/opencv_3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb index ca62de7c8f..1cadbdb533 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb @@ -167,7 +167,7 @@ PACKAGES_DYNAMIC += "^libopencv-.*" FILES_${PN} = "" FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a" FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" FILES_${PN}-java = "${datadir}/OpenCV/java" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 15/17] libwebsockets: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb| 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb index ea262f855b..f38414862a 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb @@ -23,5 +23,4 @@ PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON, PACKAGES =+ "${PN}-testapps" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 14/17] libtinyxml2: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb index 8b5ab44fdd..c763a6c2b3 100644 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb @@ -12,6 +12,4 @@ S = "${WORKDIR}/git" inherit cmake -FILES_${PN}-dev += "${libdir}/cmake/" - BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 13/17] libssh: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb index 79e7dc5998..e5ea2b8bfa 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb @@ -30,5 +30,4 @@ do_configure_prepend () { || bbfatal "Failed to disable examples" } -FILES_${PN}-dev += "${libdir}/cmake" TOOLCHAIN = "gcc" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 12/17] libftdi: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb index 6bea16582f..a1576b5617 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.4.bb @@ -26,6 +26,4 @@ inherit cmake binconfig pkgconfig EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" -FILES_${PN}-dev += "${libdir}/cmake" - BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 08/17] glm: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb index 4e2ee23787..dc0081d031 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb @@ -22,7 +22,6 @@ inherit cmake EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON" -FILES_${PN}-dev += "${libdir}/cmake" RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 11/17] gflags: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb index 28b652a640..b186326e9b 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb @@ -10,8 +10,6 @@ SRCREV = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88" S = "${WORKDIR}/git" -FILES_${PN}-dev += "${libdir}/cmake" - inherit cmake EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 10/17] ceres-solver: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index 29917c8a14..a3444b934c 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -16,5 +16,3 @@ inherit cmake # Only a static library and headers are created ALLOW_EMPTY_${PN} = "1" - -FILES_${PN}-dev += "${libdir}/cmake/*" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 09/17] openjpeg: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb index 4ef1c408fd..f749d62342 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb @@ -17,5 +17,3 @@ DEPENDS = "libpng tiff lcms zlib" # standard path for *.cmake EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_PACKAGE_DIR=${baselib}/cmake \ -DOPENJPEG_INSTALL_LIB_DIR:PATH=${libdir}" - -FILES_${PN}-dev += "${libdir}/cmake/*.cmake" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 07/17] rapidjson: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 8ab35d224b..069385d5b0 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -20,7 +20,6 @@ EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJ # RapidJSON is a header-only C++ library, so the main package will be empty. -FILES_${PN}-dev += "${libdir}/cmake" RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 06/17] msgpack_c: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb index 02c0cd2964..3ae4c1f879 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb @@ -18,5 +18,3 @@ SRC_URI = "git://github.com/msgpack/msgpack-c \ inherit cmake pkgconfig S = "${WORKDIR}/git" - -FILES_${PN}-dev += "${libdir}/cmake/msgpack/*.cmake" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 02/17] rocksdb: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 9a2f9dd1c5..a3b06fd133 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -30,5 +30,3 @@ EXTRA_OECMAKE = "\ -DWITH_TESTS=OFF \ -DWITH_TOOLS=OFF \ " - -FILES_${PN}-dev += "${libdir}/cmake" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 05/17] librcf: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb index 267c0e79f5..dcd47a4e69 100644 --- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb @@ -47,7 +47,6 @@ PACKAGECONFIG[demos] = "-DLIBRCF_BUILD_DEMOS=ON,-DLIBRCF_BUILD_DEMOS=OFF," PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'demos', '${PN}-demos', '', d)}" FILES_${PN}-demos = "${bindir}/*" -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibRcf.cmake" BBCLASSEXTEND = "nativesdk" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 01/17] openobex: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 1b56685c57..dcc2edf76e 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -34,7 +34,7 @@ do_install_append () { PACKAGES =+ "openobex-apps" FILES_${PN}-apps = "${bindir}/*" FILES_${PN} += "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/openobex-config ${libdir}/cmake" +FILES_${PN}-dev += "${bindir}/openobex-config" DEBIAN_NOAUTONAME_${PN}-apps = "1" BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 04/17] json-spirit: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb index c7c1ad1eca..3c1d8a9959 100644 --- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb +++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb @@ -20,6 +20,4 @@ DEPENDS = "boost" inherit cmake -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibJsonSpirit.cmake" - BBCLASSEXTEND = "nativesdk" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 00/17] rely on cmake.bbclass to put cmake package files in dev package
v3: - break patches back up into individual patches for each recipe - avoid including fftw - find a couple extra recipes to patch: libwebsockets opencv libeigen v2: - re-spin Andre's patches to only include this change (i.e. rely on cmake.bbclass) without any formatting changes - re-base on top of master-next (changes location of grpc) - combine all such patches together into 2 patches (one for meta-oe, one for meta-networking) v1: - Andre's original patchset Trevor Woerner (17): openobex: rely on cmake.bbclass to put cmake package files in dev package rocksdb: rely on cmake.bbclass to put cmake package files in dev package capnproto: rely on cmake.bbclass to put cmake package files in dev package json-spirit: rely on cmake.bbclass to put cmake package files in dev package librcf: rely on cmake.bbclass to put cmake package files in dev package msgpack_c: rely on cmake.bbclass to put cmake package files in dev package rapidjson: rely on cmake.bbclass to put cmake package files in dev package glm: rely on cmake.bbclass to put cmake package files in dev package openjpeg: rely on cmake.bbclass to put cmake package files in dev package ceres-solver: rely on cmake.bbclass to put cmake package files in dev package gflags: rely on cmake.bbclass to put cmake package files in dev package libftdi: rely on cmake.bbclass to put cmake package files in dev package libssh: rely on cmake.bbclass to put cmake package files in dev package libtinyxml2: rely on cmake.bbclass to put cmake package files in dev package libwebsockets: rely on cmake.bbclass to put cmake package files in dev package opencv: rely on cmake.bbclass to put cmake package files in dev package libeigen: rely on cmake.bbclass to put cmake package files in dev package .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb | 1 - meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 2 +- meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 2 -- meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb | 1 - meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb| 2 -- meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 1 - meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 2 -- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 1 - meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb| 1 - meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 2 -- meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 2 -- meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 2 -- meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb | 2 +- meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 2 -- meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 1 - meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb| 2 -- meta-oe/recipes-support/opencv/opencv_3.3.bb| 2 +- 17 files changed, 3 insertions(+), 25 deletions(-) -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH v3 03/17] capnproto: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb index ffbe73feee..dfe19947c0 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb @@ -20,7 +20,6 @@ S = "${WORKDIR}/git/c++" PACKAGE_BEFORE_PN = "${PN}-compiler" RDEPENDS_${PN}-dev += "${PN}-compiler" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-compiler = "${bindir}" BBCLASSEXTEND = "native nativesdk" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][master-next][PATCH v3 2/2] c-ares: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb index 70e497f5f0..defbeaa623 100644 --- a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb +++ b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb @@ -18,7 +18,6 @@ inherit cmake pkgconfig PACKAGES =+ "${PN}-utils" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-utils = "${bindir}" BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][master-next][PATCH v3 1/2] grpc: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb index 0883ec176b..e9491c45a9 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb @@ -31,6 +31,4 @@ EXTRA_OECMAKE = " \ -DBUILD_SHARED_LIBS=ON \ " -FILES_${PN}-dev += "${libdir}/cmake" - BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][master-next][PATCH v3 0/2] rely on cmake.bbclass to put cmake package files in dev package
v3: - break patches back up into individual patches for each recipe - avoid including fftw v2: - re-spin Andre's patches to only include this change (i.e. rely on cmake.bbclass) without any formatting changes - combine all such patches together into 2 patches (one for meta-oe, one for meta-networking) v1: - Andre's original patchset Trevor Woerner (2): grpc: rely on cmake.bbclass to put cmake package files in dev package c-ares: rely on cmake.bbclass to put cmake package files in dev package meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb | 2 -- meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb | 1 - 2 files changed, 3 deletions(-) -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][master-next][PATCH] rely on cmake.bbclass to put cmake package files in dev package
On Sun, May 20, 2018 at 6:27 PM, Khem Raj <raj.k...@gmail.com> wrote: > Hi Trevor > > On Sat, May 19, 2018 at 7:41 PM, Trevor Woerner <twoer...@gmail.com> > wrote: > > > --- a/meta-oe/recipes-support/fftw/fftw_3.3.7.bb > > +++ b/meta-oe/recipes-support/fftw/fftw_3.3.7.bb > > @@ -74,7 +74,6 @@ FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom" > > FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom" > > FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" > > > > -FILES_${PN}-dev += "${libdir}/cmake" > > fftw can be built using both autotools and cmake, for OE we use autotools > therefore it does not inherit cmake, so please reinstate this change > in next version of patch. > No problem; thanks for the review! -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master-next][PATCH] rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb | 1 - meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 2 +- meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 2 -- meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb | 1 - meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb| 2 -- meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 1 - meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 2 -- meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 1 - meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb| 1 - meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 2 -- meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 2 -- meta-oe/recipes-support/fftw/fftw_3.3.7.bb | 1 - meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 2 -- meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb | 2 +- meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 2 -- meta-oe/recipes-support/libssh/libssh_0.7.3.bb | 1 - meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb| 2 -- meta-oe/recipes-support/opencv/opencv_3.3.bb| 2 +- 18 files changed, 3 insertions(+), 26 deletions(-) diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb index ea262f855b..f38414862a 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb @@ -23,5 +23,4 @@ PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON, PACKAGES =+ "${PN}-testapps" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*" diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 1b56685c57..dcc2edf76e 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -34,7 +34,7 @@ do_install_append () { PACKAGES =+ "openobex-apps" FILES_${PN}-apps = "${bindir}/*" FILES_${PN} += "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/openobex-config ${libdir}/cmake" +FILES_${PN}-dev += "${bindir}/openobex-config" DEBIAN_NOAUTONAME_${PN}-apps = "1" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 9a2f9dd1c5..a3b06fd133 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -30,5 +30,3 @@ EXTRA_OECMAKE = "\ -DWITH_TESTS=OFF \ -DWITH_TOOLS=OFF \ " - -FILES_${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb index ffbe73feee..dfe19947c0 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb @@ -20,7 +20,6 @@ S = "${WORKDIR}/git/c++" PACKAGE_BEFORE_PN = "${PN}-compiler" RDEPENDS_${PN}-dev += "${PN}-compiler" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-compiler = "${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb index c7c1ad1eca..3c1d8a9959 100644 --- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb +++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb @@ -20,6 +20,4 @@ DEPENDS = "boost" inherit cmake -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibJsonSpirit.cmake" - BBCLASSEXTEND = "nativesdk" diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb index 267c0e79f5..dcd47a4e69 100644 --- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb @@ -47,7 +47,6 @@ PACKAGECONFIG[demos] = "-DLIBRCF_BUILD_DEMOS=ON,-DLIBRCF_BUILD_DEMOS=OFF," PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'demos', '${PN}-demos', '', d)}" FILES_${PN}-demos = "${bindir}/*" -FILES_${
[oe] [meta-networking][master-next][PATCH 1/2] rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and ${datadir}/cmake end up in the dev package, so recipes no longer need to provide custom packaging rules to handles these files. http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93 Originally-conceived-by: Andre McCurdy <armccu...@gmail.com> Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb | 2 -- meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb | 1 - 2 files changed, 3 deletions(-) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb index 0883ec176b..e9491c45a9 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb @@ -31,6 +31,4 @@ EXTRA_OECMAKE = " \ -DBUILD_SHARED_LIBS=ON \ " -FILES_${PN}-dev += "${libdir}/cmake" - BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb index 70e497f5f0..defbeaa623 100644 --- a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb +++ b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb @@ -18,7 +18,6 @@ inherit cmake pkgconfig PACKAGES =+ "${PN}-utils" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-utils = "${bindir}" BBCLASSEXTEND = "native" -- 2.17.0.582.gccdcbd54c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 01/17] libwebsockets: rely on cmake.bbclass to put cmake package files in dev package
On Sat, May 19, 2018 at 7:59 AM, Peter Kjellerstedt < peter.kjellerst...@axis.com> wrote: > If you do, I think you should spin the patches for the clean ups as well. > At least I agree with (most) of them, and on a whole they definitely > improve the recipes. > > And I also agree with Andre, that in general it is too much trouble to > generate clean up patches in their own, which is why it might be better > to allow some clean ups together with actual changes. Otherwise they will > not happen, which in the long run deteriorate the overall state of the > recipes. > I'm happy to slowly go through the recipes and make formatting changes. What is the accepted canonical order of variables and segments in a recipe file? Oh, and did we agree on tabs, or spaces? /me ducks... -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 01/17] libwebsockets: rely on cmake.bbclass to put cmake package files in dev package
On Fri, May 18, 2018 at 6:28 PM, Andre McCurdywrote: > On Fri, May 18, 2018 at 2:01 PM, Khem Raj wrote: > > On Fri, May 18, 2018 at 12:07 PM, Andre McCurdy > wrote: > >> On Thu, May 17, 2018 at 6:56 PM, Khem Raj wrote: > >>> Hi Andre > >>> > >>> This series is fine, except that it has some formatting changes mixed > with > >>> cmake related changes. It would be preferable to have them as separate > >>> pulls. I reckon that both types of changes are good. > >> > >> The formatting cleanups are all minor and probably not worth > >> submitting on their own. > >> > > > > OK thats fine, drop then in v2 > > They are not worth reworking the patch set to create a v2 either :-) > It would be wonderful if we could agree on formatting; if we could, I'd certainly help by taking on some of the reformatting task. Unfortunately, all such past attempts of which I'm aware never got anywhere, and if I remember correctly, the Yocto folks and the OE folks each have their own ideas of what is "correct". In any case, if these won't get in as is, if Andre doesn't want to spin a v2 without the formatting changes, and everyone is okay with it, I could spin a v2 without the formatting changes. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][master-next][PATCH v2] grpc: switch away from github archive
Since we know that github archives which are automatically generated have a tendency to change their checksums[1], switch to using a git clone. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2017-September/114916.html Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- changes since v1: - rebase on master-next --- meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb index 0883ec176b..a0c943d114 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb @@ -10,13 +10,13 @@ DEPENDS_append_class-target = " gtest grpc-native " LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "db68cb3652cc7697647e9934b5316d98a6ba04d1" +BRANCH = "v1.8.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \ " -SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e" -SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de" - SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" inherit cmake -- 2.17.0.rc2.3.gc2a499e6c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] grpc: switch away from github archive
On Wed, May 16, 2018 at 3:37 PM, akuster808 <akuster...@gmail.com> wrote: > > > On 05/16/2018 10:19 AM, Trevor Woerner wrote: > > Since we know that github archives which are automatically generated > have a > > tendency to change their checksums[1], switch to using a git clone. > > > > [1] http://lists.openembedded.org/pipermail/openembedded-devel/ > 2017-September/114916.html > > This recipe is in the middle of moving to meta-networking ie in > master-next not yet merged to master. > > either the meta-networking maintainer will integrate or maybe a rebase > on master-next would be helpful?? > Sure, I can send a v2 rebased on master-next. Now that you've started a build test of master, maybe the rest of this janitorial cleanup should be done relative to master-next? > > thanks for the patch. > no problem! :-D -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gtest: switch away from github archive
Since we know that github archives which are automatically generated have a tendency to change their checksums[1], switch to using a git clone. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2017-September/114916.html Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-test/gtest/gtest_1.8.0.bb | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-test/gtest/gtest_1.8.0.bb b/meta-oe/recipes-test/gtest/gtest_1.8.0.bb index 483dc1f2e9..48cf4e04b0 100644 --- a/meta-oe/recipes-test/gtest/gtest_1.8.0.bb +++ b/meta-oe/recipes-test/gtest/gtest_1.8.0.bb @@ -7,16 +7,13 @@ LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd51 PROVIDES += "gmock" +S = "${WORKDIR}/git" +SRCREV = "ec44c6c1675c25b9827aacd08c02433cccde7780" SRC_URI = "\ -https://github.com/google/googletest/archive/release-${PV}.tar.gz \ +git://github.com/google/googletest.git;protocol=https; \ file://Add-pkg-config-support.patch \ " -SRC_URI[md5sum] = "16877098823401d1bf2ed7891d7dce36" -SRC_URI[sha256sum] = "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8" - -S = "${WORKDIR}/googletest-release-${PV}" - inherit cmake ALLOW_EMPTY_${PN} = "1" -- 2.17.0.rc2.3.gc2a499e6c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH v4 2/2] openh264: switch away from github archive
Since we know that github archives which are automatically generated have a tendency to change their checksums[1], switch to using a git clone. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2017-September/114916.html Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- changes since v3/v2: - v3 does not exist, but 2 x v2s do - no change changes since v1: - replace the frankenstein variable name "OPENHBRANCH" with the more sensible "BRANCH" --- .../recipes-multimedia/openh264/openh264_1.7.0.bb | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb index bf56ea1d84..c044cf33dc 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb @@ -10,9 +10,10 @@ LICENSE = "BSD-2-Clause" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" -SRC_URI = "https://github.com/cisco/openh264/archive/v${PV}.tar.gz; -SRC_URI[md5sum] = "93da4e76cfda7ede8fd2df51b0021efd" -SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f" +S = "${WORKDIR}/git" +SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" +BRANCH = "openh264v1.7" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -- 2.17.0.rc2.3.gc2a499e6c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH v4 1/2] openh264: fix build for 32-bit intel arch
Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- changes since v3: - v3 does not exist, the previous v2 was supposed to be v3 changes since v2: - switch += to _append changes since v1: - v1 does not exist for this patch, but as patch 2 of 2 for updating SRC_URI away from automatically-generated github archives --- .../recipes-multimedia/openh264/openh264_1.7.0.bb| 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb index a7aaab3623..bf56ea1d84 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb @@ -3,9 +3,8 @@ decoding. It is suitable for use in real time applications such as WebRTC." HOMEPAGE = "http://www.openh264.org/; SECTION = "libs/multimedia" -DEPENDS = "${@oe.utils.conditional('TARGET_ARCH', 'i386', 'nasm-native', \ - oe.utils.conditional('TARGET_ARCH', 'x86_64', 'nasm-native', \ - '', d), d)}" +DEPENDS_append_x86 = " nasm-native" +DEPENDS_append_x86-64 = " nasm-native" LICENSE = "BSD-2-Clause" LICENSE_FLAGS = "commercial" @@ -17,14 +16,14 @@ SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f68957 COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -COMPATIBLE_MACHINE_i386 = "(.*)" +COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)" COMPATIBLE_MACHINE_mips = "(.*)" COMPATIBLE_MACHINE_mips64 = "(.*)" EXTRA_OEMAKE_armv7a = "ARCH=arm" EXTRA_OEMAKE_aarch64 = "ARCH=arm64" -EXTRA_OEMAKE_i386 = "ARCH=i386" +EXTRA_OEMAKE_x86 = "ARCH=i386" EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" EXTRA_OEMAKE_mips = "ARCH=mips" EXTRA_OEMAKE_mips64 = "ARCH=mips64" -- 2.17.0.rc2.3.gc2a499e6c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-multimedia][PATCH v2 1/2] openh264: fix build for 32-bit intel arch
On Wed 2018-05-16 @ 01:32:53 PM, Trevor Woerner wrote: > > > EXTRA_OEMAKE_armv7a = "ARCH=arm" > > > EXTRA_OEMAKE_aarch64 = "ARCH=arm64" > > > -EXTRA_OEMAKE_i386 = "ARCH=i386" > > > +EXTRA_OEMAKE_x86 = "ARCH=i386" > > > > can you take another look if there are other options eg. i686 ? > > if in literal sense it means i386 then we should not be using it > > for newer i*86 arches. According to the README (https://github.com/cisco/openh264/blob/openh264v1.7/README.md#for-all-platforms) specifying "ARCH=i386" is this project's generic way of saying "32-bit x86 builds" (which is why the recipe needs to "translate" between x86 and i386). I'll send an updated v4 (this was actually supposed to be v3, oops!) with the += replaced with an _appends. thanks for reviewing! :-) -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-multimedia][PATCH v2 1/2] openh264: fix build for 32-bit intel arch
On Wed, May 16, 2018 at 1:10 PM, Khem Raj <raj.k...@gmail.com> wrote: > On Wed, May 16, 2018 at 10:06 AM, Trevor Woerner <twoer...@gmail.com> > wrote: > > Signed-off-by: Trevor Woerner <twoer...@gmail.com> > > --- > > .../recipes-multimedia/openh264/openh264_1.7.0.bb| 9 - > > 1 file changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_ > 1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb > > index a7aaab3623..d77de2876b 100644 > > --- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb > > +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb > > @@ -3,9 +3,8 @@ decoding. It is suitable for use in real time > applications such as WebRTC." > > HOMEPAGE = "http://www.openh264.org/; > > SECTION = "libs/multimedia" > > > > -DEPENDS = "${@oe.utils.conditional('TARGET_ARCH', 'i386', > 'nasm-native', \ > > - oe.utils.conditional('TARGET_ARCH', 'x86_64', > 'nasm-native', \ > > - '', d), d)}" > > +DEPENDS_x86 += "nasm-native" > > +DEPENDS_x86-64 += "nasm-native" > > > > if using overrides, perhaps using _append instead of += is better. > > ok > > LICENSE = "BSD-2-Clause" > > LICENSE_FLAGS = "commercial" > > @@ -17,14 +16,14 @@ SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2a > f7648b70d05bd5460c8b67f68957 > > > > COMPATIBLE_MACHINE_armv7a = "(.*)" > > COMPATIBLE_MACHINE_aarch64 = "(.*)" > > -COMPATIBLE_MACHINE_i386 = "(.*)" > > +COMPATIBLE_MACHINE_x86 = "(.*)" > > COMPATIBLE_MACHINE_x86-64 = "(.*)" > > COMPATIBLE_MACHINE_mips = "(.*)" > > COMPATIBLE_MACHINE_mips64 = "(.*)" > > > > EXTRA_OEMAKE_armv7a = "ARCH=arm" > > EXTRA_OEMAKE_aarch64 = "ARCH=arm64" > > -EXTRA_OEMAKE_i386 = "ARCH=i386" > > +EXTRA_OEMAKE_x86 = "ARCH=i386" > > can you take another look if there are other options eg. i686 ? > if in literal sense it means i386 then we should not be using it > for newer i*86 arches. > i'll take a look -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] grpc: switch away from github archive
Since we know that github archives which are automatically generated have a tendency to change their checksums[1], switch to using a git clone. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2017-September/114916.html Signed-off-by: Trevor Woerner <twoer...@gmail.com> --- meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb index 0883ec176b..a0c943d114 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb @@ -10,13 +10,13 @@ DEPENDS_append_class-target = " gtest grpc-native " LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "db68cb3652cc7697647e9934b5316d98a6ba04d1" +BRANCH = "v1.8.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \ " -SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e" -SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de" - SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" inherit cmake -- 2.17.0.rc2.3.gc2a499e6c -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel