[oe] OpenEmbedded Developer meeting April 8 after ELC/Yocto Project developer day
Yes, I am nagging. On the Friday after ELC in San Diego (Yocto Project Dev Day is Thursday), we will have a developer meeting near the conference venue Jefro has arranged for a room at the Marriot next to the conference venue, sponsored by the Yocto Project. OpenEmbedded would like to thank the Yocto Project for sponsoring the room. If you would like to sponsor a future meeting, let me know. Also, we can accept tax deductible contributions via Software in the Public Interest (http://spi-inc.org/). http://openembedded.org/wiki/OEDAM_2016 At these meetings we try to follow an agenda we develop before hand on the wiki page. I've created a rough agenda by posting notes from the meeting in Dublin. Everyone, please go over the notes and add remarks for completed items. Please add your name to the attendee list on the wiki. You'll need an account, I should get an email when you sign up, but nag me if it isn't approved quickly. I've seen some issues with the emails from the wiki. You can also bring up issues at the meeting. We only have one day scheduled for the meeting, so a little pre-planning helps keep us on time. Everyone involved in the project is welcome to attend, no how knowledgeable in the overall OpenEmbedded project We like to hear from people from many different use cases. Thanks for reading and we are looking forward to meeting new people! Philip -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][jethro][PATCH][V2] python-m2crypto: fix SSLv2 symbol issue
Hi, On Wed, Mar 9, 2016 at 11:18 AM, akuster808wrote: > > > > On 03/09/2016 11:11 AM, Martin Jansa wrote: > > On Wed, Mar 09, 2016 at 09:06:57AM -0800, Armin Kuster wrote: > >> From: Armin Kuster > >> > >> missed using "-D" for OPENSSL_NO_SSL2 swig_features. > > > > fido version: > > http://patchwork.openembedded.org/patch/117291/ > > needed -D as well, right? > > yes. > > > > > > I've pushed both to fido-next and jethro-next When will this be merged into fido/jethro? I've been running into this build breakage for about a week now and if I patch it myself, I'll only run into a conflict again later, causing more build issues. Thanks, - Pushpal > thanks > -armin > > > >> > >> ERROR: Failed to import the "M2Crypto" module: > >> .../usr/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined > >> symbol: SSLv2_method > >> > >> disable using SSLv2_method if not supported in openssl. This is now the > >> case > >> with the advent of CVE-2016-0800 > >> > >> Signed-off-by: Armin Kuster > >> --- > >> ...y_build_with_SSLv2_when_it_is_not_available.patch | 20 > >> > >> .../python/python-m2crypto_0.21.1.bb | 4 +++- > >> 2 files changed, 23 insertions(+), 1 deletion(-) > >> create mode 100644 > >> meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > >> > >> diff --git > >> a/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > >> > >> b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > >> new file mode 100644 > >> index 000..526c23f > >> --- /dev/null > >> +++ > >> b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch > >> @@ -0,0 +1,20 @@ > >> +Upstream-Status: Backport > >> +https://gitlab.com/m2crypto/m2crypto/commit/ac01b38302474920288c1a9eb63fd35fa8d1db5b > >> + > >> +Signed-off-by: Armin Kuster > >> + > >> +Index: M2Crypto-0.21.1/SWIG/_ssl.i > >> +=== > >> +--- M2Crypto-0.21.1.orig/SWIG/_ssl.i > >> M2Crypto-0.21.1/SWIG/_ssl.i > >> +@@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string > >> + %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long; > >> + extern const char *SSL_alert_desc_string_long(int); > >> + > >> ++#ifndef OPENSSL_NO_SSL2 > >> + %rename(sslv2_method) SSLv2_method; > >> + extern SSL_METHOD *SSLv2_method(void); > >> ++#endif > >> + %rename(sslv3_method) SSLv3_method; > >> + extern SSL_METHOD *SSLv3_method(void); > >> + %rename(sslv23_method) SSLv23_method; > >> diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> index ff6203f..9daea5e 100644 > >> --- a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb > >> @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = > >> "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" > >> > >> SRC_URI = > >> "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ > >> > >> file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ > >> - file://0001-M2Crypto-Error-fix.patch" > >> + file://0001-M2Crypto-Error-fix.patch \ > >> + > >> file://dont_try_build_with_SSLv2_when_it_is_not_available.patch" > >> > >> SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" > >> SRC_URI[sha256sum] = > >> "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" > >> @@ -19,6 +20,7 @@ inherit setuptools > >> > >> SWIG_FEATURES_x86-64 = "-D__x86_64__" > >> SWIG_FEATURES ?= "" > >> +SWIG_FEATURES += "-DOPENSSL_NO_SSL2" > >> export SWIG_FEATURES > >> > >> # Get around a problem with swig, but only if the > >> -- > >> 2.3.5 > >> > >> -- > >> ___ > >> 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] State of bitbake world, Failed tasks 2016-03-12
On Mon, Mar 14, 2016 at 12:06 PM, Martin Jansawrote: > Blacklisting linux-yocto-tiny and linux-yocto-tiny-kexecboot helped > with random failures in qemux86* builds > > == Tested changes (not included in master yet) - bitbake == > 0eacf83 world-image: add extra target > > == Tested changes (not included in master yet) - openembedded-core == > a780836 base.bbclass: Introduce EXTRA_CONF_PACKAGECONFIG variable > a5bbd85 recipes: Replace "cp -a" with "cp -R --no-dereference > --preserve=mode,links" > 9008d90 sstate-sysroot-cruft.sh: Extend the whitelist > 1120aa7 qemux86: Add identical qemux86copy variant for tests > 03118aa report-error: Allow to upload reports automatically > dd626c4 arch-armv7ve.inc: respect armv7a override as well > e6ee471 Revert "gstreamer1.0-plugins-XXX: move inherit gettext into common > .inc file" > bdd884f musl: disable building of gobject introspection data > 20664e4 machine/include/arch-x86: Make x32 ABI not supporting > gobject-introspection-data > d90f3de bitbake.conf: add 'gobject-introspection-data' to > DISTRO/MACHINE_FEATURES_BACKFILL > 74a2009 packagegroup-core-x11-sato: add python-pygobject and gtk+3 > 2c7f859 webkitgtk: enable gobject introspection > 9852c8a recipes-gnome: fix introspection support > e2304e5 python-pygobject: update to 3.18.2 > d3936fb gnomebase.bbclass: do not disable gobject introspection > a4ee4f5 gstreamer: enable gobject introspection > def43fd libsoup-2.4: enable gobject introspection > 93df729 clutter: enable gobject introspection > 643f85a gtk+3: enable gobject-introspection > 0734f01 gtk+: enable gobject introspection > a256cc0 avahi: enable gobject-introspection > d3c113a python-pygtk: remove the recipe > 7ee6b12 avahi-ui: remove the dependency on python-pygtk by disabling > avahi-discover > e8d093f vala.bbclass: remove pre-packaged vapigen.m4 from tarballs > 7d96429 vala: enable the use of vapigen by packages with vala support > 1b5e580 gobject-introspection.bbclass: add a class that enables gobject > introspection > 4c7a3b6 gtk-doc-stub: remove introspection stubs > d308fc7 gobject-introspection: add the recipe > 891e17c xcursor-transparent-theme: upgrade to latest git revision > > == Tested changes (not included in master yet) - meta-openembedded == > 20fc729 luajit: depend on luajit-native to provide host lua > 9fe6c7b synergy: add dependency on openssl > 9090641 compat-wireless: Remove > c6946f4 synergy: add dependency on curl > 9c465c0 synergy: add dependency on unzip-native > 09b8556 system-config-keyboard: inherit gettext and add dependency on > intltool-native > 8200885 dfu-util: upgrade to 0.9 > eec2938 dfu-util: fix .patch files > 4f1cc7a mpv: Media Player > 656f7a7 postgresql: Security Advisory-postgresql-CVE-2016-0766 > d016d0f python-m2crypto: fix build issue > c3eec9a gnome-panel: fix gobject introspection > 19f7ccb network-manager-applet: fix gobject introspection > 9923037 nautilus: fix gobject introspection > 560f30f libgtop: fix gobject introspection > 99b775c libgdata: fix gobject introspection > 8d71c8b gnome-menus: fix gobject introspection > 82351e9 python-dbusmock: use real introspection instead on legacy pygobject > 600612d upower: fix gobject introspection > c35dca4 udisks2: fix gobject introspection > 8775ef2 poppler: fix gobject introspection > 43d3403 omgps: remove the recipe > 6c58e96 gimp: accept newer versins of babl and gegl > 6dcb35a gegl: update to 0.3.4 > 939dce3 babl: update to 0.1.16 > 14c4edf libunique: fix gobject introspection support > 45a3f19 gtkextra: fix gobject introspection support > c636d68 polkit: fix gobject introspection support > 9b7ab4f libgee: fix gobject introspection support > e7f52a9 telepathy-glib: fix gobject introspection support > 8e95a7b networkmanager: fix introspection and vala support > 0232ca1 modemmanager: fix vala support > eb0be9e bluez4: use real introspection instead of legacy pygobject > 89919ba libmediaart: fix gobject introspection > 4b6ea5a gstreamer-0.10: disable gobject introspection > 90c6649 python-gst: remove the 0.10 recipe > 2c42b1e media-service-demo: remove the recipe > a8fa606 rygel: fix gobject introspection > f1c7047 gupnp: fix gobject introspection > a76eb61 tracker: fix gobject introspection > 079bb24 goffice: fix gobject introspection > 1fbbbeb libxklavier: fix gobject introspection > c6a5df4 libwnck: fix gobject introspection > cb6d349 libgsf: fix gobject introspection > 7dd50b3 gnumeric: fix gobject introspection support > fe0cde2 gnome-desktop: remove pygtk dependency > d029108 gnome-bluetooth: update to 3.18.2 > 86e7b8b evince: update to 3.18.2 > 2fdc117 evolution-data-server: fix gobject introspection Looks as if the gobject introspection transition is close to painless - wow - hope to find time for test... Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-openembedded][FIDO PATCH 1/1] ruby: Fixed runtime error
Hi, 2016-01-21 15:57 GMT+01:00 akuster808: > thanks, > > I will add this to my queue and let you know when staged for merging. any news on this? Best, Christian > > -- armin > > On 01/21/2016 02:39 AM, Christian Ege wrote: >> From 6d2c2b602185a03232635a9c5c97253930c2bc0b Mon Sep 17 00:00:00 2001 >> From: Daniel Schnell >> Date: Wed, 14 Oct 2015 14:49:52 +0200 >> Subject: [meta-openembedded][FIDO PATCH 1/1] ruby: Fixed runtime error >> >> Only include "enable-wide-getaddrinfo" if IVP6 is enabled in disto >> feature otherwise 'gem install rails' throws an error >> for the missing symbol 'getipnodebyname' >> >> This is a backport of master branch commit >> 86835b4ac5ee593e8bd5b142504194370df71728 >> to make any gem installation possible. >> >> Signed-off-by: Daniel Schnell >> Signed-off-by: Christian Ege >> --- >> meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb |3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb >> b/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb >> index 080d455..ccb7cbc 100644 >> --- a/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb >> +++ b/meta-ruby/recipes-devtools/ruby/ruby_2.2.1.bb >> @@ -9,11 +9,12 @@ SRC_URI[sha256sum] = >> "5a4de38068eca8919cb087d338c0c2e3d72c9382c804fb27ab746e6c78 >> UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo" >> >> PACKAGECONFIG ??= "" >> +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', >> 'ipv6', '', d)}" >> PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, >> valgrind" >> PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp" >> +PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo," >> >> EXTRA_OECONF = "\ >> ---enable-wide-getaddrinfo \ >> --disable-versioned-paths \ >> --disable-rpath \ >> --disable-dtrace \ >> > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- http://ch.ege.io/ -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] Migrating from OE-classic to OE-core
Hi All, (not sure if this is the right place to ask this) Does anyone have experience with migrating from OE-classic to OE-core? Did you? How did you do it? As I see it now, my only option seems to be flashing the unit, but perhaps there is another approach? Thanks, Jaap -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 4/4] opencv: Fix pkg-config file.
It was pointing to the wrong location Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch | 12 meta-oe/recipes-support/opencv/opencv_3.1.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch new file mode 100644 index ..4ac3e888e1f0 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index b8cb8777c06b..081c62dafd77 100644 +--- a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +@@ -66,6 +66,7 @@ ocv_list_unique(_3rdparty) + + set(OPENCV_PC_LIBS + "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" ++ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" + "${_modules}" + ) + if (BUILD_SHARED_LIBS) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 9fd3b12e3631..c403852cf405 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -16,7 +16,8 @@ SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" SRCREV_FORMAT = "opencv" SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ - git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib" + git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \ + file://fixpkgconfig.patch" PV = "3.1+git${SRCPV}" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 3/4] opencv: Update to version 3.1
The first major update in 3.0 release series Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_3.0.bb => opencv_3.1.bb} (97%) diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb similarity index 97% rename from meta-oe/recipes-support/opencv/opencv_3.0.bb rename to meta-oe/recipes-support/opencv/opencv_3.1.bb index 1a34efa7f01f..9fd3b12e3631 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -10,15 +10,15 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEFAULT_PREFERENCE = "-1" -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" +DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69" -SRCREV_contrib = "844c30e8b2f2f4b34b96a169fafe9beea3c45e87" +SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" +SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" SRCREV_FORMAT = "opencv" SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib" -PV = "3.0+git${SRCPV}" +PV = "3.1+git${SRCPV}" S = "${WORKDIR}/git" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/4] opencv: Remove blacklist
Version 3.0 builds fine with ffmpeg v3 [ 32%] Building CXX object modules/videoio/CMakeFiles/opencv_videoio.dir/src/cap_ffmpeg.cpp.o DEBUG: Shell function do_compile finished Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.0.bb | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb index f6c4ca8fac16..1a34efa7f01f 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -130,7 +130,4 @@ do_install_append() { install -d ${D}${datadir}/OpenCV/samples/bin/ cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ -} - -# http://errors.yoctoproject.org/Errors/Details/40660/ -PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3" +} \ No newline at end of file -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 1/4] opencv_3: Fix use before set error on meta package
This bug was introducing a loop dependency of opencv->opencv that was confusing dpkg. Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb index 99ca8b35727d..f6c4ca8fac16 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -86,8 +86,8 @@ python populate_packages_prepend () { metapkg_rdepends.append(pkg) d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) -blacklist = [ metapkg ] metapkg = pn +blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') : -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 3/4] opencv: Update to version 3.1
On Mon, Mar 14, 2016 at 11:32:23AM +0100, Ricardo Ribalda Delgado wrote: > The first major update in 3.0 release series Fails to apply. Please resend with -M. > > Signed-off-by: Ricardo Ribalda Delgado> --- > meta-oe/recipes-support/opencv/opencv_3.0.bb | 133 > --- > meta-oe/recipes-support/opencv/opencv_3.1.bb | 133 > +++ > 2 files changed, 133 insertions(+), 133 deletions(-) > delete mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb > create mode 100644 meta-oe/recipes-support/opencv/opencv_3.1.bb > > diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb > b/meta-oe/recipes-support/opencv/opencv_3.0.bb > deleted file mode 100644 > index 1a34efa7f01f.. > --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb > +++ /dev/null > @@ -1,133 +0,0 @@ > -SUMMARY = "Opencv : The Open Computer Vision Library" > -HOMEPAGE = "http://opencv.org/; > -SECTION = "libs" > - > -LICENSE = "BSD-3-Clause" > -LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" > - > -ARM_INSTRUCTION_SET_armv4 = "arm" > -ARM_INSTRUCTION_SET_armv5 = "arm" > - > -DEFAULT_PREFERENCE = "-1" > - > -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" > - > -SRCREV_opencv = "424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69" > -SRCREV_contrib = "844c30e8b2f2f4b34b96a169fafe9beea3c45e87" > -SRCREV_FORMAT = "opencv" > -SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ > - > git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib" > - > -PV = "3.0+git${SRCPV}" > - > -S = "${WORKDIR}/git" > - > -EXTRA_OECMAKE = > "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include > \ > - -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ > - -DWITH_1394=OFF \ > - -DCMAKE_SKIP_RPATH=ON \ > - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", > "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ > - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", > "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 > -DENABLE_SSE41=1", "", d)} \ > - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", > "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 > -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ > - ${@base_conditional("libdir", "/usr/lib64", > "-DLIB_SUFFIX=64", "", d)} \ > - ${@base_conditional("libdir", "/usr/lib32", > "-DLIB_SUFFIX=32", "", d)} \ > -" > - > -PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ > - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", > d)} \ > -${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", > "commercial", "libav", "", d)}" > - > -PACKAGECONFIG[amdblas] = > "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," > -PACKAGECONFIG[amdfft] = > "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," > -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," > -PACKAGECONFIG[gstreamer] = > "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 > gstreamer1.0-plugins-base," > -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," > -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," > -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," > -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," > -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," > -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers," > -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include > -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux > -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include > -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so > -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native > oracle-jse-jdk oracle-jse-jdk-native," > -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," > -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON > -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," > -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," > -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," > -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," > - > -inherit distutils-base pkgconfig cmake > - > -export BUILD_SYS > -export HOST_SYS > -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" > -export PYTHON="${STAGING_BINDIR_NATIVE}/python" > -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" > -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" > - > -TARGET_CC_ARCH += "-I${S}/include " > - > -PACKAGES += "${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples > ${PN}-apps python-opencv" > - > -python populate_packages_prepend () { > -cv_libdir = d.expand('${libdir}') > -cv_libdir_dbg =
[oe] State of bitbake world, Failed tasks 2016-03-12
Blacklisting linux-yocto-tiny and linux-yocto-tiny-kexecboot helped with random failures in qemux86* builds == Tested changes (not included in master yet) - bitbake == 0eacf83 world-image: add extra target == Tested changes (not included in master yet) - openembedded-core == a780836 base.bbclass: Introduce EXTRA_CONF_PACKAGECONFIG variable a5bbd85 recipes: Replace "cp -a" with "cp -R --no-dereference --preserve=mode,links" 9008d90 sstate-sysroot-cruft.sh: Extend the whitelist 1120aa7 qemux86: Add identical qemux86copy variant for tests 03118aa report-error: Allow to upload reports automatically dd626c4 arch-armv7ve.inc: respect armv7a override as well e6ee471 Revert "gstreamer1.0-plugins-XXX: move inherit gettext into common .inc file" bdd884f musl: disable building of gobject introspection data 20664e4 machine/include/arch-x86: Make x32 ABI not supporting gobject-introspection-data d90f3de bitbake.conf: add 'gobject-introspection-data' to DISTRO/MACHINE_FEATURES_BACKFILL 74a2009 packagegroup-core-x11-sato: add python-pygobject and gtk+3 2c7f859 webkitgtk: enable gobject introspection 9852c8a recipes-gnome: fix introspection support e2304e5 python-pygobject: update to 3.18.2 d3936fb gnomebase.bbclass: do not disable gobject introspection a4ee4f5 gstreamer: enable gobject introspection def43fd libsoup-2.4: enable gobject introspection 93df729 clutter: enable gobject introspection 643f85a gtk+3: enable gobject-introspection 0734f01 gtk+: enable gobject introspection a256cc0 avahi: enable gobject-introspection d3c113a python-pygtk: remove the recipe 7ee6b12 avahi-ui: remove the dependency on python-pygtk by disabling avahi-discover e8d093f vala.bbclass: remove pre-packaged vapigen.m4 from tarballs 7d96429 vala: enable the use of vapigen by packages with vala support 1b5e580 gobject-introspection.bbclass: add a class that enables gobject introspection 4c7a3b6 gtk-doc-stub: remove introspection stubs d308fc7 gobject-introspection: add the recipe 891e17c xcursor-transparent-theme: upgrade to latest git revision == Tested changes (not included in master yet) - meta-openembedded == 20fc729 luajit: depend on luajit-native to provide host lua 9fe6c7b synergy: add dependency on openssl 9090641 compat-wireless: Remove c6946f4 synergy: add dependency on curl 9c465c0 synergy: add dependency on unzip-native 09b8556 system-config-keyboard: inherit gettext and add dependency on intltool-native 8200885 dfu-util: upgrade to 0.9 eec2938 dfu-util: fix .patch files 4f1cc7a mpv: Media Player 656f7a7 postgresql: Security Advisory-postgresql-CVE-2016-0766 d016d0f python-m2crypto: fix build issue c3eec9a gnome-panel: fix gobject introspection 19f7ccb network-manager-applet: fix gobject introspection 9923037 nautilus: fix gobject introspection 560f30f libgtop: fix gobject introspection 99b775c libgdata: fix gobject introspection 8d71c8b gnome-menus: fix gobject introspection 82351e9 python-dbusmock: use real introspection instead on legacy pygobject 600612d upower: fix gobject introspection c35dca4 udisks2: fix gobject introspection 8775ef2 poppler: fix gobject introspection 43d3403 omgps: remove the recipe 6c58e96 gimp: accept newer versins of babl and gegl 6dcb35a gegl: update to 0.3.4 939dce3 babl: update to 0.1.16 14c4edf libunique: fix gobject introspection support 45a3f19 gtkextra: fix gobject introspection support c636d68 polkit: fix gobject introspection support 9b7ab4f libgee: fix gobject introspection support e7f52a9 telepathy-glib: fix gobject introspection support 8e95a7b networkmanager: fix introspection and vala support 0232ca1 modemmanager: fix vala support eb0be9e bluez4: use real introspection instead of legacy pygobject 89919ba libmediaart: fix gobject introspection 4b6ea5a gstreamer-0.10: disable gobject introspection 90c6649 python-gst: remove the 0.10 recipe 2c42b1e media-service-demo: remove the recipe a8fa606 rygel: fix gobject introspection f1c7047 gupnp: fix gobject introspection a76eb61 tracker: fix gobject introspection 079bb24 goffice: fix gobject introspection 1fbbbeb libxklavier: fix gobject introspection c6a5df4 libwnck: fix gobject introspection cb6d349 libgsf: fix gobject introspection 7dd50b3 gnumeric: fix gobject introspection support fe0cde2 gnome-desktop: remove pygtk dependency d029108 gnome-bluetooth: update to 3.18.2 86e7b8b evince: update to 3.18.2 2fdc117 evolution-data-server: fix gobject introspection e457f00 efl-native: add dependency on openssl 057ea15 python-m2crypt: update package to 0.23.0 c28a359 libao: update to 1.2.0 7256c9d nginx: update to 1.9.12 0f43680 pptp-linux: update to 1.8.0 ff55769 dnsmasq: steal resolvconf support from Ubuntu febc48e wireshark: 2.0.2 update including security == Tested changes (not included in master yet) - meta-qt5 == b2d5376 Change dependency from virtual/mesa to drm in the kms packageconfig. 06bfff5 qtwebengine: enable ARMv7VE support 2a998cc Add .gitignore to ignore .pyc/.pyo files 3eae3fe qmake5_base: use remove-libtool bbclass bc54e23
[oe] [meta-oe][PATCH 4/4] opencv: Fix pkg-config file.
It was pointing to the wrong location Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch | 12 meta-oe/recipes-support/opencv/opencv_3.1.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch diff --git a/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch new file mode 100644 index ..4ac3e888e1f0 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index b8cb8777c06b..081c62dafd77 100644 +--- a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +@@ -66,6 +66,7 @@ ocv_list_unique(_3rdparty) + + set(OPENCV_PC_LIBS + "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" ++ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" + "${_modules}" + ) + if (BUILD_SHARED_LIBS) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 9fd3b12e3631..c403852cf405 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -16,7 +16,8 @@ SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" SRCREV_FORMAT = "opencv" SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ - git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib" + git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \ + file://fixpkgconfig.patch" PV = "3.1+git${SRCPV}" -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/4] opencv: Update to version 3.1
The first major update in 3.0 release series Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.0.bb | 133 --- meta-oe/recipes-support/opencv/opencv_3.1.bb | 133 +++ 2 files changed, 133 insertions(+), 133 deletions(-) delete mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb create mode 100644 meta-oe/recipes-support/opencv/opencv_3.1.bb diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb deleted file mode 100644 index 1a34efa7f01f.. --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ /dev/null @@ -1,133 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/; -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -DEFAULT_PREFERENCE = "-1" - -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0" - -SRCREV_opencv = "424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69" -SRCREV_contrib = "844c30e8b2f2f4b34b96a169fafe9beea3c45e87" -SRCREV_FORMAT = "opencv" -SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ - git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib" - -PV = "3.0+git${SRCPV}" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ --DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ -" - -PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" - -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," - -inherit distutils-base pkgconfig cmake - -export BUILD_SYS -export HOST_SYS -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/python" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" - -python populate_packages_prepend () { -cv_libdir = d.expand('${libdir}') -cv_libdir_dbg = d.expand('${libdir}/.debug') -do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) -do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') -do_split_packages(d, cv_libdir,
[oe] [meta-oe][PATCH 2/4] opencv: Remove blacklist
Version 3.0 builds fine with ffmpeg v3 [ 32%] Building CXX object modules/videoio/CMakeFiles/opencv_videoio.dir/src/cap_ffmpeg.cpp.o DEBUG: Shell function do_compile finished Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.0.bb | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb index f6c4ca8fac16..1a34efa7f01f 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -130,7 +130,4 @@ do_install_append() { install -d ${D}${datadir}/OpenCV/samples/bin/ cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ -} - -# http://errors.yoctoproject.org/Errors/Details/40660/ -PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3" +} \ No newline at end of file -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/4] opencv_3: Fix use before set error on meta package
This bug was introducing a loop dependency of opencv->opencv that was confusing dpkg. Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb index 99ca8b35727d..f6c4ca8fac16 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -86,8 +86,8 @@ python populate_packages_prepend () { metapkg_rdepends.append(pkg) d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) -blacklist = [ metapkg ] metapkg = pn +blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') : -- 2.7.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v4 2/3] nginx: add stable version 1.8.1 as alternative to the mainline version 1.9.x
The 1.8 branch is the current stable branch of nginx. This means the branch doesn't get new features, but is still supported with bugfixes. Depending on the use case it is more suitable to use on an embedded device than the 1.9 branch which adds new features with every release. Signed-off-by: Pascal Bach--- meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +- meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb | 6 ++ meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 53e3235..2169b67 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -6,7 +6,7 @@ concurrency, performance and low memory usage." HOMEPAGE = "http://nginx.org/; LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + SECTION = "net" DEPENDS = "libpcre gzip openssl" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb new file mode 100644 index 000..089f547 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3845852aedfa8d6d7765f55d06cc3ebd" + +SRC_URI[md5sum] = "2e91695074dbdfbf1bcec0ada9fda462" +SRC_URI[sha256sum] = "8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7" diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb index d76bd9e..3b9d26f 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb @@ -1,5 +1,7 @@ require nginx.inc +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + SRC_URI[md5sum] = "76eb5853a1190e0cfc691aa21c545de3" SRC_URI[sha256sum] = "6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b368a51f" -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v4 3/3] nginx: make the 1.8.x branch the default
The 1.9.x branch is still supported but it needs to be explicitly selected. Signed-off-by: Pascal Bach--- meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb index 3b9d26f..3eec0f9 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb @@ -1,5 +1,9 @@ require nginx.inc +# 1.9.x is the current mainline branches containing all new features +# 1.8.x branch is the current stable branch, the recommended default +DEFAULT_PREFERENCE = "-1" + LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" SRC_URI[md5sum] = "76eb5853a1190e0cfc691aa21c545de3" -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH v4 1/3] nginx: split parts out of the recipe into nginx.inc
nginx has two maintained branches. - stable: is the long term maintained branch where only bugfixes occur - mainline: is the branch where new features get added This change is in preparation to support these two branches. Signed-off-by: Pascal Bach--- meta-webserver/recipes-httpd/nginx/nginx.inc | 137 + meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 137 + 2 files changed, 139 insertions(+), 135 deletions(-) create mode 100644 meta-webserver/recipes-httpd/nginx/nginx.inc diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc new file mode 100644 index 000..53e3235 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -0,0 +1,137 @@ +SUMMARY = "HTTP and reverse proxy server" + +DESCRIPTION = "Nginx is a web server and a reverse proxy server for \ +HTTP, SMTP, POP3 and IMAP protocols, with a strong focus on high \ +concurrency, performance and low memory usage." + +HOMEPAGE = "http://nginx.org/; +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" +SECTION = "net" + +DEPENDS = "libpcre gzip openssl" + +SRC_URI = " \ + http://nginx.org/download/nginx-${PV}.tar.gz \ + file://nginx-cross.patch \ + file://nginx.conf \ + file://nginx.init \ + file://nginx-volatile.conf \ + file://nginx.service \ +" + +inherit update-rc.d useradd + +CFLAGS_append = " -fPIE -pie" +CXXFLAGS_append = " -fPIE -pie" + +NGINX_WWWDIR ?= "${localstatedir}/www/localhost" +NGINX_USER ?= "www" + +EXTRA_OECONF = "" +DISABLE_STATIC = "" + +do_configure () { + if [ "${SITEINFO_BITS}" = "64" ]; then + PTRSIZE=8 + else + PTRSIZE=4 + fi + + echo $CFLAGS + echo $LDFLAGS + + ./configure \ + --crossbuild=Linux:${TUNE_ARCH} \ + --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-int=4 \ + --with-long=${PTRSIZE} \ + --with-long-long=8 \ + --with-ptr-size=${PTRSIZE} \ + --with-sig-atomic-t=${PTRSIZE} \ + --with-size-t=${PTRSIZE} \ + --with-off-t=${PTRSIZE} \ + --with-time-t=${PTRSIZE} \ + --with-sys-nerr=132 \ + --conf-path=${sysconfdir}/nginx/nginx.conf \ + --http-log-path=${localstatedir}/log/nginx/access.log \ + --error-log-path=${localstatedir}/log/nginx/error.log \ + --pid-path=/run/nginx/nginx.pid \ + --prefix=${prefix} \ + --with-http_ssl_module \ + --with-http_gzip_static_module \ + ${EXTRA_OECONF} +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + rm -fr ${D}${localstatedir}/run ${D}/run + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN} - - - -" \ +> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + install -d ${D}${sysconfdir}/${BPN} + ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run + install -d ${D}${NGINX_WWWDIR} + mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ + chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx + + install -d ${D}${sysconfdir}/nginx + install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf + install -d ${D}${sysconfdir}/nginx/sites-enabled + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx + +if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ +sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ +-e 's,@LOCALSTATEDIR@,${localstatedir},g' \ +-e 's,@BASEBINDIR@,${base_bindir},g' \ +${D}${systemd_unitdir}/system/nginx.service +fi +} + +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} + +FILES_${PN} += "${localstatedir}/ \ +