[oe] [PATCH 1/2] autofs: pass systemd directory to configure
Otherwise, configure will try to auto-detect using host paths. Signed-off-by: Andreas Oberritter o...@opendreambox.org --- meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index 0c66ebc..905be40 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -85,6 +85,7 @@ EXTRA_OECONF += --disable-mount-locking \ CACHED_CONFIGUREVARS = ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ +systemddir=${systemd_unitdir}/system \ do_configure_prepend () { -- 1.8.1.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] autofs: change DESCRIPTION to SUMMARY
Signed-off-by: Andreas Oberritter o...@opendreambox.org --- meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index 905be40..f8df0ef 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -1,4 +1,4 @@ -DESCRIPTION = Kernel based automounter for linux. +SUMMARY = Kernel based automounter for linux. SECTION = base LICENSE = GPL-2.0 LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 -- 1.8.1.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] xfsprogs: change DESCRIPTION to SUMMARY
Signed-off-by: Andreas Oberritter o...@opendreambox.org --- meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb index ceb0ddf..1dc6f09 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb @@ -1,4 +1,4 @@ -DESCRIPTION = XFS Filesystem Utilities +SUMMARY = XFS Filesystem Utilities HOMEPAGE = http://oss.sgi.com/projects/xfs; SECTION = base LICENSE = GPLv2 -- 1.8.1.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 1/2] autofs: pass systemd directory to configure
Otherwise, configure will try to auto-detect using host paths. Signed-off-by: Andreas Oberritter o...@opendreambox.org --- meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index 0c66ebc..905be40 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -85,6 +85,7 @@ EXTRA_OECONF += --disable-mount-locking \ CACHED_CONFIGUREVARS = ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ +systemddir=${systemd_unitdir}/system \ do_configure_prepend () { -- 1.8.1.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 2/2] autofs: change DESCRIPTION to SUMMARY
Signed-off-by: Andreas Oberritter o...@opendreambox.org --- meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index 905be40..f8df0ef 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb @@ -1,4 +1,4 @@ -DESCRIPTION = Kernel based automounter for linux. +SUMMARY = Kernel based automounter for linux. SECTION = base LICENSE = GPL-2.0 LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 -- 1.8.1.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-filesystems][PATCH v2] xfsprogs: change DESCRIPTION to SUMMARY
Signed-off-by: Andreas Oberritter o...@opendreambox.org --- meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb index ceb0ddf..1dc6f09 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.1.11.bb @@ -1,4 +1,4 @@ -DESCRIPTION = XFS Filesystem Utilities +SUMMARY = XFS Filesystem Utilities HOMEPAGE = http://oss.sgi.com/projects/xfs; SECTION = base LICENSE = GPLv2 -- 1.8.1.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-gnome/meta-systemd 1/2] orbit2: fix build after automake 1.13.4 update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 15-10-13 02:03, Andreas Müller schreef: fixes: | test/everything/Makefile.am:81: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/test.sh' | test/inhibit/Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') | test/poa/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') | autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed. | WARNING: /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/run.do_configure.14800:1 exit 1 from | exit 1 | ERROR: Function failed: do_configure (log file is located at /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/log.do_configure.14800) ERROR: Task 6208 (virtual:native:/home/superandy/data/oe-core/sources/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb, do_configure) failed with exit code '1' Signed-off-by: Andreas Müller schnitzelt...@googlemail.com Applied, thanks! -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFSX9UDMkyGM64RGpERAsFSAKC5S+2nljBJc6tD6/vS+fD4letp3gCggZZp K0RjMUV6W1SUOHVN6gkTjj8= =ET3y -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCHv3 1/3] json-c: add 0.11
On Mon, Oct 14, 2013 at 03:20:11PM +0100, Jack Mitchell wrote: From: Jack Mitchell jmitch...@cbnl.com Signed-off-by: Jack Mitchell jmitch...@cbnl.com --- meta-oe/recipes-support/json-c/json-c_0.11.bb | 13 + 1 file changed, 13 insertions(+) create mode 100644 meta-oe/recipes-support/json-c/json-c_0.11.bb diff --git a/meta-oe/recipes-support/json-c/json-c_0.11.bb b/meta-oe/recipes-support/json-c/json-c_0.11.bb new file mode 100644 index 000..e0391f5 --- /dev/null +++ b/meta-oe/recipes-support/json-c/json-c_0.11.bb @@ -0,0 +1,13 @@ +SUMMARY = JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C +HOMEPAGE = https://github.com/json-c/json-c/wiki; +LICENSE = MIT +LIC_FILES_CHKSUM = file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2 + +SRC_URI = https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz; + +SRC_URI[md5sum] = aa02367d2f7a830bf1e3376f77881e98 +SRC_URI[sha256sum] = 28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c + +PARALLEL_MAKE = + +inherit autotools It conflicts with libjson from oe-core: WARNING: libjson-0.9 is already registered as shlib provider for libjson.so.0, ignoring json-c-0.11 trying to register the same openembedded-core/meta/recipes-devtools/libjson/libjson_0.9.bb You probably want to upgrade libjson in oe-core if it's the same json-c... -- 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-multimedia][PATCHv2 2/3] coriander: add recipe
From: Cliff Brake cbr...@bec-systems.com Initial recipe created by Khem Raj Signed-off-by: Cliff Brake cbr...@bec-systems.com Signed-off-by: Khem Raj raj.k...@gmail.com --- .../coriander/coriander/cross-compile.patch | 17 + .../recipes-multimedia/coriander/coriander_2.0.2.bb | 15 +++ 2 files changed, 32 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch create mode 100755 meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb diff --git a/meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch b/meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch new file mode 100644 index 000..49350fe --- /dev/null +++ b/meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch @@ -0,0 +1,17 @@ +In a cross compile environment adding paths like /usr are not correct. +With this patch we make it so that its relative to sysroot if the compiler +defines one. + +Upstream-Status: Pending +Signed-off-by: Khem Raj raj.k...@gmail.com +Index: a/src/Makefile.am +=== +--- a/src/Makefile.am 2013-02-08 22:35:08.0 -0800 b/src/Makefile.am 2013-10-13 01:31:38.812869080 -0700 +@@ -33,5 +33,5 @@ + video_encode.c video_encode.h \ + subtitles.c subtitles.h + +-coriander_LDADD = -L/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS) ++coriander_LDADD = -L=/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS) + diff --git a/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb b/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb new file mode 100755 index 000..587055d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = Control and capture GUI for IIDC compliant cameras +HOMEPAGE = http://damien.douxchamps.net/ieee1394/coriander/; +SECTION = applications +LICENSE = GPL-3.0 +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 +DEPENDS = gtk+ libgnomeui libraw1394 libdc1394 libxv + +SRC_URI = ${SOURCEFORGE_MIRROR}/project/${PN}/coriander-2/${PV}/${P}.tar.gz \ + file://cross-compile.patch \ + + +SRC_URI[md5sum] = 431d98fb013217681f97ade168201fb8 +SRC_URI[sha256sum] = 5c7fd31cb58d398e2742352bf1ffbd2ca22e06686c6668ecfd437735c2b79123 + +inherit autotools gettext sdl -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCHv2 1/3] libraw1394: add recipe
From: Cliff Brake cbr...@bec-systems.com Initial recipe created by Khem Raj Signed-off-by: Cliff Brake cbr...@bec-systems.com Signed-off-by: Khem Raj raj.k...@gmail.com --- meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb diff --git a/meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb b/meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb new file mode 100644 index 000..617ba1b --- /dev/null +++ b/meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = base library for low-level IEEE 1394 accesses +HOMEPAGE = https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394; +SECTION = libs +LICENSE = LGPL-2.1 +LIC_FILES_CHKSUM = file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 + +SRC_URI = https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz; +SRC_URI[md5sum] = d06cccb776b240b6ab5efdee33b87af2 +SRC_URI[sha256sum] = a83cff16fb8885831bc29d7d17f3c570dc39251d89e20795c08e87720de0ba70 + +inherit autotools -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCv2 3/3] mikmod: Upgrade 3.3.2 - 3.3.3
Signed-off-by: Khem Raj raj.k...@gmail.com --- .../mikmod/{libmikmod_3.3.2.bb = libmikmod_3.3.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.3.2.bb = libmikmod_3.3.3.bb} (70%) diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb similarity index 70% rename from meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb rename to meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb index 4ab293f..6a3077f 100644 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.2.bb +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b DEPENDS = alsa-lib texinfo SRC_URI = \ -http://mikmod.shlomifish.org/files/${P}.tar.gz \ +${SOURCEFORGE_MIRROR}/project/mikmod/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ -SRC_URI[md5sum] = 60ac77a804d082230df3009af11ef44f -SRC_URI[sha256sum] = 2311b209255bf24e95161907a16778cb054ac6d447fd8d05f1f0e41a555c7580 +SRC_URI[md5sum] = 0e0f9bce8f8e598ca292b41e0ae385c8 +SRC_URI[sha256sum] = 79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437 inherit autotools binconfig lib_package -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-openembedded/meta-webserver][PATCH] nginx: new recipe, updated from aging original in rpi layer (has not been scrubbed for any potential policy issues).
Paul: Okay, I have a cleaner and more compliant recipe and a few questions for your comments. See below... On Wed, Oct 9, 2013 at 2:55 AM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Hi Stephen, Thanks for sending this. A few comments below. On Tuesday 08 October 2013 22:33:44 stephen.arnold42 wrote: From: stephen.arnold42 stephen.arnol...@gmail.com Ideally the part of the subject from updated... onwards should go into the commit message. You should really specify that the rpi layer you refer to is your own. So, [meta-openembedded/meta-webserver][PATCH] nginx: new recipe] and be more accurate about lineage. I only know the IRC nick of the original author of the old recipe (bencoh). I wrote the init script and minimal config file, made sure everything built and ran correctly in the rpi-image, and made an rpi-data package. That lead to me making a newer (generic) recipe for 1.4.0 (but without the rpi-graphics). How should I describe that? With bencoh as the original author and me as upstream? +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff @@ -0,0 +1,212 @@ +diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature Could you please add a header to this patch mentioning what it does, the origin if it wasn't something you wrote, the Upstream-Status and your Signed- off-by? So you want a bigger commit message mentioning the above in front of the signed-off-by that's already there? Origin is described above (bencoh and then me) but what do you mean by Upstream-Status? Who/what is upstream in this case? +DESCRIPTION = HTTP and reverse proxy server Please set this as SUMMARY rather than DESCRIPTION since it's one line. +HOMEPAGE = http://nginx.org/; +LICENSE = BSD Can we be specific about which BSD license this is? Looking at it I think BSD-2-Clause is the correct one. +SECTION = net +PRIORITY = optional Please drop PRIORITY, we don't use this anymore. Done, done, and done. +DEPENDS = libpcre gzip openssl + +PR = r4 PR should ideally be dropped since this is a new recipe for public layers. Dropped completely, or set PR = r0 ? +SRC_URI = \ + http://nginx.org/download/nginx-${PV}.tar.gz \ + file://nginx-cross_${PV}.diff;name=crosspatch \ + file://nginx.conf \ + file://nginx.init \ + + +S = ${WORKDIR}/nginx-${PV} This is the default value for S (${WORKDIR}/${BP} where BP is ${BPN}-${PV} and BPN is nginx) so no need to set this. +inherit autotools update-rc.d useradd I could be mistaken, but looking at the source it doesn't appear to be using autotools, in which case inheriting autotools wouldn't be right. That does mean you'll have to define your own do_install (doing oe_runmake 'DESTDIR=${D}' install before what you currently have in do_install_append). +SRC_URI[md5sum] = d496e58864ab10ed56278b7655b0d0b2 +SRC_URI[sha256sum] = 84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9 +SRC_URI[crosspatch.md5sum] = 707c4cdd6bb82719ea2ed50971101c21 +SRC_URI[crosspatch.sha256sum] = 96cc3b087126caaa0951ab3e3f9f26169e9caf283dd2aeb689ed6c435070f052 We don't normally checksum local files such as crosspatch. +LIC_FILES_CHKSUM = file://LICENSE;md5=917bfdf005ffb6fd025550414ff05a9f + +CONFFILES_${PN} = ${sysconfdir}/nginx/nginx.conf \ + ${sysconfdir}/nginx/fastcgi.conf\ + ${sysconfdir}/nginx/fastcgi_params \ + ${sysconfdir}/nginx/koi-utf \ + ${sysconfdir}/nginx/koi-win \ + ${sysconfdir}/nginx/mime.types \ + ${sysconfdir}/nginx/scgi_params \ + ${sysconfdir}/nginx/uwsgi_params \ + ${sysconfdir}/nginx/win-utf \ + + +INITSCRIPT_NAME = nginx +INITSCRIPT_PARAMS = defaults 92 20 + +do_configure () { + PTRSIZE=$(expr ${SITEINFO_BITS} / 8) + + echo $CFLAGS + echo $LDFLAGS + + ./configure \ + --crossbuild=Linux:${TUNE_ARCH} \ + --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ +--with-int=4 \ + --with-long=${PTRSIZE} \ + --with-long-long=8 \ + --with-ptr-size=${PTRSIZE} \ + --with-sig-atomic-t=${PTRSIZE} \ + --with-size-t=${PTRSIZE} \ + --with-off-t=${PTRSIZE} \ + --with-time-t=${PTRSIZE} \ + --with-sys-nerr=132 \ + --conf-path=/etc/nginx/nginx.conf \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=/var/log/nginx/error.log \ + --pid-path=/var/run/nginx/nginx.pid \ + --prefix=/usr \ + --with-http_ssl_module \ + --with-http_gzip_static_module +} + +do_install_append () { +install -d ${D}${localstatedir}/www/localhost +mv ${D}/usr/html ${D}${localstatedir}/www/localhost/ +chown www:www-data -R ${D}${localstatedir} + +install -d ${D}${sysconfdir}/init.d +install -d ${D}${sysconfdir}/nginx +
Re: [oe] [meta-openembedded/meta-webserver][PATCH] nginx: new recipe, updated from aging original in rpi layer (has not been scrubbed for any potential policy issues).
Hi Steve, On Thursday 17 October 2013 16:21:58 Stephen Arnold wrote: On Wed, Oct 9, 2013 at 2:55 AM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Thanks for sending this. A few comments below. On Tuesday 08 October 2013 22:33:44 stephen.arnold42 wrote: From: stephen.arnold42 stephen.arnol...@gmail.com Ideally the part of the subject from updated... onwards should go into the commit message. You should really specify that the rpi layer you refer to is your own. So, [meta-openembedded/meta-webserver][PATCH] nginx: new recipe] and be more accurate about lineage. Use this form: [meta-webserver][PATCH] nginx: new recipe You may already be aware, but this would be achieved by using nginx: new recipe as the first line of the commit message, and then using --subject-prefix=meta-webserver][PATCH as an argument to git send-email (or git format-patch if generating the patch first before sending). I only know the IRC nick of the original author of the old recipe (bencoh). I wrote the init script and minimal config file, made sure everything built and ran correctly in the rpi-image, and made an rpi-data package. That lead to me making a newer (generic) recipe for 1.4.0 (but without the rpi-graphics). How should I describe that? With bencoh as the original author and me as upstream? It's probably not necessary to fully describe the lineage although a credit to the original author would probably be a good thing. Mainly what I was getting at is if you're going to say meta-rpi you should probably say that that's your layer since it might be assumed by some to refer to the perhaps more well-known meta-raspberrypi layer. +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff @@ -0,0 +1,212 @@ +diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature Could you please add a header to this patch mentioning what it does, the origin if it wasn't something you wrote, the Upstream-Status and your Signed- off-by? So you want a bigger commit message mentioning the above in front of the signed-off-by that's already there? Here I'm referring to the top of the meta-webserver/recipes- httpd/nginx/files/nginx-cross_1.4.0.diff file rather than the overall commit message. Having this information at the top of the patch file itself makes it easy to see what each patch file in the tree is for and whether it needs to be upstreamed without having to go digging through the commit history. Origin is described above (bencoh and then me) but what do you mean by Upstream-Status? Who/what is upstream in this case? Upstream = the nginx project itself; i.e. how does this patch relate to there - should it be submitted there, or did it come from there already, or is it not appropriate for sending upstream, etc. See: http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH] gnome-vfs: Fix build error with new autotools
Don't use srcdir with tests Signed-off-by: Khem Raj raj.k...@gmail.com --- ...kefile.am-remove-DG_DISABLE_DEPRECATED-to.patch | 61 +- .../do-not-use-srcdir-variable.patch | 22 .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb| 1 + 3 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch index d8f7e40..3833299 100644 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch +++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch @@ -13,11 +13,11 @@ Signed-off-by: Andreas Müller schnitzelt...@googlemail.com libgnomevfs/Makefile.am |1 - 2 files changed, 0 insertions(+), 2 deletions(-) -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index ca57467..040484f 100644 a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -8,7 +8,6 @@ INCLUDES= \ +Index: gnome-vfs-2.24.4/daemon/Makefile.am +=== +--- gnome-vfs-2.24.4.orig/daemon/Makefile.am 2013-10-17 16:39:39.081024798 -0700 gnome-vfs-2.24.4/daemon/Makefile.am2013-10-17 16:39:39.213024794 -0700 +@@ -8,7 +8,6 @@ -D_LARGEFILE64_SOURCE \ -D_POSIX_PTHREAD_SEMANTICS \ -D_REENTRANT\ @@ -25,11 +25,11 @@ index ca57467..040484f 100644 -DGNOME_VFS_PREFIX=\$(prefix)\\ -DGNOME_VFS_DATADIR=\$(datadir)\ \ -DGNOME_VFS_LIBDIR=\$(libdir)\\ -diff --git a/libgnomevfs/Makefile.am b/libgnomevfs/Makefile.am -index 69a02e0..5d7d759 100644 a/libgnomevfs/Makefile.am -+++ b/libgnomevfs/Makefile.am -@@ -19,7 +19,6 @@ INCLUDES = \ +Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am +=== +--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 +@@ -19,7 +19,6 @@ -D_LARGEFILE64_SOURCE \ -D_POSIX_PTHREAD_SEMANTICS \ -D_REENTRANT\ @@ -37,6 +37,41 @@ index 69a02e0..5d7d759 100644 -DGNOME_VFS_PREFIX=\$(prefix)\\ -DGNOME_VFS_BINDIR=\$(bindir)\\ -DGNOME_VFS_DATADIR=\$(datadir)\ \ --- -1.7.6.5 - +Index: gnome-vfs-2.24.4/modules/Makefile.am +=== +--- gnome-vfs-2.24.4.orig/modules/Makefile.am 2013-10-17 16:39:39.081024798 -0700 gnome-vfs-2.24.4/modules/Makefile.am 2013-10-17 16:39:39.213024794 -0700 +@@ -18,7 +18,6 @@ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT\ + -DSSH_PROGRAM=\$(SSH_PROGRAM)\\ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\$(prefix)\\ + -DGNOME_VFS_DATADIR=\$(datadir)\ \ + -DGNOME_VFS_LIBDIR=\$(libdir)\\ +Index: gnome-vfs-2.24.4/programs/Makefile.am +=== +--- gnome-vfs-2.24.4.orig/programs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 gnome-vfs-2.24.4/programs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 +@@ -4,8 +4,7 @@ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(TEST_CFLAGS) \ +- $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED ++ $(VFS_CFLAGS) + + libraries = \ + $(top_builddir)/libgnomevfs/libgnomevfs-2.la\ +Index: gnome-vfs-2.24.4/test/Makefile.am +=== +--- gnome-vfs-2.24.4.orig/test/Makefile.am 2010-02-09 04:16:14.0 -0800 gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:42:49.109019172 -0700 +@@ -6,7 +6,6 @@ + -I$(top_builddir)/libgnomevfs \ + $(TEST_CFLAGS) \ + $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ + -DMODULES_PATH=\$(libdir)/vfs/modules\ + + if OS_WIN32 diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch new file mode 100644 index 000..30ca29b --- /dev/null +++
Re: [oe] [meta-oe][PATCHv2 1/3] libraw1394: add recipe
On Oct 17, 2013, at 4:59 PM, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Oct 17, 2013 at 04:11:58PM -0700, Khem Raj wrote: From: Cliff Brake cbr...@bec-systems.com Initial recipe created by Khem Raj libraw1394 was already merged today: http://git.openembedded.org/meta-openembedded/commit/?h=doraid=cd8755253e6972356e2172670c1861ea664b0f0a http://git.openembedded.org/meta-openembedded/commit/?id=309eb8a5ff0e7ecbeaf191a9dc906b618d40dd94 It wasn't removed when you rebased, because it was moved to recipes-support as discussed on #oe. hmmm, ok, it was an update so I will redo it. I haven't merged coriander yet, because it wasn't build on jenkins at all, because one of dependencies failed because of newer automake. Signed-off-by: Cliff Brake cbr...@bec-systems.com Signed-off-by: Khem Raj raj.k...@gmail.com --- meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb diff --git a/meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb b/meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb new file mode 100644 index 000..617ba1b --- /dev/null +++ b/meta-oe/recipes-multimedia/libraw1394/libraw1394_2.1.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = base library for low-level IEEE 1394 accesses +HOMEPAGE = https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394; +SECTION = libs +LICENSE = LGPL-2.1 +LIC_FILES_CHKSUM = file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 + +SRC_URI = https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz; +SRC_URI[md5sum] = d06cccb776b240b6ab5efdee33b87af2 +SRC_URI[sha256sum] = a83cff16fb8885831bc29d7d17f3c570dc39251d89e20795c08e87720de0ba70 + +inherit autotools -- 1.8.3.2 ___ 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 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH] libbonobo: Fix build error with new autotools
Don't use srcdir with tests Signed-off-by: Khem Raj raj.k...@gmail.com --- .../libbonobo/do-not-use-srcdir-variable.patch | 24 ++ .../recipes-gnome/bonobo/libbonobo_2.24.3.bb | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch new file mode 100644 index 000..46f8137 --- /dev/null +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch @@ -0,0 +1,24 @@ +| tests/Makefile.am:55: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/te +st-properties.sh' +| tests/test-activation/Makefile.am:76: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS +' (or '*_CPPFLAGS') +| utils/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS +') +| autoreconf: automake failed with exit status: 1 + +Signed-off-by: Khem Raj raj.k...@gmail.com +Upstream-Status: Not Submitted + +Index: libbonobo-2.24.3/tests/Makefile.am +=== +--- libbonobo-2.24.3.orig/tests/Makefile.am2009-04-18 05:27:41.0 -0700 libbonobo-2.24.3/tests/Makefile.am 2013-10-17 16:59:45.612989079 -0700 +@@ -53,7 +53,7 @@ + MODELS_DIR=$(srcdir)/models + + TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \ +- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \ ++ test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \ + test-generic-factory.sh test-main-loop$(EXEEXT) + check_SCRIPTS = test-properties.sh test-generic-factory.sh + EXTRA_DIST=$(check_SCRIPTS) Test_Generic_Factory.server diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb index 622f244..b837802 100644 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb @@ -1,6 +1,8 @@ require libbonobo.inc PR = r2 -SRC_URI += file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch +SRC_URI += file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ +file://do-not-use-srcdir-variable.patch \ + SRC_URI[archive.md5sum] = b217cef6a187505290c66c5bf8225d38 SRC_URI[archive.sha256sum] = 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V3] libraw1394: Upgrade 2.0.9 - 2.1.0
Signed-off-by: Khem Raj raj.k...@gmail.com --- .../libraw1394/{libraw1394_2.0.9.bb = libraw1394_2.1.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/libraw1394/{libraw1394_2.0.9.bb = libraw1394_2.1.0.bb} (55%) diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.0.9.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb similarity index 55% rename from meta-oe/recipes-support/libraw1394/libraw1394_2.0.9.bb rename to meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb index b0b4a53..617ba1b 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.0.9.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb @@ -4,8 +4,8 @@ SECTION = libs LICENSE = LGPL-2.1 LIC_FILES_CHKSUM = file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 -SRC_URI = https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.gz; -SRC_URI[md5sum] = faf6b18a92075d80e45b603f9a659670 -SRC_URI[sha256sum] = f83268b3f5d37e8d42ae9881c099b55839b70ac0af71549be7ef6af2578e809a +SRC_URI = https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz; +SRC_URI[md5sum] = d06cccb776b240b6ab5efdee33b87af2 +SRC_URI[sha256sum] = a83cff16fb8885831bc29d7d17f3c570dc39251d89e20795c08e87720de0ba70 inherit autotools -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH V3] coriander: add recipe
From: Cliff Brake cbr...@bec-systems.com Initial recipe created by Khem Raj Signed-off-by: Cliff Brake cbr...@bec-systems.com Signed-off-by: Khem Raj raj.k...@gmail.com --- .../coriander/coriander/cross-compile.patch | 17 + .../recipes-multimedia/coriander/coriander_2.0.2.bb | 15 +++ 2 files changed, 32 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch create mode 100755 meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb diff --git a/meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch b/meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch new file mode 100644 index 000..49350fe --- /dev/null +++ b/meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch @@ -0,0 +1,17 @@ +In a cross compile environment adding paths like /usr are not correct. +With this patch we make it so that its relative to sysroot if the compiler +defines one. + +Upstream-Status: Pending +Signed-off-by: Khem Raj raj.k...@gmail.com +Index: a/src/Makefile.am +=== +--- a/src/Makefile.am 2013-02-08 22:35:08.0 -0800 b/src/Makefile.am 2013-10-13 01:31:38.812869080 -0700 +@@ -33,5 +33,5 @@ + video_encode.c video_encode.h \ + subtitles.c subtitles.h + +-coriander_LDADD = -L/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS) ++coriander_LDADD = -L=/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS) + diff --git a/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb b/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb new file mode 100755 index 000..64ccc9b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = Control and capture GUI for IIDC compliant cameras +HOMEPAGE = http://damien.douxchamps.net/ieee1394/coriander/; +SECTION = applications +LICENSE = GPL-3.0 +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 +DEPENDS = gtk+ libgnomeui libraw1394 libdc1394 libxv + +SRC_URI = ${SOURCEFORGE_MIRROR}/project/${PN}/coriander-2/${PV}/${P}.tar.gz \ + file://cross-compile.patch \ + + +SRC_URI[md5sum] = 431d98fb013217681f97ade168201fb8 +SRC_URI[sha256sum] = 5c7fd31cb58d398e2742352bf1ffbd2ca22e06686c6668ecfd437735c2b79123 + +inherit autotools gettext -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] nginx: new recipe
From: stephen.arnold42 stephen.arnol...@gmail.com Initial recipe created by Steve Arnold. Original build patch and 1.0.10 recipe graciously contributed by bencoh (in #oe on irc.freenode.net). New recipe and init script contributed by this author. Built and tested on master branches using author's fork of meta-raspberrypi. https://github.com/sarnold/meta-raspberrypi Upstream-Status: Inappropriate [embedded specific] Signed-off-by: stephen.arnold42 stephen.arnol...@gmail.com --- .../nginx/files/nginx-cross_1.4.0.diff | 229 + .../recipes-httpd/nginx/files/nginx.conf | 118 +++ .../recipes-httpd/nginx/files/nginx.init | 52 + meta-webserver/recipes-httpd/nginx/nginx_1.4.0.bb | 91 4 files changed, 490 insertions(+) create mode 100644 meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff create mode 100644 meta-webserver/recipes-httpd/nginx/files/nginx.conf create mode 100755 meta-webserver/recipes-httpd/nginx/files/nginx.init create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.4.0.bb diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff b/meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff new file mode 100644 index 000..f2e4d27 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff @@ -0,0 +1,229 @@ +From a2ebf96bb3ced6cb1c796267833edcfefc38f878 Mon Sep 17 00:00:00 2001 +From: stephen.arnold42 stephen.arnol...@gmail.com +Date: Tue, 8 Oct 2013 22:29:19 -0700 +Subject: [PATCH] nginx: new recipe + +Initial recipe created by Steve Arnold. Original build patch and 1.0.10 +recipe graciously contributed by bencoh (in #oe on irc.freenode.net). +New recipe and init script contributed by this author. Built and +tested on master branches using author's fork of meta-raspberrypi. + +https://github.com/sarnold/meta-raspberrypi + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: stephen.arnold42 stephen.arnol...@gmail.com +--- + +diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature +--- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.0 -0500 nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 +@@ -48,12 +48,20 @@ + + if [ -x $NGX_AUTOTEST ]; then + ++if [ .$NGX_CROSS_COMPILE = .yes ]; then ++NGX_AUTOTEST_EXEC=true ++ NGX_FOUND_MSG= (not tested, cross compiling) ++else ++NGX_AUTOTEST_EXEC=$NGX_AUTOTEST ++ NGX_FOUND_MSG= ++fi ++ + case $ngx_feature_run in + + yes) + # /bin/sh is used to intercept Killed or Abort trap messages +-if /bin/sh -c $NGX_AUTOTEST $NGX_AUTOCONF_ERR 21; then +-echo found ++if /bin/sh -c $NGX_AUTOTEST_EXEC $NGX_AUTOCONF_ERR 21; then ++echo found$NGX_FOUND_MSG + ngx_found=yes + + if test -n $ngx_feature_name; then +@@ -67,17 +75,27 @@ + + value) + # /bin/sh is used to intercept Killed or Abort trap messages +-if /bin/sh -c $NGX_AUTOTEST $NGX_AUTOCONF_ERR 21; then +-echo found ++if /bin/sh -c $NGX_AUTOTEST_EXEC $NGX_AUTOCONF_ERR 21; then ++echo found$NGX_FOUND_MSG + ngx_found=yes + +-cat END $NGX_AUTO_CONFIG_H ++if [ .$NGX_CROSS_COMPILE = .yes ]; then ++cat END $NGX_AUTO_CONFIG_H + + #ifndef $ngx_feature_name +-#define $ngx_feature_name `$NGX_AUTOTEST` ++#define $ngx_feature_name $(eval echo \$NGX_WITH_${ngx_feature_name}) + #endif + + END ++ else ++cat END $NGX_AUTO_CONFIG_H ++ ++#ifndef $ngx_feature_name ++#define $ngx_feature_name `$NGX_AUTOTEST_EXEC` ++#endif ++ ++END ++fi + else + echo found but is not working + fi +@@ -85,7 +103,7 @@ + + bug) + # /bin/sh is used to intercept Killed or Abort trap messages +-if /bin/sh -c $NGX_AUTOTEST $NGX_AUTOCONF_ERR 21; then ++if /bin/sh -c $NGX_AUTOTEST_EXEC $NGX_AUTOCONF_ERR 21; then + echo not found + + else +diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options +--- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.0 -0600 nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 +@@ -289,6 +289,18 @@ + --test-build-rtsig) NGX_TEST_BUILD_RTSIG=YES ;; + --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; + ++# cross compile support ++--with-int=*)NGX_WITH_INT=$value ;; ++--with-long=*) NGX_WITH_LONG=$value ;; ++--with-long-long=*) NGX_WITH_LONG_LONG=$value;; ++--with-ptr-size=*) NGX_WITH_PTR_SIZE=$value ;; ++
Re: [oe] [meta-oe][PATCH] tftpd-hpa: fix premature exit
ping On 12 October 2013 08:04, David Turgeon david.turg...@gmail.com wrote: standalone daemon exits as recipe installs file as tftpd-hpa * Changed script so it can consult /etc/default, as daemon name may be subject to change. * Changed the default name to match the recipe Signed-off-by: David Turgeon david.turg...@gmail.com --- .../recipes-daemons/tftp-hpa/files/init| 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/init b/meta-networking/recipes-daemons/tftp-hpa/files/init index 5ad8c52..9e18436 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/init +++ b/meta-networking/recipes-daemons/tftp-hpa/files/init @@ -18,20 +18,21 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DESC=HPA's tftpd -NAME=in.tftpd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid +NAME=in.tftpd-hpa SCRIPTNAME=/etc/init.d/tftpd-hpa -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - # Read config file if it is present. if [ -r /etc/default/tftpd-hpa ] then . /etc/default/tftpd-hpa fi +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + if [ $RUN_DAEMON != yes ] ; then echo tftpd-hpa disabled in /etc/default/tftpd-hpa exit 0 -- 1.7.9.5 -- Dave ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH] gnumeric: Fix build failure with newer autotools
Backports from upstream Signed-off-by: Khem Raj raj.k...@gmail.com --- .../gnumeric/gnumeric/do-not-use-srcdir.patch | 15 +++ meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb | 5 - 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch new file mode 100644 index 000..cc81b1f --- /dev/null +++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch @@ -0,0 +1,15 @@ +Index: gnumeric-1.12.0/test/Makefile.am +=== +--- gnumeric-1.12.0.orig/test/Makefile.am 2011-05-17 17:54:24.0 -0700 gnumeric-1.12.0/test/Makefile.am 2013-10-17 20:28:19.920618596 -0700 +@@ -25,7 +25,9 @@ + # + # 90xx: Misc stuff. + +-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) ++TESTS_EXTENSIONS=.pl ++TESTS = @auto_find_tests@ ++ + SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp + + import-db: diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb index 4f40594..041ab3f 100644 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb +++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb @@ -7,10 +7,13 @@ DESCRIPTION = Gnumeric spreadsheet for GNOME GNOME_COMPRESS_TYPE = xz +inherit gnome + +SRC_URI += file://do-not-use-srcdir.patch + SRC_URI[archive.md5sum] = 3fd87cca95334b5d8ac922989670fe27 SRC_URI[archive.sha256sum] = 037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111 -inherit gnome EXTRA_OECONF= --without-perl -- 1.8.3.2 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] breakpad: add initial recipe
Breakpad is an open-source multi-platform crash reporting system. Apart from the breakpad recipe, add a bbclass for applications that want to use this library. This bbclass will set up the include path and also generate the symbol file. Signed-off-by: Anders Darander and...@chargestorm.se --- meta-oe/classes/breakpad.bbclass | 32 ++ meta-oe/recipes-devtools/breakpad/breakpad_svn.bb | 72 +++ 2 files changed, 104 insertions(+) create mode 100644 meta-oe/classes/breakpad.bbclass create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad_svn.bb diff --git a/meta-oe/classes/breakpad.bbclass b/meta-oe/classes/breakpad.bbclass new file mode 100644 index 000..8c49ca7 --- /dev/null +++ b/meta-oe/classes/breakpad.bbclass @@ -0,0 +1,32 @@ +# Class to inherit when you want to build against Breakpad. +# Apart from inheriting this class, you need to set BREAKPAD_BIN in +# your recipe, and make sure that you link against libbreakpad_client.a. + +DEPENDS += breakpad breakpad-native + +CFLAGS += -I${STAGING_DIR_TARGET}${includedir}/breakpad + +BREAKPAD_BIN ?= + +python () { +breakpad_bin = d.getVar(BREAKPAD_BIN, True) + +if not breakpad_bin: + PN = d.getVar(PN, True) + FILE = os.path.basename(d.getVar(FILE, True)) + bb.error(To build %s, see breakpad.bbclass for instructions on \ + setting up your Breakpad configuration % PN) + raise ValueError('BREAKPAD_BIN not defined in %s' % PN) +} + +# Add creation of symbols here +PACKAGE_PREPROCESS_FUNCS += breakpad_package_preprocess +breakpad_package_preprocess () { +mkdir -p ${PKGD}/usr/share/breakpad-syms +find ${D} -name ${BREAKPAD_BIN} -exec sh -c dump_syms {} ${PKGD}/usr/share/breakpad-syms/${BREAKPAD_BIN}.syms \; +} + +PACKAGES =+ ${PN}-breakpad + +FILES_${PN}-breakpad = /usr/share/breakpad-syms + diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb b/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb new file mode 100644 index 000..7c7024a --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb @@ -0,0 +1,72 @@ +# Released under the MIT license (see COPYING.MIT for the terms) + +# Applications using this library needs to add link against libbreakpad_client.a. + +SUMMARY = An open-source multi-platform crash reporting system +DESCRIPTION = Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided debugging information removed, record crashes in compact \minidump\ files, send them back to your server, and produce C and C++ stack traces from these minidumps. +HOMEPAGE = https://code.google.com/p/google-breakpad/; +LICENSE = BSD-3-Clause +LIC_FILES_CHKSUM = file://COPYING;md5=c80d1a3b623f72bb85a4c75b556551df +SECTION = libs + +inherit autotools + +BBCLASSEXTEND = native + +SRCREV = r1218 +SRC_URI = svn://google-breakpad.googlecode.com/svn;module=trunk;protocol=http +S = ${WORKDIR}/trunk + +do_install_append() { +install -d ${D}${includedir} +install -d ${D}${includedir}/breakpad + +install -d ${D}${includedir}/breakpad/client/linux/crash_generation +install -m 0644 ${S}/src/client/linux/crash_generation/crash_generation_client.h ${D}${includedir}/breakpad/client/linux/crash_generation/crash_generation_client.h + +install -d ${D}${includedir}/breakpad/client/linux/handler/ +install -m 0644 ${S}/src/client/linux/handler/exception_handler.h ${D}${includedir}/breakpad/client/linux/handler/exception_handler.h +install -m 0644 ${S}/src/client/linux/handler/minidump_descriptor.h ${D}${includedir}/breakpad/client/linux/handler/minidump_descriptor.h + +install -d ${D}${includedir}/breakpad/client/linux/minidump_writer +install -m 0644 ${S}/src/client/linux/minidump_writer/linux_dumper.h ${D}${includedir}/breakpad/client/linux/minidump_writer/linux_dumper.h +install -m 0644 ${S}/src/client/linux/minidump_writer/minidump_writer.h ${D}${includedir}/breakpad/client/linux/minidump_writer/minidump_writer.h + +install -d ${D}${includedir}/breakpad/common +install -m 0644 ${S}/src/common/memory.h ${D}${includedir}/breakpad/common/memory.h +install -m 0644 ${S}/src/common/scoped_ptr.h ${D}${includedir}/breakpad/common/scoped_ptr.h +install -m 0644 ${S}/src/common/using_std_string.h ${D}${includedir}/breakpad/common/using_std_string.h + +install -d ${D}${includedir}/breakpad/google_breakpad/common +install -m 0644 ${S}/src/google_breakpad/common/breakpad_types.h ${D}${includedir}/breakpad/google_breakpad/common/breakpad_types.h +install -m 0644 ${S}/src/google_breakpad/common/minidump_format.h ${D}${includedir}/breakpad/google_breakpad/common/minidump_format.h +install -m 0644 ${S}/src/google_breakpad/common/minidump_cpu_amd64.h ${D}${includedir}/breakpad/google_breakpad/common/minidump_cpu_amd64.h +install -m 0644
Re: [oe] [PATCH 0/2] Breakpad and ktap recipes
I'm going to resend this series with the correct prefix added. Anders Darander and...@chargestorm.se wrote: These are a couple of recipes that we've been using internally for some time. They were developed and mostly used on a dylan-based setup. Testing has primarily been performed on ARM, both qemuarm and our custom machine. Breakpad is a crash reporting tool, that's getting a wider use. Please, let me know if there's a more efficient way (or otherwise better way) to have the bbclass generate the symbol file. Ktap is a new scripting dynamic tracing tool for Linux. This recipe will be of use until everyone is on 3.13+ kernels (ktap has been merged for the 3.13 series). The following changes since commit f8903f53db717294d63a8d79b5ef7ca34b3c189e: libhugetlbfs: install perl lib to directory perl instead of perl5 (2013-10-15 13:43:53 +0200) are available in the git repository at: git://github.com/darander/meta-oe breakpad-ktap https://github.com/darander/meta-oe/tree/breakpad-ktap Anders Darander (2): breakpad: add initial recipe ktap: add initial recipe meta-oe/classes/breakpad.bbclass | 32 ++ meta-oe/recipes-devtools/breakpad/breakpad_svn.bb | 72 +++ meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb| 19 ++ meta-oe/recipes-kernel/ktap/ktap.inc | 11 meta-oe/recipes-kernel/ktap/ktap_0.3.bb | 17 ++ 5 files changed, 151 insertions(+) create mode 100644 meta-oe/classes/breakpad.bbclass create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad_svn.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap.inc create mode 100644 meta-oe/recipes-kernel/ktap/ktap_0.3.bb -- ChargeStorm AB / eStorm ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/2] Breakpad and ktap recipes
[Resending with meta-oe in subject.] These are a couple of recipes that we've been using internally for some time. They were developed and mostly used on a dylan-based setup. Testing has primarily been performed on ARM, both qemuarm and our custom machine. Breakpad is a crash reporting tool, that's getting a wider use. Please, let me know if there's a more efficient way (or otherwise better way) to have the bbclass generate the symbol file. Ktap is a new scripting dynamic tracing tool for Linux. This recipe will be of use until everyone is on 3.13+ kernels (ktap has been merged for the 3.13 series). The following changes since commit f8903f53db717294d63a8d79b5ef7ca34b3c189e: libhugetlbfs: install perl lib to directory perl instead of perl5 (2013-10-15 13:43:53 +0200) are available in the git repository at: git://github.com/darander/meta-oe breakpad-ktap https://github.com/darander/meta-oe/tree/breakpad-ktap Anders Darander (2): breakpad: add initial recipe ktap: add initial recipe meta-oe/classes/breakpad.bbclass | 32 ++ meta-oe/recipes-devtools/breakpad/breakpad_svn.bb | 72 +++ meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb| 19 ++ meta-oe/recipes-kernel/ktap/ktap.inc | 11 meta-oe/recipes-kernel/ktap/ktap_0.3.bb | 17 ++ 5 files changed, 151 insertions(+) create mode 100644 meta-oe/classes/breakpad.bbclass create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad_svn.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap.inc create mode 100644 meta-oe/recipes-kernel/ktap/ktap_0.3.bb -- 1.8.4.rc3 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel