Re: [oe] [meta-oe][PATCH] qt-creator: avoid conflicts with meta-qt5's qt5-creator
On Thu, Mar 05, 2015 at 09:57:37PM +0100, Andreas Müller wrote: On Thu, Mar 5, 2015 at 7:01 PM, Martin Jansa martin.ja...@gmail.com wrote: On Sun, Mar 01, 2015 at 11:23:44PM +0100, Andreas Müller wrote: We avoid conflicts by installing no files to sysroot. This causes no fallout because nothing depends on qt5-creator (if something included later depending on qt-creator it should depend on qt5-creator). Note that | WARNING: QA Issue: qt5-creator rdepends on qt-creator, but it isn't a build dependency? [build-deps] is a false positve because the names of the libraries are same as for qt5-creator (see test below). This isn't enough to resolve the warning (but it resolves the sysroot conflict which is good). qt-creator is still recorded as runtime provider for couple of libraries, we can list them all in PRIVATE_LIBS (if we can assume that nothing will link against them - which is already assumed by not staging them). Here is the list from qt5-creator log.do_package: $ grep requires package qt-creator log.do_package DEBUG: qt5-creator: Dependency libCore.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) Very interesting: * qt5-creator complains for libs it has installed itself (see qt5 in path) * how should someone link against libraries that are not in sysroot? See the code for shlibs providers in package.bbclass, this warning and this whole issue originates there. shlibs providers record all installed libraries (not staged in sysroot), so that it can automatically add RDEPENDS in case some other package will require already found library. This happens with qt*-creators, there are plans to improve it by including the whole path, but that doesn't work yet with current package.bbclass. * during my tests for sysroot patch I have build qt-creator from scratch and then an image with qt5-creator included. If this warning would be true the image creation would have failed because qt5-creator RCONFLICTS qt-creator (error occured when starting the last patch) Problem seems that that the instance creating (have not looked further) these warnings just checks the name of the library without path. Library names are same for both versions of qt-creator. We could try it with PRIVATE_LIBS but I'd suggest to simply ignore these false warnings. I was suggesting PRIVATE_LIBS because it sort of matches with skipping the staging of the libraries. The warning is still valid in cases when someone builds qt-creator first, then qt5-creator which will automatically get RDEPENDS on qt-creator, so installing qt5-creator from package feed will bring both of them :(. If we set PRIVATE_LIBS in qt-creator, it won't ever be registered as shlib provider, so qt5-creator won't get the RDEPENDS. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] State of bitbake world, test-dependencies 2015-03-05
On Thu, Dec 11, 2014 at 10:23:32AM +0100, Martin Jansa wrote: On Sat, Aug 09, 2014 at 11:01:10AM +0200, Martin Jansa wrote: Complete logs: http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140808_063907.log/ ERROR: 483 issues were found in these recipes: directfb engrave epiphany expedite gd gmtk gnome-disk-utility gst-ffmpeg guile leptonica libarchive libmicrohttpd libmikmod libungif libwebp libwmf mariadb midori mpd mpeg2dec mpg123 openal-soft opendataplane oscam piglit protobuf snort sox stunnel synergy tesseract tracker Complete logs; http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20141210_162427.log/ This was only partial build, so the results don't look so bad. ERROR: 27 issues were found in these recipes: android-audiosystem collectd fbida gnome-bluetooth gst-plugins-bad mongodb opencv polkit-gnome qtbase tcpdump udisks xbmc xfce4-vala Found differences: WARN: collectd: collectd rdepends on libcrypto, but it isn't a build dependency? WARN: collectd: collectd rdepends on libesmtp, but it isn't a build dependency? WARN: collectd: collectd rdepends on libssl, but it isn't a build dependency? WARN: fbida: fbida rdepends on libwebp, but it isn't a build dependency? WARN: gst-plugins-bad: gst-plugins-bad-meta rdepends on gst-plugins-bad-rtmp, but it isn't a build dependency? WARN: opencv: libopencv-highgui rdepends on jasper, but it isn't a build dependency? WARN: opencv: libopencv-highgui rdepends on libdc1394, but it isn't a build dependency? WARN: qtbase: qtbase-plugins rdepends on cups-lib, but it isn't a build dependency? WARN: tcpdump: tcpdump rdepends on libsmi, but it isn't a build dependency? WARN: udisks: udisks rdepends on lvm2, but it isn't a build dependency? Found errors: ERROR: gst-plugins-bad: gst-plugins-bad-rtmp package isn't created when building with minimal dependencies? ERROR: gst-plugins-bad: gst-plugins-bad-rtmp-dev package isn't created when building with minimal dependencies? I've another partial build which basically confirmed that some of these issues are still there. Found differences: WARN: fbida: fbida rdepends on libwebp, but it isn't a build dependency? WARN: fbida: fbida rdepends on lirc, but it isn't a build dependency? WARN: qt5-creator: qt5-creator rdepends on qt-creator, but it isn't a build dependency? WARN: tcpdump: tcpdump rdepends on libsmi, but it isn't a build dependency? WARN: udisks: udisks rdepends on lvm2, but it isn't a build dependency? Logs weren't uploaded this time, because we've run out of space on logs.nslu2-linux.org/buildlogs/ -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] qt-creator: avoid conflicts with meta-qt5's qt5-creator
On Thu, Mar 5, 2015 at 7:01 PM, Martin Jansa martin.ja...@gmail.com wrote: On Sun, Mar 01, 2015 at 11:23:44PM +0100, Andreas Müller wrote: We avoid conflicts by installing no files to sysroot. This causes no fallout because nothing depends on qt5-creator (if something included later depending on qt-creator it should depend on qt5-creator). Note that | WARNING: QA Issue: qt5-creator rdepends on qt-creator, but it isn't a build dependency? [build-deps] is a false positve because the names of the libraries are same as for qt5-creator (see test below). This isn't enough to resolve the warning (but it resolves the sysroot conflict which is good). qt-creator is still recorded as runtime provider for couple of libraries, we can list them all in PRIVATE_LIBS (if we can assume that nothing will link against them - which is already assumed by not staging them). Here is the list from qt5-creator log.do_package: $ grep requires package qt-creator log.do_package DEBUG: qt5-creator: Dependency libCore.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) Very interesting: * qt5-creator complains for libs it has installed itself (see qt5 in path) * how should someone link against libraries that are not in sysroot? * during my tests for sysroot patch I have build qt-creator from scratch and then an image with qt5-creator included. If this warning would be true the image creation would have failed because qt5-creator RCONFLICTS qt-creator (error occured when starting the last patch) Problem seems that that the instance creating (have not looked further) these warnings just checks the name of the library without path. Library names are same for both versions of qt-creator. We could try it with PRIVATE_LIBS but I'd suggest to simply ignore these false warnings. What do you think? Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] State of bitbake world, test-dependencies 2015-03-05
On Thu, Mar 05, 2015 at 10:22:12PM +0100, Martin Jansa wrote: On Thu, Dec 11, 2014 at 10:23:32AM +0100, Martin Jansa wrote: On Sat, Aug 09, 2014 at 11:01:10AM +0200, Martin Jansa wrote: Complete logs: http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140808_063907.log/ ERROR: 483 issues were found in these recipes: directfb engrave epiphany expedite gd gmtk gnome-disk-utility gst-ffmpeg guile leptonica libarchive libmicrohttpd libmikmod libungif libwebp libwmf mariadb midori mpd mpeg2dec mpg123 openal-soft opendataplane oscam piglit protobuf snort sox stunnel synergy tesseract tracker Complete logs; http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20141210_162427.log/ This was only partial build, so the results don't look so bad. ERROR: 27 issues were found in these recipes: android-audiosystem collectd fbida gnome-bluetooth gst-plugins-bad mongodb opencv polkit-gnome qtbase tcpdump udisks xbmc xfce4-vala Found differences: WARN: collectd: collectd rdepends on libcrypto, but it isn't a build dependency? WARN: collectd: collectd rdepends on libesmtp, but it isn't a build dependency? WARN: collectd: collectd rdepends on libssl, but it isn't a build dependency? WARN: fbida: fbida rdepends on libwebp, but it isn't a build dependency? WARN: gst-plugins-bad: gst-plugins-bad-meta rdepends on gst-plugins-bad-rtmp, but it isn't a build dependency? WARN: opencv: libopencv-highgui rdepends on jasper, but it isn't a build dependency? WARN: opencv: libopencv-highgui rdepends on libdc1394, but it isn't a build dependency? WARN: qtbase: qtbase-plugins rdepends on cups-lib, but it isn't a build dependency? WARN: tcpdump: tcpdump rdepends on libsmi, but it isn't a build dependency? WARN: udisks: udisks rdepends on lvm2, but it isn't a build dependency? Found errors: ERROR: gst-plugins-bad: gst-plugins-bad-rtmp package isn't created when building with minimal dependencies? ERROR: gst-plugins-bad: gst-plugins-bad-rtmp-dev package isn't created when building with minimal dependencies? I've another partial build which basically confirmed that some of these issues are still there. Found differences: WARN: fbida: fbida rdepends on libwebp, but it isn't a build dependency? WARN: fbida: fbida rdepends on lirc, but it isn't a build dependency? WARN: qt5-creator: qt5-creator rdepends on qt-creator, but it isn't a build dependency? WARN: tcpdump: tcpdump rdepends on libsmi, but it isn't a build dependency? WARN: udisks: udisks rdepends on lvm2, but it isn't a build dependency? Logs weren't uploaded this time, because we've run out of space on logs.nslu2-linux.org/buildlogs/ Now we have the logs as well http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20150305_213704.log/ -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-efl][PATCH] mcnavi: blacklist, isn't compatible with latest edje_cc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb
b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb
index 9ad5d4f..2b5722b 100644
--- a/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb
+++ b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb
@@ -11,3 +11,9 @@ SRC_URI[sha256sum] =
ee7f65155e91386175875fc4f72f4bc94e4e9cdb8258112632da94520e
S = ${WORKDIR}/${PN}
inherit autotools
+
+PNBLACKLIST[mcnavi] ?= BROKEN: latest version 0.3.4 is 3 years old and now
broken with more strict ejde_cc from efl-1.13
+# | edje_cc: Error. parse error
0.3.4-r0/mcnavi/data/themes/Default/main.edc:126. invalid state name: 'none'.
default state must always be first.
+# | edje_cc: Error. parse error
0.3.4-r0/mcnavi/data/themes/Default/itinerary.edc:84. invalid state name:
'none'. default state must always be first.
+# | edje_cc: Error. parse error
0.3.4-r0/mcnavi/data/themes/Default/text.edc:1129. invalid state name: 'none'.
default state must always be first.
+# | edje_cc: Error. parse error
0.3.4-r0/mcnavi/data/themes/Default/fileopen.edc:78. invalid state name: 'off'.
default state must always be first.
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] qt-creator: avoid conflicts with meta-qt5's qt5-creator
On Sun, Mar 01, 2015 at 11:23:44PM +0100, Andreas Müller wrote: We avoid conflicts by installing no files to sysroot. This causes no fallout because nothing depends on qt5-creator (if something included later depending on qt-creator it should depend on qt5-creator). Note that | WARNING: QA Issue: qt5-creator rdepends on qt-creator, but it isn't a build dependency? [build-deps] is a false positve because the names of the libraries are same as for qt5-creator (see test below). This isn't enough to resolve the warning (but it resolves the sysroot conflict which is good). qt-creator is still recorded as runtime provider for couple of libraries, we can list them all in PRIVATE_LIBS (if we can assume that nothing will link against them - which is already assumed by not staging them). Here is the list from qt5-creator log.do_package: $ grep requires package qt-creator log.do_package DEBUG: qt5-creator: Dependency libCore.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) DEBUG: qt5-creator: Dependency libProjectExplorer.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) DEBUG: qt5-creator: Dependency libQtSupport.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) DEBUG: qt5-creator: Dependency libTextEditor.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) DEBUG: qt5-creator: Dependency libCppTools.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlJSTools.so) DEBUG: qt5-creator: Dependency libAnalyzerBase.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlProfiler.so) DEBUG: qt5-creator: Dependency libCore.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlProfiler.so) DEBUG: qt5-creator: Dependency libProjectExplorer.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlProfiler.so) DEBUG: qt5-creator: Dependency libQtSupport.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlProfiler.so) DEBUG: qt5-creator: Dependency libProjectExplorer.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libClearCase.so) DEBUG: qt5-creator: Dependency libTextEditor.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libClearCase.so) DEBUG: qt5-creator: Dependency libCore.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libClearCase.so) DEBUG: qt5-creator: Dependency libVcsBase.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libClearCase.so) DEBUG: qt5-creator: Dependency libCore.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlProjectManager.so) DEBUG: qt5-creator: Dependency libProjectExplorer.so requires package qt-creator (used by files: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5e-oe-linux-gnueabi/qt5-creator/3.3.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/plugins/libQmlProjectManager.so) DEBUG: qt5-creator: Dependency libQtSupport.so requires package qt-creator (used by files:
Re: [oe] [meta-oe][PATCH] opencv: Upgrade to 2.4.11
On Thu, Mar 05, 2015 at 08:33:08AM +0100, Mike Looijmans wrote:
On 04-03-15 23:03, Martin Jansa wrote:
On Wed, Mar 04, 2015 at 09:20:52AM +0100, Mike Looijmans wrote:
Upgrade OpenCV to the 2.4.11 release.
Remove the opencv-fix-pkgconfig-generation patch which has been integrated
upstream,
be it in modified form.
---
.../opencv/opencv-fix-pkgconfig-generation.patch | 44
--
meta-oe/recipes-support/opencv/opencv_2.4.bb | 8 ++--
2 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644
meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
diff --git
a/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
b/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
deleted file mode 100644
index d352778..000
---
a/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix pkg-config generation
-
-Replace absolute library path with library name spec and library search
-path option.
-
-The fix has been provided by Ray Rashif (code.opencv.org/issues/1925)
-
-Upstream-Status: Pending
-
-diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake
OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04
08:40:14.243505926 +
-+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-04
08:40:42.286649120 +
-@@ -10,7 +10,7 @@
- #
---
- set(prefix ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix \${prefix})
--set(libdir ) #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
-+set(libdir \${prefix}/${OPENCV_LIB_INSTALL_PATH})
- set(includedir \${prefix}/${OPENCV_INCLUDE_INSTALL_PATH})
- set(VERSION ${OPENCV_VERSION})
-
-@@ -36,10 +36,11 @@
- ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
-
- #build the list of components
--set(OpenCV_LIB_COMPONENTS_ )
-+set(OpenCV_LIB_COMPONENTS_ -L\${libdir})
- foreach(CVLib ${OpenCV_LIB_COMPONENTS})
- get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
- get_filename_component(libname ${libpath} NAME)
-+ get_filename_component(lname ${libpath} NAME_WE)
-
- if(INSTALL_TO_MANGLED_PATHS)
- set(libname ${libname}.${OPENCV_VERSION})
-@@ -52,7 +53,8 @@
- set(installDir ${OPENCV_LIB_INSTALL_PATH})
- endif()
-
-- set(OpenCV_LIB_COMPONENTS_ ${OpenCV_LIB_COMPONENTS_}
\${exec_prefix}/${installDir}/${libname})
-+ string(REPLACE libopencv -lopencv lname ${lname})
-+ set(OpenCV_LIB_COMPONENTS_ ${OpenCV_LIB_COMPONENTS_} ${lname})
- endforeach()
-
- # add extra dependencies required for OpenCV
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb
b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 63d7c8b..e57f9a6 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -9,12 +9,10 @@ ARM_INSTRUCTION_SET = arm
DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib
glib-2.0
-SRCREV = df8e28283f09825cca0c2902160b7abebcfe1b64
-SRC_URI = git://github.com/Itseez/opencv.git;branch=2.4 \
- file://opencv-fix-pkgconfig-generation.patch \
-
+SRCREV = 2c9547e3147779001811d01936aed38f560929fc
+SRC_URI = git://github.com/Itseez/opencv.git;branch=2.4
-PV = 2.4.9+git${SRCPV}
+PV = 2.4.11+git${SRCPV}
Please Fix this issue first:
WARNING: QA Issue: libopencv-highgui rdepends on jasper, but it isn't a
build dependency? [build-deps]
WARNING: QA Issue: libopencv-highgui rdepends on libdc1394, but it isn't
a build dependency? [build-deps]
I didn't get any warnings, which platform did you use?
See http://www.openembedded.org/wiki/Bitbake_World_Status_Setup
I guess the recipe needs some explicit disable calls, it probably
auto-detected these on your system.
You'll see these warnings only if you build jasper from meta-oe and
libdc1394 from meta-multimedia before building opencv.
And yes, it needs to be explicitly disabled.
S = ${WORKDIR}/git
--
1.9.1
--
Met vriendelijke groet / kind regards,
Mike Looijmans
System Expert
TOPIC Embedded Systems
Eindhovenseweg 32-C, NL-5683 KH Best
Postbus 440, NL-5680 AK Best
Telefoon: (+31) (0) 499 33 69 79
Telefax: (+31) (0) 499 33 69 70
E-mail: mike.looijm...@topic.nl
Website: www.topic.nl
Please consider the environment before printing this e-mail
Topic zoekt gedreven (embedded) software specialisten!
http://topic.nl/vacatures/topic-zoekt-software-engineers/
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Re: [oe] [meta-oe][PATCH] minidlna: Fix package and bump to version 1.1.4
Hello Baptiste,
On 04.03.2015 13:56, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna-daemon.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 109 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..9d6568d
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg
libid3tag libvorbis
+
+inherit autotools update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git
+SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd',
'file://minidlna-daemon.service', 'file://minidlna-daemon.init.d', d)}
DISTRO_FEATUES may contain both systemd and sysvinit at the same time.
+
+S = ${WORKDIR}/git
+B = ${S}
inherit autotools-brokensep instead of setting B.
+
+do_configure_prepend() {
+cd ${S}
+./autogen.sh
+}
Is this required?
+
+do_install_initd() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna-daemon.service
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+ ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd',
'do_install_initd', d)}
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna-daemon.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
If the systemd unit had the same basename as the init script, i.e.
minidlna.service, then systemd would be able to ignore the init script
automatically.
Regards,
Andreas
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
according to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
[oe] [meta-oe][PATCH 2/3] mplayer2: set REQUIRED_DISTRO_FEATURES and LICENSE_FLAGS
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 2de26b0..8c5f4eb 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -10,6 +10,12 @@ PROVIDES = mplayer
RPROVIDES_${PN} = mplayer
RCONFLICTS_${PN} = mplayer
+# Depends on xsp, libxv, virtual/libx11, libxscrnsaver
+REQUIRED_DISTRO_FEATURES = x11
+
+# because it depends on libpostproc/libav which has commercial flag
+LICENSE_FLAGS = ${@base_contains('PACKAGECONFIG', 'postproc', 'commercial',
'', d)}
+
LICENSE = GPLv3
LIC_FILES_CHKSUM = file://LICENSE;md5=d32239bcb673463ab874e80d47fae504
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/3] ktap-module: blacklist because it's not compatible with 3.19 kernel
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-kernel/ktap/ktap-module_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb index 62f2a99..e3c94e3 100644 --- a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb +++ b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb @@ -6,6 +6,9 @@ SUMMARY = KTAP is a scripting dynamic tracing tool for Linux inherit module +# See https://github.com/ktap/ktap/issues/80 +PNBLACKLIST[ktap-module] ?= Not compatible with 3.19 kernel + # Available package configs: ffi (only supported on x86_64) PACKAGECONFIG ?= -- 2.3.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] DO-NOT-MERGE: start-stop-daemon: upgrade to 1.17.21
* dselect fails to build with:
*** error: gettext infrastructure mismatch: using a Makefile.in.in from
gettext version 0.18 but the autoconf macros are from gettext version 0.19
* upgrade to dpkg version used by oe-core
* shouldn't be merged, because new dpkg doesn't recognize couple
options:
WARNING: QA Issue: start-stop-daemon: configure was passed
unrecognised options: --without-update-alternatives
--without-install-info --with-start-stop-daemon
[unknown-configure-option]
and then it will still fail with:
| ./curkeys.h:9:21: warning: missing terminating character
|{ 34, \ },
| ^
| ./curkeys.h:9:3: error: missing terminating character
|{ 34, \ },
|^
I'll leave finishing this change to someone actually using start-stop-deamon
and
will blacklist it instead.
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
...start-stop-daemon_1.16.0.2.bb = start-stop-daemon_1.17.21.bb} | 8
1 file changed, 4 insertions(+), 4 deletions(-)
rename
meta-oe/recipes-support/start-stop-daemon/{start-stop-daemon_1.16.0.2.bb =
start-stop-daemon_1.17.21.bb} (69%)
diff --git
a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.21.bb
similarity index 69%
rename from
meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
rename to meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.21.bb
index c232474..8277f6a 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.21.bb
@@ -1,14 +1,14 @@
SUMMARY = Debian's start-stop-daemon utility extracted from the dpkg \
package
LICENSE = PD
-LIC_FILES_CHKSUM =
file://utils/start-stop-daemon.c;md5=a963623e4588f70122865aaa7a370ce4
+LIC_FILES_CHKSUM =
file://utils/start-stop-daemon.c;endline=21;md5=535e211f008cd495dfcc55944be5a706
# start-stop-daemon is usually shipped by dpkg
DEPENDS = ncurses
RCONFLICS_${PN} = dpkg
-SRC_URI = http://sources.openembedded.org/dpkg_${PV}.tar.bz2;
-SRC_URI[md5sum] = d211a84f38987771a49ad1c0f144334a
-SRC_URI[sha256sum] =
2a3d4ba83c743b3f004533fdd52372cb7b22f5c1da2042d0a31bbcc2b54c0ea5
+SRC_URI = ${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz
+SRC_URI[md5sum] = 765a96fd0180196613bbfa3c4aef0775
+SRC_URI[sha256sum] =
3ed776627181cb9c1c9ba33f94a6319084be2e9ec9c23dd61ce784c4f602cf05
inherit autotools gettext pkgconfig
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCHv1] qtwebengine: Fix build with accessibility enabled
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...et_host_view_qt-Fix-build-with-accessibil.patch | 30 ++ ...et_host_view_qt-Fix-build-with-accessibil.patch | 30 ++ recipes-qt/qt5/qtwebengine_5.4.1.bb| 1 + recipes-qt/qt5/qtwebengine_git.bb | 1 + 4 files changed, 62 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch create mode 100644 recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch diff --git a/recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch b/recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch new file mode 100644 index 000..e938474 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch @@ -0,0 +1,30 @@ +From bb798fc9ad6bde88ecfd06841b6f4de8d4543853 Mon Sep 17 00:00:00 2001 +From: Martin Jansa martin.ja...@gmail.com +Date: Thu, 5 Mar 2015 14:58:32 +0100 +Subject: [PATCH 4/4] render_widget_host_view_qt: Fix build with accessibility + +* fixes following error when accessibility is enabled: + ../../../src/core/render_widget_host_view_qt.cpp:311:12: error: return-statement with a value, in function returning 'void' [-fpermissive] + | return 0; + +Signed-off-by: Martin Jansa martin.ja...@gmail.com +--- + src/core/render_widget_host_view_qt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp +index 18d64e8..1ca9dea 100644 +--- a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp +@@ -308,7 +308,7 @@ void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded() + content::BrowserAccessibilityManagerQt::GetEmptyDocument(), + this)); + #else +-return 0; ++return; + #endif // QT_NO_ACCESSIBILITY + } + +-- +2.3.1 + diff --git a/recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch b/recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch new file mode 100644 index 000..a94cb50 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch @@ -0,0 +1,30 @@ +From 039965ecfe950cd530a2a466505cafca2672f155 Mon Sep 17 00:00:00 2001 +From: Martin Jansa martin.ja...@gmail.com +Date: Thu, 5 Mar 2015 14:58:32 +0100 +Subject: [PATCH 5/5] render_widget_host_view_qt: Fix build with accessibility + +* fixes following error when accessibility is enabled: + ../../../src/core/render_widget_host_view_qt.cpp:311:12: error: return-statement with a value, in function returning 'void' [-fpermissive] + | return 0; + +Signed-off-by: Martin Jansa martin.ja...@gmail.com +--- + src/core/render_widget_host_view_qt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp +index 18d64e8..1ca9dea 100644 +--- a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp +@@ -308,7 +308,7 @@ void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded() + content::BrowserAccessibilityManagerQt::GetEmptyDocument(), + this)); + #else +-return 0; ++return; + #endif // QT_NO_ACCESSIBILITY + } + +-- +2.3.1 + diff --git a/recipes-qt/qt5/qtwebengine_5.4.1.bb b/recipes-qt/qt5/qtwebengine_5.4.1.bb index 867d5bd..e1930f5 100644 --- a/recipes-qt/qt5/qtwebengine_5.4.1.bb +++ b/recipes-qt/qt5/qtwebengine_5.4.1.bb @@ -9,5 +9,6 @@ SRC_URI += \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch \ +file://0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 89a83d4..650811c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -9,6 +9,7 @@ SRC_URI += \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ +file://0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ SRCREV_qtwebengine = 9d1a77b5be56a6a1dade613573eaeea63070969f -- 2.3.1 -- ___ Openembedded-devel mailing list
[oe] [meta-oe][PATCH 3/3] minidlna: Fix package and bump to version 1.1.4
From: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39
.../minidlna/minidlna/minidlna-daemon.init.d | 54 ++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 109 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..ebca755
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis
+
+# because it depends on libav which has commercial flag
+LICENSE_FLAGS = commercial
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM =
file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b
+SRC_URI[md5sum] =
[oe] [meta-oe][PATCHv2] cloud9, nodejs4: blacklist
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 1 +
meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb | 2 ++
2 files changed, 3 insertions(+)
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index b5dbaa8..87e524d 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -8,6 +8,7 @@ PR = r5
# Nodejs-native for node-waf, nodejs4-native for the headers
DEPENDS = libxml2 nodejs-native nodejs4-native
+PNBLACKLIST[cloud9] ?= Not comatible with current nodejs 0.12, but upstream
is working on it for v3
inherit systemd
SRC_URI = git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
index 7e67bcb..268a10a 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM =
file://LICENSE;md5=d6237f3a840aef5b7880fb4e49eecfe5
DEPENDS = openssl
+PNBLACKLIST[nodejs4] ?= Used only by currently blacklisted cloud9 and fails
to build for qemuarm with thumb: error: #error For thumb inter-working we
require an architecture which supports blx
+
SRC_URI = \
http://nodejs.org/dist/node-v${PV}.tar.gz \
file://libev-cross-cc_${PV}.patch \
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/3] ktap: change kernel-module-ktapvm RDEPENDS to RRECOMMENDS
* even if it makes sense in this case, don't give bad example for other people
to
copy paste to other recipes, kernel modules should be only recommended, so
that
it still works fine if someone includes the module inside kernel image
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-kernel/ktap/ktap_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-kernel/ktap/ktap_git.bb
b/meta-oe/recipes-kernel/ktap/ktap_git.bb
index cbdabf8..2053783 100644
--- a/meta-oe/recipes-kernel/ktap/ktap_git.bb
+++ b/meta-oe/recipes-kernel/ktap/ktap_git.bb
@@ -23,4 +23,4 @@ do_install() {
}
PACKAGE_ARCH = ${MACHINE_ARCH}
-RDEPENDS_${PN} = kernel-module-ktapvm
+RRECOMMENDS_${PN} = kernel-module-ktapvm
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/3] ktap-module: blacklist because it's not compatible with 3.19 kernel
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-kernel/ktap/ktap-module_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb index 62f2a99..e3c94e3 100644 --- a/meta-oe/recipes-kernel/ktap/ktap-module_git.bb +++ b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb @@ -6,6 +6,9 @@ SUMMARY = KTAP is a scripting dynamic tracing tool for Linux inherit module +# See https://github.com/ktap/ktap/issues/80 +PNBLACKLIST[ktap-module] ?= Not compatible with 3.19 kernel + # Available package configs: ffi (only supported on x86_64) PACKAGECONFIG ?= -- 2.3.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/3] ktap: rename recipes to indicate they are from git
* set PV so that it shows git revision and also automatically rebuilds them
when SRCREV is changed
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-kernel/ktap/{ktap-module_0.4.bb = ktap-module_git.bb} | 0
meta-oe/recipes-kernel/ktap/ktap.inc | 1 +
meta-oe/recipes-kernel/ktap/{ktap_0.4.bb = ktap_git.bb} | 0
3 files changed, 1 insertion(+)
rename meta-oe/recipes-kernel/ktap/{ktap-module_0.4.bb = ktap-module_git.bb}
(100%)
rename meta-oe/recipes-kernel/ktap/{ktap_0.4.bb = ktap_git.bb} (100%)
diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb
b/meta-oe/recipes-kernel/ktap/ktap-module_git.bb
similarity index 100%
rename from meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb
rename to meta-oe/recipes-kernel/ktap/ktap-module_git.bb
diff --git a/meta-oe/recipes-kernel/ktap/ktap.inc
b/meta-oe/recipes-kernel/ktap/ktap.inc
index 93a4e2c..2c94a08 100644
--- a/meta-oe/recipes-kernel/ktap/ktap.inc
+++ b/meta-oe/recipes-kernel/ktap/ktap.inc
@@ -4,6 +4,7 @@ HOMEPAGE = http://www.ktap.org;
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://LICENSE-GPL;md5=eb723b61539feef013de476e68b5c50a
+PV = 0.4+gitr${SRCPV}
SRCREV = c8401e07c89cdec9a5f673da4ddb12b7982b522b
SRC_URI = git://github.com/ktap/ktap.git
diff --git a/meta-oe/recipes-kernel/ktap/ktap_0.4.bb
b/meta-oe/recipes-kernel/ktap/ktap_git.bb
similarity index 100%
rename from meta-oe/recipes-kernel/ktap/ktap_0.4.bb
rename to meta-oe/recipes-kernel/ktap/ktap_git.bb
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] start-stop-daemon: blacklist
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
index c232474..c8d88b7 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM =
file://utils/start-stop-daemon.c;md5=a963623e4588f70122865aa
DEPENDS = ncurses
RCONFLICS_${PN} = dpkg
+PNBLACKLIST[start-stop-daemon] ?= BROKEN: fails because of gettext, partial
fix is available here http://patchwork.openembedded.org/patch/89867/;
+
SRC_URI = http://sources.openembedded.org/dpkg_${PV}.tar.bz2;
SRC_URI[md5sum] = d211a84f38987771a49ad1c0f144334a
SRC_URI[sha256sum] =
2a3d4ba83c743b3f004533fdd52372cb7b22f5c1da2042d0a31bbcc2b54c0ea5
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] minidlna: Fix package and bump to version 1.1.4
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39
.../minidlna/minidlna/minidlna-daemon.init.d | 54 ++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 109 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..49e23cc
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg
libid3tag libvorbis
+
+inherit autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+file://minidlna-daemon.init.d
+SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd',
'file://minidlna.service', '', d)}
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_initd() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+ do_install_initd
+ ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd',
'', d)}
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM =
Re: [oe] [meta-oe][PATCH] minidlna: Fix package and bump to version 1.1.4
Thanks for your comment , I will resend a updated patch according to it.
Regards,
Baptiste
2015-03-05 9:14 GMT+01:00 Andreas Oberritter o...@opendreambox.org:
Hello Baptiste,
On 04.03.2015 13:56, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna-daemon.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48
---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 109 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/
minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..9d6568d
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim
of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif
libogg libid3tag libvorbis
+
+inherit autotools update-rc.d systemd
+
+SRC_URI = git://
git.code.sf.net/p/minidlna/git;branch=master;module=git
+SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd',
'file://minidlna-daemon.service', 'file://minidlna-daemon.init.d', d)}
DISTRO_FEATUES may contain both systemd and sysvinit at the same time.
+
+S = ${WORKDIR}/git
+B = ${S}
inherit autotools-brokensep instead of setting B.
+
+do_configure_prepend() {
+cd ${S}
+./autogen.sh
+}
Is this required?
+
+do_install_initd() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna-daemon.service
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+ ${@base_contains('DISTRO_FEATURES', 'systemd',
'do_install_systemd', 'do_install_initd', d)}
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna-daemon.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
If the systemd unit had the same basename as the init script, i.e.
minidlna.service, then systemd would be able to ignore the init script
automatically.
Regards,
Andreas
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
according to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.service
new file mode 100644
index 000..656100b
---
[oe] [meta-oe][PATCH v2] opencv: Upgrade to 2.4.11
Upgrade OpenCV to the 2.4.11 release.
Remove the opencv-fix-pkgconfig-generation patch which has been integrated
upstream,
be it in modified form.
Disable 1394 support by default to get a deterministic build.
Fix jasper dependency, the BUILD_JASPER parameter served only to build an
internal
library, while WITH_JASPER actually controls whether jpeg2000 support was
desired.
---
v2: Fix non-deterministic jasper and lib1394 dependencies. Tested by first
building
these libraries and building opencv after that.
.../opencv/opencv-fix-pkgconfig-generation.patch | 44 --
meta-oe/recipes-support/opencv/opencv_2.4.bb | 11 +++---
2 files changed, 5 insertions(+), 50 deletions(-)
delete mode 100644
meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
diff --git
a/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
b/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
deleted file mode 100644
index d352778..000
---
a/meta-oe/recipes-support/opencv/opencv/opencv-fix-pkgconfig-generation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix pkg-config generation
-
-Replace absolute library path with library name spec and library search
-path option.
-
-The fix has been provided by Ray Rashif (code.opencv.org/issues/1925)
-
-Upstream-Status: Pending
-
-diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake
OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04
08:40:14.243505926 +
-+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake2012-11-04
08:40:42.286649120 +
-@@ -10,7 +10,7 @@
- #
---
- set(prefix ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix \${prefix})
--set(libdir ) #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
-+set(libdir \${prefix}/${OPENCV_LIB_INSTALL_PATH})
- set(includedir \${prefix}/${OPENCV_INCLUDE_INSTALL_PATH})
- set(VERSION ${OPENCV_VERSION})
-
-@@ -36,10 +36,11 @@
- ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
-
- #build the list of components
--set(OpenCV_LIB_COMPONENTS_ )
-+set(OpenCV_LIB_COMPONENTS_ -L\${libdir})
- foreach(CVLib ${OpenCV_LIB_COMPONENTS})
- get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
- get_filename_component(libname ${libpath} NAME)
-+ get_filename_component(lname ${libpath} NAME_WE)
-
- if(INSTALL_TO_MANGLED_PATHS)
- set(libname ${libname}.${OPENCV_VERSION})
-@@ -52,7 +53,8 @@
- set(installDir ${OPENCV_LIB_INSTALL_PATH})
- endif()
-
-- set(OpenCV_LIB_COMPONENTS_ ${OpenCV_LIB_COMPONENTS_}
\${exec_prefix}/${installDir}/${libname})
-+ string(REPLACE libopencv -lopencv lname ${lname})
-+ set(OpenCV_LIB_COMPONENTS_ ${OpenCV_LIB_COMPONENTS_} ${lname})
- endforeach()
-
- # add extra dependencies required for OpenCV
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb
b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 63d7c8b..2754616 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -9,12 +9,10 @@ ARM_INSTRUCTION_SET = arm
DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib glib-2.0
-SRCREV = df8e28283f09825cca0c2902160b7abebcfe1b64
-SRC_URI = git://github.com/Itseez/opencv.git;branch=2.4 \
- file://opencv-fix-pkgconfig-generation.patch \
-
+SRCREV = 2c9547e3147779001811d01936aed38f560929fc
+SRC_URI = git://github.com/Itseez/opencv.git;branch=2.4
-PV = 2.4.9+git${SRCPV}
+PV = 2.4.11+git${SRCPV}
S = ${WORKDIR}/git
@@ -25,6 +23,7 @@ OECMAKE_BUILDPATH = ${WORKDIR}/build-${TARGET_ARCH}
EXTRA_OECMAKE =
-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include
\
-DBUILD_PYTHON_SUPPORT=ON \
-DWITH_GSTREAMER=OFF \
+ -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)} \
${@base_conditional(libdir, /usr/lib64,
-DLIB_SUFFIX=64, , d)} \
@@ -40,7 +39,7 @@ PACKAGECONFIG[libav] =
-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,
PACKAGECONFIG[png] = -DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,
PACKAGECONFIG[tiff] = -DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,
PACKAGECONFIG[v4l] = -DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,
-PACKAGECONFIG[jasper] = -DBUILD_JASPER=ON,-DBUILD_JASPER=OFF,jasper
+PACKAGECONFIG[jasper] = -DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,
inherit distutils-base pkgconfig cmake
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 36 +++
.../minidlna/minidlna/minidlna-daemon.init.d | 54 ++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 106 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..f553acb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM =
file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b
+SRC_URI[md5sum] = d966256baf2f9b068b9de871ab5dade5
+SRC_URI[sha256sum] =
170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851
diff --git
Re: [oe] [meta-networking][PATCH] crda: move libgcrypt to DEPENDS
On Wed, Mar 04, 2015 at 06:36:44PM -0300, Hugo Vasconcelos Saldanha wrote: Hi, On Wed, Mar 04, 2015 at 01:39:04PM -0300, Javier Viguera wrote: crda has a build time dependence on libgcrypt, so move the dependence from RDEPENDS to DEPENDS. Otherwise the build fails with: reglib.c:28:20: fatal error: gcrypt.h: No such file or directory Signed-off-by: Javier Viguera javier.vigu...@digi.com I think you should move libnl to DEPENDS also. My bad. :( I've moved libnl when cherry-picking to master-next. -- Hugo -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] cloud9, nodejs4: blacklist
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 1 +
meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb | 2 ++
2 files changed, 3 insertions(+)
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index b5dbaa8..21c7e8a 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -8,6 +8,7 @@ PR = r5
# Nodejs-native for node-waf, nodejs4-native for the headers
DEPENDS = libxml2 nodejs-native nodejs4-native
+PNBLACKLIST[cloud9] = Not comatible with current nodejs 0.12, but upstream is
working on it for v3
inherit systemd
SRC_URI = git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
index 7e67bcb..ebee536 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM =
file://LICENSE;md5=d6237f3a840aef5b7880fb4e49eecfe5
DEPENDS = openssl
+PNBLACKLIST[nodejs4] = Used only by currently blacklisted cloud9 and fails to
build for qemuarm with thumb: error: #error For thumb inter-working we require
an architecture which supports blx
+
SRC_URI = \
http://nodejs.org/dist/node-v${PV}.tar.gz \
file://libev-cross-cc_${PV}.patch \
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4
Sorry Martin
I have just seen your recent change on mplayer2 recipes.
http://cgit.openembedded.org/meta-openembedded/commit/?h=master-nextid=522ee507725c0e5300af1856c481e93938be313f
You probably means LICENSE_FLAGS not LICENSE_FLAGS_WHITELIST
I will resend an update
2015-03-05 15:30 GMT+01:00 Baptiste Durand baptiste.dur...@gmail.com:
2015-03-05 14:18 GMT+01:00 Martin Jansa martin.ja...@gmail.com:
On Thu, Mar 05, 2015 at 01:52:59PM +0100, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 36 +++
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48
---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 106 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/
minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..f553acb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the
aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag
libvorbis
Please set LICENSE_FLAGS_WHITELIST because of libav dependency, otherwise
the build
will fail with:
ERROR: Nothing PROVIDES 'libav' (but
meta-oe/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb DEPENDS on
or otherwise requires it)
ERROR: libav was skipped: because it has a restricted license not
whitelisted in LICENSE_FLAGS_WHITELIST
Hello Martin
I'm not sure to understand what do you mean exactly :S
I thought this variable (LICENSE_FLAGS_WHITELIST) should be used only in
distro configuration or local.conf, not in a recipe.
The purpose of this varaibel is to be able to build rootfs with or without
commercial packages, is it correct?
In my point of view , setting this variable to the value commercial
directly in a recipe is not a good idea.
BR
Baptiste
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://
git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to
avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
according to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid
Re: [oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4
2015-03-05 14:18 GMT+01:00 Martin Jansa martin.ja...@gmail.com:
On Thu, Mar 05, 2015 at 01:52:59PM +0100, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 36 +++
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48
---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 106 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/
minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..f553acb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim
of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag
libvorbis
Please set LICENSE_FLAGS_WHITELIST because of libav dependency, otherwise
the build
will fail with:
ERROR: Nothing PROVIDES 'libav' (but
meta-oe/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb DEPENDS on
or otherwise requires it)
ERROR: libav was skipped: because it has a restricted license not
whitelisted in LICENSE_FLAGS_WHITELIST
Hello Martin
I'm not sure to understand what do you mean exactly :S
I thought this variable (LICENSE_FLAGS_WHITELIST) should be used only in
distro configuration or local.conf, not in a recipe.
The purpose of this varaibel is to be able to build rootfs with or without
commercial packages, is it correct?
In my point of view , setting this variable to the value commercial
directly in a recipe is not a good idea.
BR
Baptiste
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://
git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to
avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
according to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
[oe] [meta-oe][PATCH] mplayer2: set REQUIRED_DISTRO_FEATURES and LICENSE_FLAGS
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 2de26b0..8c5f4eb 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -10,6 +10,12 @@ PROVIDES = mplayer
RPROVIDES_${PN} = mplayer
RCONFLICTS_${PN} = mplayer
+# Depends on xsp, libxv, virtual/libx11, libxscrnsaver
+REQUIRED_DISTRO_FEATURES = x11
+
+# because it depends on libpostproc/libav which has commercial flag
+LICENSE_FLAGS = ${@base_contains('PACKAGECONFIG', 'postproc', 'commercial',
'', d)}
+
LICENSE = GPLv3
LIC_FILES_CHKSUM = file://LICENSE;md5=d32239bcb673463ab874e80d47fae504
--
2.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v4] minidlna: Fix package and bump to version 1.1.4
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39
.../minidlna/minidlna/minidlna-daemon.init.d | 54 ++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 109 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..ebca755
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis
+
+# because it depends on libav which has commercial flag
+LICENSE_FLAGS = commercial
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` ( according
to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = v1_1_4
+LIC_FILES_CHKSUM =
file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b
+SRC_URI[md5sum] = d966256baf2f9b068b9de871ab5dade5
+SRC_URI[sha256sum] =
[oe] Question about building local sources without fetching
Hello,
we have a system where sources for a recipe are present in the same tree
as the corresponding .bb recipe. They are all in the same git repository.
So, something like this example:
./src/ C++ sources
./build/poky/meta
./build/poky/meta-our-layer/recipes-custom/our-software.bb
I realize this is unusual, since in such a setup, we don't actually
fetch sources (since they are already present in the same tree).
With such a setup, one problem is to determine when OE should rebuild
the package. That is, how it should detect a change. We use the revision
(the hash) of the current head of the git repo, and set PV to that git
revision. This way, whenever the head is moved, the revision changes,
and so does PV.
This worked fine up to and including Danny. After Danny, the behavior
changed. If we moved the head back to an earlier commit, bitbake would
not notice, and produce a version from a later commit.
Here is the excerpt from our recipe that does this PV modification:
# PV_DEFAULT is defined in .inc file so that it can be overwritten by
packaging scripts
# this is used when we do not have any git info
def git_run(cmd, path):
(output, error) = bb.process.run(cmd, cwd=path)
return output.rstrip()
def check_git_describe(path, default):
import os
import bb.process
try:
ver = git_run(git describe --tags --long, path)
except Exception, exc:
ver = default
return ver
require streamapp_intree_version.inc
PV = ${@check_git_describe('${S}', '${PV_DEFAULT}')}
PR = r14
PACKAGES = ${PN}-dbg ${PN}
# FILE_DIRNAME contains the full path of this .bb recipe
# Since we are building in tree we know apriori the relative location of
the src
S = ${FILE_DIRNAME}/../../../..
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
PACKAGE_ARCH = ${MACHINE_ARCH}
Does anybody have suggestions? Or, if somebody knows of a different way
of doing builds from local sources, we'd like to hear about it.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] minidlna: Fix package and bump to version 1.1.4
Hi Baptiste,
thanks for your quick update. Two more things below.
On 05.03.2015 12:27, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 39
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 109 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..49e23cc
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg
libid3tag libvorbis
inherit gettext might be better than manually depending on
virtual/gettext, but I am no expert in this area.
+
+inherit autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+file://minidlna-daemon.init.d
+SRC_URI =+ ${@base_contains('DISTRO_FEATURES', 'systemd',
'file://minidlna.service', '', d)}
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_initd() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+ do_install_initd
+ ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd',
'', d)}
+}
systemd.bbclass takes care of deleting systemd units if systemd is not
set in DISTRO_FEATURES. So you can merge the three functions above into
do_install_append unconditionally. And also remove the conditional in
SRC_URI.
Regards,
Andreas
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
according to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++
Re: [oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4
On Thu, Mar 05, 2015 at 01:52:59PM +0100, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 36 +++
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48 ---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 106 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..f553acb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis
Please set LICENSE_FLAGS_WHITELIST because of libav dependency, otherwise the
build
will fail with:
ERROR: Nothing PROVIDES 'libav' (but
meta-oe/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb DEPENDS on or
otherwise requires it)
ERROR: libav was skipped: because it has a restricted license not whitelisted
in LICENSE_FLAGS_WHITELIST
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo $SCRIPTNAME already running with PID #`cat $PIDFILE` (
according to ${PIDFILE} );
+exit 0
+fi
+
+$DAEMON $ARGS
+
+pid=$!
+
+if [ $pid != ]; then
+echo -n $pid ${PIDFILE}
+fi
+}
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e ${PIDFILE} ]; then
+echo ${SCRIPTNAME} not running ( according to ${PIDFILE} );
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+start)
+start_function
+;;
+stop)
+stop_function
+;;
+*)
+echo Usage: $0 {start | stop}
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git
Re: [oe] [meta-oe][PATCH v3] minidlna: Fix package and bump to version 1.1.4
On Thu, Mar 05, 2015 at 03:42:08PM +0100, Baptiste Durand wrote:
Sorry Martin
I have just seen your recent change on mplayer2 recipes.
http://cgit.openembedded.org/meta-openembedded/commit/?h=master-nextid=522ee507725c0e5300af1856c481e93938be313f
You probably means LICENSE_FLAGS not LICENSE_FLAGS_WHITELIST
Ah right, sorry for confusion.
I will resend an update
Thanks for quick update.
2015-03-05 15:30 GMT+01:00 Baptiste Durand baptiste.dur...@gmail.com:
2015-03-05 14:18 GMT+01:00 Martin Jansa martin.ja...@gmail.com:
On Thu, Mar 05, 2015 at 01:52:59PM +0100, Baptiste DURAND wrote:
Signed-off-by: Baptiste DURAND baptiste.dur...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-multimedia/minidlna/minidlna.inc | 36 +++
.../minidlna/minidlna/minidlna-daemon.init.d | 54
++
.../minidlna/minidlna/minidlna.service | 10
.../recipes-multimedia/minidlna/minidlna_1.1.4.bb | 6 +++
.../minidlna/minidlna/fix-makefile.patch | 41
.../search-for-headers-in-staging-dir.patch| 48
---
.../nonworking/minidlna/minidlna_1.0.25.bb | 19
7 files changed, 106 insertions(+), 108 deletions(-)
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
create mode 100644 meta-oe/recipes-multimedia/minidlna/
minidlna_1.1.4.bb
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
delete mode 100644
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
delete mode 100644 meta-oe/recipes-multimedia/nonworking/minidlna/
minidlna_1.0.25.bb
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..f553acb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = MiniDLNA (aka ReadyDLNA) is server software with the
aim of \
+being fully compliant with DLNA/UPnP-AV clients.
+LICENSE = GPL-2.0|BSD
+DEPENDS = ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag
libvorbis
Please set LICENSE_FLAGS_WHITELIST because of libav dependency, otherwise
the build
will fail with:
ERROR: Nothing PROVIDES 'libav' (but
meta-oe/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb DEPENDS on
or otherwise requires it)
ERROR: libav was skipped: because it has a restricted license not
whitelisted in LICENSE_FLAGS_WHITELIST
Hello Martin
I'm not sure to understand what do you mean exactly :S
I thought this variable (LICENSE_FLAGS_WHITELIST) should be used only in
distro configuration or local.conf, not in a recipe.
The purpose of this varaibel is to be able to build rootfs with or without
commercial packages, is it correct?
In my point of view , setting this variable to the value commercial
directly in a recipe is not a good idea.
BR
Baptiste
+
+inherit gettext autotools-brokensep update-rc.d systemd
+
+SRC_URI = git://
git.code.sf.net/p/minidlna/git;branch=master;module=git \
+ file://minidlna-daemon.init.d \
+ file://minidlna.service
+
+S = ${WORKDIR}/git
+
+# This remove --exclude=autopoint option from autoreconf argument to
avoid
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF =
+
+do_install_append(){
+ install -d ${D}${sysconfdir}
+ install -m 0755 minidlna.conf ${D}${sysconfdir}
+
+# Systemd script
+ install -d ${D}${nonarch_base_libdir}/systemd/system
+ install -m 0755 ${WORKDIR}/minidlna.service
${D}${nonarch_base_libdir}/systemd/system
+
+# Sysvinit script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/minidlna-daemon.init.d
${D}${sysconfdir}/init.d/minidlna
+
+}
+
+SYSTEMD_SERVICE_${PN} = minidlna.service
+
+INITSCRIPT_NAME = minidlna
+INITSCRIPT_PARAMS = defaults 90
+
diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..9e64a20
--- /dev/null
+++
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME=minidlna
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS=-f $CONF
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+start_function() {
+
+export
Re: [oe] [meta-qt5][PATCHv2] fix build of qtwebengine if qtbase has no accessibility
On Thursday 05 March 2015 15:04:03 Martin Jansa wrote: I've sent additional patch to fix building with accessibility enabled. You mean without accessibility :-)... (damn double negation #ifdef) Please get it merged in upstream, because your patch seems to be broken It's merged in 5.4 branch: https://codereview.qt-project.org/#/c/107873/ Regards, Stephan -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
