[oe] [meta-qt5][PATCH v2] Explicitly disable Debian-style package renaming for nativesdk-qtbase-tools
Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files
are included in the nativesdk-qtbase-tools package. However, this together
with the fact that the binaries are placed in a subdir qt5 of bin will
confuse the Debian-style package renaming logic in debian.bbclass, causing the
resulting ipk package to be created as nativesdk-libqt5core5.
Signed-off-by: Jacob Kroon jacob.kr...@mikrodidakt.se
---
recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++
1 file changed, 6 insertions(+)
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc
b/recipes-qt/qt5/nativesdk-qtbase.inc
index 3cb9b0e..884b1a6 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -60,6 +60,12 @@ FILES_${PN}-tools = \
${OE_QMAKE_PATH_BINS}/* \
+# qttools binaries are placed in a subdir of bin in order to avoid
+# collisions with qt4. This would trigger debian.bbclass to rename the
+# package, since it doesn't detect binaries in subdirs. Explicitly
+# disable package auto-renaming for the tools-package.
+DEBIAN_NOAUTONAME_${PN}-tools = 1
+
QT_CONFIG_FLAGS += \
-reduce-relocations \
-shared \
--
1.8.5.3
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 4/4][meta-webserver] apache2-2.4.7: added support for TLS Next Protocol Negotiation
On 02/28/2014 03:08 AM, Randy MacLeod wrote:
On 14-02-26 10:22 PM, Hongxu Jia wrote:
The previous npn support patch (httpd-2.4.4-r1332643.patch) worked on
apache2-2.4.6 and conflicted with apache2-2.4.7, this patch fixed the
confliction with 2.4.7.
Hongxu,
Thanks, that's a good step. Even better would be to add the
apache module that supports SPDY and confirm that it works
with your desktop (google-chrome) browser.
See:
http://lists.openembedded.org/pipermail/openembedded-devel/2014-January/093772.html
and
https://code.google.com/p/mod-spdy/wiki/GettingStarted
Hi Randy,
I have tested, the ssl worked well with the new patch,
but the mod_spdy doesn't support 2.4.7 for now, and the
spdy test failed.
http://code.google.com/p/mod-spdy/issues/detail?id=63
http://code.google.com/p/mod-spdy/issues/detail?id=64
http://code.google.com/p/mod-spdy/issues/detail?id=65
...
root@qemux86-64:/etc/apache2# /etc/init.d/apache2 restart
httpd: Syntax error on line 151 of /etc/apache2/httpd.conf: Cannot load
lib64/apache2/modules/mod_spdy.so into server:
/usr/lib64/apache2/modules/mod_spdy.so: undefined symbol: ap_log_cerror
...
//Hongxu
It doesn't seem to be a huge task but let us know what you find out.
../Randy
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
.../apache2/apache2/npn-patch-2.4.7.patch | 289
+
.../recipes-httpd/apache2/apache2_2.4.7.bb | 1 +
2 files changed, 290 insertions(+)
create mode 100644
meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
diff --git
a/meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
b/meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
new file mode 100644
index 000..a4f1855
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
@@ -0,0 +1,289 @@
+Add support for TLS Next Protocol Negotiation:
+
+* modules/ssl/mod_ssl.c, modules/ssl/mod_ssl.h: Add and implement new
+ hooks for next protocol advertisement/discovery.
+
+* modules/ssl/ssl_engine_init.c (ssl_init_ctx_callbacks): Enable
+ NPN advertisement callback in handshake.
+
+* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): Invoke
+ next-protocol discovery hook.
+
+* modules/ssl/ssl_engine_kernel.c (ssl_callback_AdvertiseNextProtos):
+ New callback.
+
+* modules/ssl/ssl_private.h: Add prototype.
+
+Submitted by: Matthew Steele mdsteele google.com
+ with slight tweaks by jorton
+
+http://svn.apache.org/viewvc?view=revisionrevision=1332643
+https://bugzilla.redhat.com//show_bug.cgi?id=809599
+Upstream-Status: Backport
+Signed-off-by: Hongxu Jia hongxu@windriver.com
+---
+ CHANGES | 2 +
+ modules/ssl/mod_ssl.c | 12 ++
+ modules/ssl/mod_ssl.h | 21 +++
+ modules/ssl/ssl_engine_init.c | 5 +++
+ modules/ssl/ssl_engine_io.c | 24
+ modules/ssl/ssl_engine_kernel.c | 82
+
+ modules/ssl/ssl_private.h | 6 +++
+ 7 files changed, 152 insertions(+)
+
+diff --git a/CHANGES b/CHANGES
+--- a/CHANGES
b/CHANGES
+@@ -1,6 +1,8 @@
+ -*-
coding: utf-8 -*-
+
+ Changes with Apache 2.4.7
++ *) mod_ssl: Add support for TLS Next Protocol Negotiation. PR 52210.
++ [Matthew Steele mdsteele google.com]
+
+ *) APR 1.5.0 or later is now required for the event MPM.
+
+diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
+--- a/modules/ssl/mod_ssl.c
b/modules/ssl/mod_ssl.c
+@@ -275,6 +275,18 @@ static const command_rec ssl_config_cmds[] = {
+ AP_END_CMD
+ };
+
++/* Implement 'modssl_run_npn_advertise_protos_hook'. */
++APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(
++modssl, AP, int, npn_advertise_protos_hook,
++(conn_rec *connection, apr_array_header_t *protos),
++(connection, protos), OK, DECLINED);
++
++/* Implement 'modssl_run_npn_proto_negotiated_hook'. */
++APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(
++modssl, AP, int, npn_proto_negotiated_hook,
++(conn_rec *connection, const char *proto_name, apr_size_t
proto_name_len),
++(connection, proto_name, proto_name_len), OK, DECLINED);
++
+ /*
+ * the various processing hooks
+ */
+diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
+--- a/modules/ssl/mod_ssl.h
b/modules/ssl/mod_ssl.h
+@@ -63,5 +63,26 @@ APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable,
(conn_rec *));
+
+ APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
+
++/** The npn_advertise_protos optional hook allows other modules to
add entries
++ * to the list of protocol names advertised by the server during
the Next
++ * Protocol Negotiation (NPN) portion of the SSL handshake. The
hook callee is
++ * given the connection and an APR array; it should push one or
more char*'s
++ * pointing to null-terminated strings (such as http/1.1 or
spdy/2) onto
++ * the array and return OK, or do nothing and return DECLINED. */
Re: [oe] [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 02:04:30PM +0100, Matthieu Crapet wrote:
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- use TABS for (shell) indentation
Please don't.
meta-oe layers are using consistent indentation with 4 spaces and no
tabs.
- add DESCRIPTION
- no more QA warnings
Use this to reveal:
sed -i -e '/^verbose/s/no/yes/' ${S}/mk/Autoconf.mk
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 39
+++-
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index 32f376f..a3abf8f 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -1,27 +1,54 @@
+SUMMARY = Framebuffer image and doc viewer tools
+DESCRIPTION = The fbida project contains a few applications for viewing and
editing images, \
+ with the main focus being photos.
HOMEPAGE = http://linux.bytesex.org/fbida/;
-SUMMARY = frame buffer image and doc viewer tools
AUTHOR = Gerd Hoffmann
SECTION = utils
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-DEPENDS = virtual/libiconv libpng jpeg fontconfig freetype libexif curl
libungif tiff
+DEPENDS = virtual/libiconv jpeg fontconfig freetype libexif curl
+PR = r1
+
+# Note: SRCREV is 3 revisions ahead of 2.09
SRC_URI = git://git.kraxel.org/fbida
SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
S = ${WORKDIR}/git
EXTRA_OEMAKE = STRIP=
+PACKAGECONFIG ??= gif png
+PACKAGECONFIG[gif] = ,,libungif
+PACKAGECONFIG[png] = ,,libpng
+PACKAGECONFIG[tiff] = ,,tiff
+
do_compile() {
-sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
-oe_runmake
+ sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
+ sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:'
${S}/GNUmakefile
+
+ if [ -z ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ];
then
+ sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+
+ # Be sure to respect preferences (force to no)
+ # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
+ if [ -z ${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)} ];
then
+ sed -i -e '/^HAVE_LIBUNGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+ if [ -z ${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)} ];
then
+ sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+ if [ -z ${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)} ];
then
+ sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+
+ oe_runmake
}
do_install() {
-oe_runmake 'DESTDIR=${D}' install
+ oe_runmake 'DESTDIR=${D}' install
}
RDEPENDS_${PN} = ttf-dejavu-sans-mono
-
--
1.8.5.4
___
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
Re: [oe] [meta-qt5][PATCH v2] Explicitly disable Debian-style package renaming for nativesdk-qtbase-tools
On Fri, Feb 28, 2014 at 6:33 AM, Jacob Kroon jacob.kr...@mikrodidakt.se wrote: Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files are included in the nativesdk-qtbase-tools package. However, this together with the fact that the binaries are placed in a subdir qt5 of bin will confuse the Debian-style package renaming logic in debian.bbclass, causing the resulting ipk package to be created as nativesdk-libqt5core5. Signed-off-by: Jacob Kroon jacob.kr...@mikrodidakt.se Please rework the commitlog as: nativesdk-qtbase-tools: disable Debian-style package renaming Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files are included in the nativesdk-qtbase-tools package. However, this together with the fact that the binaries are placed in a subdir qt5 of bin will confuse the Debian-style package renaming logic in debian.bbclass, causing the resulting ipk package to be created as nativesdk-libqt5core5. Signed-off-by: Jacob Kroon jacob.kr...@mikrodidakt.se and please add my Acked-by. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- use TABS for (shell) indentation
- add DESCRIPTION
- no more QA warnings
Use this to reveal:
sed -i -e '/^verbose/s/no/yes/' ${S}/mk/Autoconf.mk
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 39 +++-
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index 32f376f..a3abf8f 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -1,27 +1,54 @@
+SUMMARY = Framebuffer image and doc viewer tools
+DESCRIPTION = The fbida project contains a few applications for viewing and
editing images, \
+ with the main focus being photos.
HOMEPAGE = http://linux.bytesex.org/fbida/;
-SUMMARY = frame buffer image and doc viewer tools
AUTHOR = Gerd Hoffmann
SECTION = utils
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-DEPENDS = virtual/libiconv libpng jpeg fontconfig freetype libexif curl
libungif tiff
+DEPENDS = virtual/libiconv jpeg fontconfig freetype libexif curl
+PR = r1
+
+# Note: SRCREV is 3 revisions ahead of 2.09
SRC_URI = git://git.kraxel.org/fbida
SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
S = ${WORKDIR}/git
EXTRA_OEMAKE = STRIP=
+PACKAGECONFIG ??= gif png
+PACKAGECONFIG[gif] = ,,libungif
+PACKAGECONFIG[png] = ,,libpng
+PACKAGECONFIG[tiff] = ,,tiff
+
do_compile() {
-sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
-oe_runmake
+ sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
+ sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:'
${S}/GNUmakefile
+
+ if [ -z ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ];
then
+ sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+
+ # Be sure to respect preferences (force to no)
+ # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
+ if [ -z ${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)} ];
then
+ sed -i -e '/^HAVE_LIBUNGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+ if [ -z ${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)} ];
then
+ sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+ if [ -z ${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)} ];
then
+ sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
+
+ oe_runmake
}
do_install() {
-oe_runmake 'DESTDIR=${D}' install
+ oe_runmake 'DESTDIR=${D}' install
}
RDEPENDS_${PN} = ttf-dejavu-sans-mono
-
--
1.8.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v3] nativesdk-qtbase-tools: disable Debian-style package renaming
Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files
are included in the nativesdk-qtbase-tools package. However, this together
with the fact that the binaries are placed in a subdir qt5 of bin will
confuse the Debian-style package renaming logic in debian.bbclass, causing the
resulting ipk package to be created as nativesdk-libqt5core5.
Signed-off-by: Jacob Kroon jacob.kr...@mikrodidakt.se
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++
1 file changed, 6 insertions(+)
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc
b/recipes-qt/qt5/nativesdk-qtbase.inc
index 3cb9b0e..884b1a6 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -60,6 +60,12 @@ FILES_${PN}-tools = \
${OE_QMAKE_PATH_BINS}/* \
+# qttools binaries are placed in a subdir of bin in order to avoid
+# collisions with qt4. This would trigger debian.bbclass to rename the
+# package, since it doesn't detect binaries in subdirs. Explicitly
+# disable package auto-renaming for the tools-package.
+DEBIAN_NOAUTONAME_${PN}-tools = 1
+
QT_CONFIG_FLAGS += \
-reduce-relocations \
-shared \
--
1.8.5.3
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v3] nativesdk-qtbase-tools: disable Debian-style package renaming
On Fri, Feb 28, 2014 at 10:34 AM, Jacob Kroon jacob.kr...@mikrodidakt.se wrote: Since commit 8da5017712a7ddcb8488e095b9aa03b0273f23e9, libQt5*.so files are included in the nativesdk-qtbase-tools package. However, this together with the fact that the binaries are placed in a subdir qt5 of bin will confuse the Debian-style package renaming logic in debian.bbclass, causing the resulting ipk package to be created as nativesdk-libqt5core5. Signed-off-by: Jacob Kroon jacob.kr...@mikrodidakt.se Acked-by: Otavio Salvador ota...@ossystems.com.br I applied this one. I confirmed it works as expected with buildhistory. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- add DESCRIPTION
- no more QA warnings
Use this to reveal:
sed -i -e '/^verbose/s/no/yes/' ${S}/mk/Autoconf.mk
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 35
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index 32f376f..0c663c1 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -1,21 +1,49 @@
+SUMMARY = Framebuffer image and doc viewer tools
+DESCRIPTION = The fbida project contains a few applications for viewing and
editing images, \
+ with the main focus being photos.
HOMEPAGE = http://linux.bytesex.org/fbida/;
-SUMMARY = frame buffer image and doc viewer tools
AUTHOR = Gerd Hoffmann
SECTION = utils
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-DEPENDS = virtual/libiconv libpng jpeg fontconfig freetype libexif curl
libungif tiff
+DEPENDS = virtual/libiconv jpeg fontconfig freetype libexif curl
+PR = r1
+
+# Note: SRCREV is 3 revisions ahead of 2.09
SRC_URI = git://git.kraxel.org/fbida
SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
S = ${WORKDIR}/git
EXTRA_OEMAKE = STRIP=
+PACKAGECONFIG ??= gif png
+PACKAGECONFIG[gif] = ,,libungif
+PACKAGECONFIG[png] = ,,libpng
+PACKAGECONFIG[tiff] = ,,tiff
+
do_compile() {
-sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
+sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
+sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:'
${S}/GNUmakefile
+
+if [ -z ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ]; then
+sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
+# Be sure to respect preferences (force to no)
+# Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
+if [ -z ${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)} ]; then
+sed -i -e '/^HAVE_LIBUNGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)} ]; then
+sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)} ]; then
+sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
oe_runmake
}
@@ -24,4 +52,3 @@ do_install() {
}
RDEPENDS_${PN} = ttf-dejavu-sans-mono
-
--
1.8.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 02:41:40PM +0100, Matthieu Crapet wrote:
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- add DESCRIPTION
- no more QA warnings
Use this to reveal:
sed -i -e '/^verbose/s/no/yes/' ${S}/mk/Autoconf.mk
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 35
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index 32f376f..0c663c1 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -1,21 +1,49 @@
+SUMMARY = Framebuffer image and doc viewer tools
+DESCRIPTION = The fbida project contains a few applications for viewing and
editing images, \
+ with the main focus being photos.
HOMEPAGE = http://linux.bytesex.org/fbida/;
-SUMMARY = frame buffer image and doc viewer tools
AUTHOR = Gerd Hoffmann
SECTION = utils
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-DEPENDS = virtual/libiconv libpng jpeg fontconfig freetype libexif curl
libungif tiff
+DEPENDS = virtual/libiconv jpeg fontconfig freetype libexif curl
+PR = r1
you don't need this
+
+# Note: SRCREV is 3 revisions ahead of 2.09
It would be better to add
PV = 2.09+git${SRCPV}
and rename the recipe to fbida_git.bb that way it will be clear from
package version which revision was used.
SRC_URI = git://git.kraxel.org/fbida
SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
S = ${WORKDIR}/git
EXTRA_OEMAKE = STRIP=
+PACKAGECONFIG ??= gif png
+PACKAGECONFIG[gif] = ,,libungif
+PACKAGECONFIG[png] = ,,libpng
+PACKAGECONFIG[tiff] = ,,tiff
+
do_compile() {
-sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
+sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
+sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:'
${S}/GNUmakefile
+
+if [ -z ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ];
then
+sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
+# Be sure to respect preferences (force to no)
+# Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
+if [ -z ${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)} ]; then
+sed -i -e '/^HAVE_LIBUNGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)} ]; then
+sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)} ];
then
+sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
oe_runmake
}
@@ -24,4 +52,3 @@ do_install() {
}
RDEPENDS_${PN} = ttf-dejavu-sans-mono
-
--
1.8.5.4
___
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 v3] fbida 2.09: cleanups and use PACKAGECONFIG
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- rename recipe to _git (match SRCREV)
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- add DESCRIPTION
- no more QA warnings
Use this to reveal:
sed -i -e '/^verbose/s/no/yes/' ${S}/mk/Autoconf.mk
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 27 ---
meta-oe/recipes-graphics/fbida/fbida_git.bb | 52
2 files changed, 52 insertions(+), 27 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/fbida/fbida_2.09.bb
create mode 100644 meta-oe/recipes-graphics/fbida/fbida_git.bb
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
deleted file mode 100644
index 32f376f..000
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-HOMEPAGE = http://linux.bytesex.org/fbida/;
-SUMMARY = frame buffer image and doc viewer tools
-AUTHOR = Gerd Hoffmann
-SECTION = utils
-
-LICENSE = GPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-
-DEPENDS = virtual/libiconv libpng jpeg fontconfig freetype libexif curl
libungif tiff
-
-SRC_URI = git://git.kraxel.org/fbida
-SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
-S = ${WORKDIR}/git
-
-EXTRA_OEMAKE = STRIP=
-
-do_compile() {
-sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
-oe_runmake
-}
-
-do_install() {
-oe_runmake 'DESTDIR=${D}' install
-}
-
-RDEPENDS_${PN} = ttf-dejavu-sans-mono
-
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb
b/meta-oe/recipes-graphics/fbida/fbida_git.bb
new file mode 100644
index 000..9eea664
--- /dev/null
+++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb
@@ -0,0 +1,52 @@
+SUMMARY = Framebuffer image and doc viewer tools
+DESCRIPTION = The fbida project contains a few applications for viewing and
editing images, \
+ with the main focus being photos.
+HOMEPAGE = http://linux.bytesex.org/fbida/;
+AUTHOR = Gerd Hoffmann
+SECTION = utils
+
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
+
+DEPENDS = virtual/libiconv jpeg fontconfig freetype libexif curl
+
+SRC_URI = git://git.kraxel.org/fbida
+SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
+PV = 2.09+git${SRCPV}
+S = ${WORKDIR}/git
+
+EXTRA_OEMAKE = STRIP=
+
+PACKAGECONFIG ??= gif png
+PACKAGECONFIG[gif] = ,,libungif
+PACKAGECONFIG[png] = ,,libpng
+PACKAGECONFIG[tiff] = ,,tiff
+
+do_compile() {
+sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
+sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:'
${S}/GNUmakefile
+
+if [ -z ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ]; then
+sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
+# Be sure to respect preferences (force to no)
+# Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
+if [ -z ${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)} ]; then
+sed -i -e '/^HAVE_LIBUNGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)} ]; then
+sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)} ]; then
+sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
+oe_runmake
+}
+
+do_install() {
+oe_runmake 'DESTDIR=${D}' install
+}
+
+RDEPENDS_${PN} = ttf-dejavu-sans-mono
--
1.8.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Regards, Matt -Message d'origine- De : openembedded-devel-boun...@lists.openembedded.org [mailto:openembedded-devel-boun...@lists.openembedded.org] De la part de Martin Jansa Envoyé : vendredi 28 février 2014 15:00 À : openembedded-devel@lists.openembedded.org Objet : Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG [...] ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide Thanks -- 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 v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Friday 28 February 2014 15:45:32 Martin Jansa wrote: On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide IMO, I think four spaces for multi-line indentation is not ideal. The indentation is there for readability; it should line up with the opening quote on the first line if there is one. IIRC we only ended up with these after your search and replace in meta-oe because it was too hard to do otherwise. 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
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 03:43:56PM +, Paul Eggleton wrote: On Friday 28 February 2014 15:45:32 Martin Jansa wrote: On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide IMO, I think four spaces for multi-line indentation is not ideal. The indentation is there for readability; it should line up with the opening quote on the first line if there is one. IIRC we only ended up with these after your search and replace in meta-oe because it was too hard to do otherwise. http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082663.html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082665.html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082868.html -- 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 v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Friday 28 February 2014 16:57:54 Martin Jansa wrote: On Fri, Feb 28, 2014 at 03:43:56PM +, Paul Eggleton wrote: On Friday 28 February 2014 15:45:32 Martin Jansa wrote: On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide IMO, I think four spaces for multi-line indentation is not ideal. The indentation is there for readability; it should line up with the opening quote on the first line if there is one. IIRC we only ended up with these after your search and replace in meta-oe because it was too hard to do otherwise. http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082663 .html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/08266 5.html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/08286 8.html My comment still stands. 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-oe][PATCH] fim: add newrecipe for version 0.4-rc1
FIM (Fbi IMproved) is a framebuffer (customizable and scriptable) image viewer.
It is based on Fbi image viewer.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb | 48 +
1 file changed, 48 insertions(+)
create mode 100644 meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
diff --git a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
b/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
new file mode 100644
index 000..01aa87c
--- /dev/null
+++ b/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
@@ -0,0 +1,48 @@
+SUMMARY = Framebuffer (scriptable) image viewer
+DESCRIPTION = FIM (Fbi IMproved) aims to be a highly customizable and
scriptable \
+ image viewer targeted at users who are comfortable with
software \
+ like the Vim text editor or the Mutt mail user agent.
+SECTION = utils
+HOMEPAGE = http://www.autistici.org/dezperado/fim/;
+
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=fa01bff138cc98a62b8840a157951c88
+
+# flex with provide /usr/include/FlexLexer.h
+DEPENDS = flex-native bison-native flex
+
+SRC_URI =
http://download.savannah.nongnu.org/releases/fbi-improved/${BPN}-${PV}.tar.gz;
+SRC_URI[md5sum] = d7362dde5541c2b6439c35c6e2bd5046
+SRC_URI[sha256sum] =
3f6bf2de2952b9adcbeb3db12c2a979e999a81dd1e314a03bc58e24f1ea9f686
+
+PARALLEL_MAKE =
+
+inherit autotools
+
+# Don't use provided regex.c
+EXTRA_OECONF = fim_cv_regex=no fim_cv_regex_broken=no \
+--enable-framebuffer \
+--disable-djvu \
+--disable-ps \
+--disable-xcftopnm \
+--disable-convert \
+--disable-inkscape \
+--disable-xfig \
+--disable-dia \
+--disable-aa \
+--disable-sdl \
+--enable-read-dirs \
+--enable-recursive-dirs \
+--enable-custom-status-bar \
+
+
+# Note: imlib2 is located in meta-efl layer.
+PACKAGECONFIG ??= jpeg rl
+PACKAGECONFIG[png] = --enable-png,--disable-png,libpng
+PACKAGECONFIG[jpeg] = --enable-jpeg,--disable-jpeg,jpeg
+PACKAGECONFIG[tiff] = --enable-tiff,--disable-tiff,tiff
+PACKAGECONFIG[gif] = --enable-gif,--disable-gif,giflib
+PACKAGECONFIG[pdf] = --enable-poppler,--disable-poppler,poppler
+PACKAGECONFIG[magick] =
--enable-graphicsmagick,--disable-graphicsmagick,imagemagick
+PACKAGECONFIG[imlib2] = --enable-imlib2,--disable-imlib2,imlib2
+PACKAGECONFIG[rl] = --enable-readline,--disable-readline,readline
--
1.8.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qtwebkit: accept gstreamer 0.10 as an option
On Fri, Feb 28, 2014 at 02:13:01AM +0100, Martin Jansa wrote:
On Fri, Feb 28, 2014 at 01:59:04AM +0100, Andreas Oberritter wrote:
On 26.02.2014 22:05, Martin Jansa wrote:
On Wed, Feb 26, 2014 at 09:25:51PM +0100, Andreas Oberritter wrote:
There's no configuration knob, though. QtWebKit will prefer
gstreamer 1.0 if available.
Can you please add configuration knob first?
The problem is that without the knob it will be undeterministic, with
gstreamer010 in PACKAGECONFIG you can run 2nd build with gstreamer10
already staged for some other component and the resulting qtwebkit will
be different than in 1st build.
I'll see what I can do. I'm not a big fan of (Qt)WebKit's build system,
so this might take a while.
You can use the same hack as I've used in qtmultimedia, it's not nice,
but works.
FWIW, I noticed that qtlocation and qtsensors are optional build
dependencies which need packageconfigs, too.
True, we're even disabling qtlocation in some our builds (because of
qt3d dependency), so having PACKAGECONFIG would be very appreciated.
+1 on this one!
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
recipes-qt/qt5/qtwebkit.inc | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad..5e96f39 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,11 @@ LIC_FILES_CHKSUM =
file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351
\
file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee
-DEPENDS += qtdeclarative qtlocation qtsensors ${ICU} ruby-native
sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
+DEPENDS += qtdeclarative qtlocation qtsensors ${ICU} ruby-native
sqlite3 glib-2.0 libxslt
+
+PACKAGECONFIG ??= gstreamer10
+PACKAGECONFIG[gstreamer010] = ,,gstreamer gst-plugins-base
+PACKAGECONFIG[gstreamer10] = ,,gstreamer1.0 gstreamer1.0-plugins-base
# qtwebkit gets terribly big when linking with all debug info, disable
by default
QTWEBKIT_DEBUG = QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0
--
1.8.3.2
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
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
Re: [oe] [PATCH 4/4][meta-webserver] apache2-2.4.7: added support for TLS Next Protocol Negotiation
On Feb 28, 2014, at 2:21 AM, Hongxu Jia hongxu@windriver.com wrote:
On 02/28/2014 03:08 AM, Randy MacLeod wrote:
On 14-02-26 10:22 PM, Hongxu Jia wrote:
The previous npn support patch (httpd-2.4.4-r1332643.patch) worked on
apache2-2.4.6 and conflicted with apache2-2.4.7, this patch fixed the
confliction with 2.4.7.
Hongxu,
Thanks, that's a good step. Even better would be to add the
apache module that supports SPDY and confirm that it works
with your desktop (google-chrome) browser.
See:
http://lists.openembedded.org/pipermail/openembedded-devel/2014-January/093772.html
and
https://code.google.com/p/mod-spdy/wiki/GettingStarted
Hi Randy,
I have tested, the ssl worked well with the new patch,
but the mod_spdy doesn't support 2.4.7 for now, and the
spdy test failed.
http://code.google.com/p/mod-spdy/issues/detail?id=63
http://code.google.com/p/mod-spdy/issues/detail?id=64
http://code.google.com/p/mod-spdy/issues/detail?id=65
...
root@qemux86-64:/etc/apache2# /etc/init.d/apache2 restart
httpd: Syntax error on line 151 of /etc/apache2/httpd.conf: Cannot load
lib64/apache2/modules/mod_spdy.so into server:
/usr/lib64/apache2/modules/mod_spdy.so: undefined symbol: ap_log_cerror
…
spdy does not work with apache 2.4 but there is port see
https://github.com/eousphoros/mod-spdy
Try to back port the needed.
//Hongxu
It doesn't seem to be a huge task but let us know what you find out.
../Randy
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
.../apache2/apache2/npn-patch-2.4.7.patch | 289
+
.../recipes-httpd/apache2/apache2_2.4.7.bb | 1 +
2 files changed, 290 insertions(+)
create mode 100644
meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
diff --git
a/meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
b/meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
new file mode 100644
index 000..a4f1855
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/apache2/npn-patch-2.4.7.patch
@@ -0,0 +1,289 @@
+Add support for TLS Next Protocol Negotiation:
+
+* modules/ssl/mod_ssl.c, modules/ssl/mod_ssl.h: Add and implement new
+ hooks for next protocol advertisement/discovery.
+
+* modules/ssl/ssl_engine_init.c (ssl_init_ctx_callbacks): Enable
+ NPN advertisement callback in handshake.
+
+* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): Invoke
+ next-protocol discovery hook.
+
+* modules/ssl/ssl_engine_kernel.c (ssl_callback_AdvertiseNextProtos):
+ New callback.
+
+* modules/ssl/ssl_private.h: Add prototype.
+
+Submitted by: Matthew Steele mdsteele google.com
+ with slight tweaks by jorton
+
+http://svn.apache.org/viewvc?view=revisionrevision=1332643
+https://bugzilla.redhat.com//show_bug.cgi?id=809599
+Upstream-Status: Backport
+Signed-off-by: Hongxu Jia hongxu@windriver.com
+---
+ CHANGES | 2 +
+ modules/ssl/mod_ssl.c | 12 ++
+ modules/ssl/mod_ssl.h | 21 +++
+ modules/ssl/ssl_engine_init.c | 5 +++
+ modules/ssl/ssl_engine_io.c | 24
+ modules/ssl/ssl_engine_kernel.c | 82
+
+ modules/ssl/ssl_private.h | 6 +++
+ 7 files changed, 152 insertions(+)
+
+diff --git a/CHANGES b/CHANGES
+--- a/CHANGES
b/CHANGES
+@@ -1,6 +1,8 @@
+ -*- coding:
utf-8 -*-
+
+ Changes with Apache 2.4.7
++ *) mod_ssl: Add support for TLS Next Protocol Negotiation. PR 52210.
++ [Matthew Steele mdsteele google.com]
+
+ *) APR 1.5.0 or later is now required for the event MPM.
+
+diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
+--- a/modules/ssl/mod_ssl.c
b/modules/ssl/mod_ssl.c
+@@ -275,6 +275,18 @@ static const command_rec ssl_config_cmds[] = {
+ AP_END_CMD
+ };
+
++/* Implement 'modssl_run_npn_advertise_protos_hook'. */
++APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(
++modssl, AP, int, npn_advertise_protos_hook,
++(conn_rec *connection, apr_array_header_t *protos),
++(connection, protos), OK, DECLINED);
++
++/* Implement 'modssl_run_npn_proto_negotiated_hook'. */
++APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(
++modssl, AP, int, npn_proto_negotiated_hook,
++(conn_rec *connection, const char *proto_name, apr_size_t
proto_name_len),
++(connection, proto_name, proto_name_len), OK, DECLINED);
++
+ /*
+ * the various processing hooks
+ */
+diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
+--- a/modules/ssl/mod_ssl.h
b/modules/ssl/mod_ssl.h
+@@ -63,5 +63,26 @@ APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable,
(conn_rec *));
+
+ APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
+
++/** The npn_advertise_protos optional hook allows other modules to add
entries
++ * to the list of protocol names advertised by the server during the Next
Re: [oe] GDM alternative?
Thanks Stephen for your response :) I think I will give slim a spin this weekend on my desktop. Ultimately a lighter DM will be appreciated on my embedded boards. Adam On Thu, Feb 27, 2014 at 2:29 PM, Stephen Arnold stephen.arnol...@gmail.comwrote: It's a bit more subtle than just obvious advantage since the deps are different, config options are different, etc. Slim is probably lighter than lxdm, in both features and dependency bloat. The former pretty depends only on X11 libs and png (with optional pam and dbus/consolekit integration). OTOH, lxdm has about the same pam/consolekit features, but depends on gtk[2|3]. So, a bit fancier and a little more bloat. Which one do you think is easier to theme? ;) On Wed, Feb 26, 2014 at 3:28 PM, Adam Lee a...@gumstix.com wrote: Are there any obvious advantages over one another between LXDM and Slim? I love how LXDM doesn't require complicated authentication framework like GDM. Adam On Tue, Feb 25, 2014 at 7:49 PM, Stephen Arnold stephen.arnol...@gmail.comwrote: Is there any interest in reviving slim? I'm using it on gentoo-arm on several devices; works just like x86. Since I haven't tried it or otherwise looked at it in oe yet, I have no idea why it's in a non-working state. That said, it was on my todo list until I noticed lxdm, so I'll probably check it out at some point; never a bad idea to have another lightweight alternative... Steve On Thu, Feb 20, 2014 at 1:36 PM, Adam Lee adam.yh@gmail.com wrote: Andreas, LXDM from meta-oe works well with minimal configuration on my part :) I didn't have to add another layer to satisfy dependencies. Thanks :) Adam On Wed, Feb 19, 2014 at 11:36 PM, Andreas Müller schnitzelt...@googlemail.com wrote: On Wed, Feb 19, 2014 at 5:15 PM, Adam Lee adam.yh@gmail.com wrote: Thank you Koen and Andreas. That has been really helped in clearing up my confusion and setting the path forward. I think I will try LXDM in meta-misc in meta-oe. Is there any special configuration that I should be aware of (other then setting it as the graphical init manager)? meta-misc is my personal playground - it might have dependencies to other layers and some things might not work as expected... Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable
Pango doesn't seem to be a drop-in replacement for ICU, so
using it as a dependency for the -icu option won't work.
QtWebKit has a hard dependency on icu.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
recipes-qt/qt5/qt5.inc | 4
recipes-qt/qt5/qtbase.inc | 2 +-
recipes-qt/qt5/qtwebkit.inc | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index e2a1662..dfc1c76 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -3,10 +3,6 @@
inherit qmake5
-# Qt5 is dependent on icu for localization
-ICU = icu
-ICU_powerpc = pango
-
PACKAGECONFIG_OPENSSL ?= openssl
QT_MODULE ?= ${BPN}
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 378f229..4fe6bd5 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = -linuxfb,-no-linuxfb
PACKAGECONFIG[mitshm] = -mitshm,-no-mitshm,mitshm
PACKAGECONFIG[kms] = -kms,-no-kms,kms
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick
module without)
-PACKAGECONFIG[icu] = -icu,-no-icu,${ICU}
+PACKAGECONFIG[icu] = -icu,-no-icu,icu
PACKAGECONFIG[udev] = -libudev,-no-libudev,udev
# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl
are detected
PACKAGECONFIG[openssl] = -openssl-linked,-no-openssl,openssl
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad..c35504e 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351
\
file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee
-DEPENDS += qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
+DEPENDS += qtdeclarative qtlocation qtsensors icu ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
# qtwebkit gets terribly big when linking with all debug info, disable by
default
QTWEBKIT_DEBUG = QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0
--
1.8.3.2
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 3/3] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors
Use gstreamer for 1.x, gstreamer010 for 0.10.x.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
recipes-qt/qt5/qtwebkit.inc | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index c35504e..90bd981 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,29 @@ LIC_FILES_CHKSUM =
file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351
\
file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee
-DEPENDS += qtdeclarative qtlocation qtsensors icu ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
+DEPENDS += qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt
+
+PACKAGECONFIG ??= gstreamer qtlocation qtsensors
+PACKAGECONFIG[gstreamer] = ,,gstreamer1.0 gstreamer1.0-plugins-base
+PACKAGECONFIG[gstreamer010] = ,,gstreamer gst-plugins-base
+PACKAGECONFIG[qtlocation] = ,,qtlocation
+PACKAGECONFIG[qtsensors] = ,,qtsensors
+
+do_configure_prepend() {
+# disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG
+sed -e 's/\s\(packagesExist(.*\gstreamer-1.0\.*)\)/
OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
+# disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
+sed -e 's/\s\(packagesExist(.*\gstreamer-0.10\.*)\)/
OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
+# disable qtlocation test if it isn't enabled by PACKAGECONFIG
+sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i
${S}/Tools/qmake/mkspecs/features/features.prf
+# disable qtsensors test if it isn't enabled by PACKAGECONFIG
+sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i
${S}/Tools/qmake/mkspecs/features/features.prf
+}
+
+EXTRA_QMAKEVARS_PRE += ${@base_contains('PACKAGECONFIG', 'gstreamer',
'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}
+EXTRA_QMAKEVARS_PRE += ${@base_contains('PACKAGECONFIG', 'gstreamer010',
'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}
+EXTRA_QMAKEVARS_PRE += ${@base_contains('PACKAGECONFIG', 'qtlocation',
'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}
+EXTRA_QMAKEVARS_PRE += ${@base_contains('PACKAGECONFIG', 'qtsensors',
'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}
# qtwebkit gets terribly big when linking with all debug info, disable by
default
QTWEBKIT_DEBUG = QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0
--
1.8.3.2
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable
On 2014-02-28 13:15, Andreas Oberritter wrote:
Pango doesn't seem to be a drop-in replacement for ICU, so
using it as a dependency for the -icu option won't work.
QtWebKit has a hard dependency on icu.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
So, does this make QT5 a no-go for PowerPC or any other BigEndian
platform? Or is there another solution for ICU on PowerPC, etc?
---
recipes-qt/qt5/qt5.inc | 4
recipes-qt/qt5/qtbase.inc | 2 +-
recipes-qt/qt5/qtwebkit.inc | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index e2a1662..dfc1c76 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -3,10 +3,6 @@
inherit qmake5
-# Qt5 is dependent on icu for localization
-ICU = icu
-ICU_powerpc = pango
-
PACKAGECONFIG_OPENSSL ?= openssl
QT_MODULE ?= ${BPN}
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 378f229..4fe6bd5 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = -linuxfb,-no-linuxfb
PACKAGECONFIG[mitshm] = -mitshm,-no-mitshm,mitshm
PACKAGECONFIG[kms] = -kms,-no-kms,kms
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick
module without)
-PACKAGECONFIG[icu] = -icu,-no-icu,${ICU}
+PACKAGECONFIG[icu] = -icu,-no-icu,icu
PACKAGECONFIG[udev] = -libudev,-no-libudev,udev
# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl
are detected
PACKAGECONFIG[openssl] = -openssl-linked,-no-openssl,openssl
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad..c35504e 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351
\
file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee
-DEPENDS += qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
+DEPENDS += qtdeclarative qtlocation qtsensors icu ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
# qtwebkit gets terribly big when linking with all debug info, disable by
default
QTWEBKIT_DEBUG = QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0
--
Gary Thomas | Consulting for the
MLB Associates |Embedded world
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable
On 28.02.2014 22:28, Gary Thomas wrote:
On 2014-02-28 13:15, Andreas Oberritter wrote:
Pango doesn't seem to be a drop-in replacement for ICU, so
using it as a dependency for the -icu option won't work.
QtWebKit has a hard dependency on icu.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
So, does this make QT5 a no-go for PowerPC or any other BigEndian
platform? Or is there another solution for ICU on PowerPC, etc?
I read about the cross-endian problem in Git history, but I don't know
whether it's been fixed in the meantime or not.
However, ICU is a hard dependency for qtwebkit only. So you can build
qtbase and other Qt modules without it simply by not adding 'icu' to
PACKAGECONFIG.
Pango doesn't seem to be used for anything related to unicode in qtbase.
The only file including pango.h is
src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.cpp.
Likewise, WebKit uses pango only for the Gtk port, so adding it as a
dependency to QtWebKit doesn't change anything.
Regards,
Andreas
---
recipes-qt/qt5/qt5.inc | 4
recipes-qt/qt5/qtbase.inc | 2 +-
recipes-qt/qt5/qtwebkit.inc | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index e2a1662..dfc1c76 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -3,10 +3,6 @@
inherit qmake5
-# Qt5 is dependent on icu for localization
-ICU = icu
-ICU_powerpc = pango
-
PACKAGECONFIG_OPENSSL ?= openssl
QT_MODULE ?= ${BPN}
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 378f229..4fe6bd5 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = -linuxfb,-no-linuxfb
PACKAGECONFIG[mitshm] = -mitshm,-no-mitshm,mitshm
PACKAGECONFIG[kms] = -kms,-no-kms,kms
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick
module without)
-PACKAGECONFIG[icu] = -icu,-no-icu,${ICU}
+PACKAGECONFIG[icu] = -icu,-no-icu,icu
PACKAGECONFIG[udev] = -libudev,-no-libudev,udev
# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl
are detected
PACKAGECONFIG[openssl] = -openssl-linked,-no-openssl,openssl
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad..c35504e 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351
\
file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee
-DEPENDS += qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
+DEPENDS += qtdeclarative qtlocation qtsensors icu ruby-native sqlite3
glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt
# qtwebkit gets terribly big when linking with all debug info, disable by
default
QTWEBKIT_DEBUG = QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 1/2] qtimageformats: allow empty qtimageformats package
This fixes installing qtimageformats-dev with opkg as it depends on the
qtimageformats package which wasn't created.
Signed-off-by: Jonathan Liu net...@gmail.com
---
recipes-qt/qt5/qtimageformats.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-qt/qt5/qtimageformats.inc
b/recipes-qt/qt5/qtimageformats.inc
index 1b4bb4f..f90e58a 100644
--- a/recipes-qt/qt5/qtimageformats.inc
+++ b/recipes-qt/qt5/qtimageformats.inc
@@ -1,3 +1,4 @@
require qt5.inc
DEPENDS += qtbase tiff
+ALLOW_EMPTY_${PN} = 1
--
1.9.0
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 2/2] packagegroup-qt5-toolchain-target: include all modules for development
This adds the necessary target packages for development with all of the
Qt 5 modules.
Signed-off-by: Jonathan Liu net...@gmail.com
---
.../packagegroup-qt5-toolchain-target.bb | 60 +-
1 file changed, 46 insertions(+), 14 deletions(-)
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 997df18..13cac33 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -11,30 +11,62 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = 1
USE_RUBY = \
qtwebkit-mkspecs \
qtwebkit-dev \
+qtwebkit-qmlplugins \
+
+
+# Requires X11 to work
+USE_X11 = \
+qtx11extras-dev \
+qtx11extras-mkspecs \
RDEPENDS_${PN} += \
packagegroup-core-standalone-sdk-target \
libsqlite3-dev \
-qtbase-mkspecs \
-qtscript-mkspecs \
-qtxmlpatterns-mkspecs \
-qtdeclarative-mkspecs \
-qtsensors-mkspecs \
+qt3d-dev \
qt3d-mkspecs \
-qtlocation-mkspecs \
-qtsvg-mkspecs \
+qt3d-qmlplugins \
qtbase-dev \
+qtbase-fonts \
+qtbase-mkspecs \
+qtbase-plugins \
+qtbase-staticdev \
+qtconnectivity-dev \
+qtconnectivity-mkspecs \
+qtconnectivity-qmlplugins \
qtdeclarative-dev \
-qtscript-dev \
-qt3d-dev \
+qtdeclarative-mkspecs \
+qtdeclarative-plugins \
+qtdeclarative-qmlplugins \
+qtdeclarative-staticdev \
+qtgraphicaleffects-qmlplugins \
+qtimageformats-dev \
+qtimageformats-plugins \
qtlocation-dev \
+qtlocation-mkspecs \
+qtlocation-plugins \
+qtlocation-qmlplugins \
+qtquick1-dev \
+qtquick1-mkspecs \
+qtquick1-plugins \
+qtquick1-qmlplugins \
+qtquickcontrols-qmlplugins \
+qtscript-dev \
+qtscript-mkspecs \
qtsensors-dev \
+qtsensors-mkspecs \
+qtsensors-plugins \
+qtsensors-qmlplugins \
+qtserialport-dev \
+qtserialport-mkspecs \
qtsvg-dev \
-qtxmlpatterns-dev \
-qtdeclarative-dev \
-qtdeclarative-plugins \
-qtdeclarative-qmlplugins \
-qtgraphicaleffects-dev \
+qtsvg-mkspecs \
+qtsvg-plugins \
+qtsystems-dev \
+qtsystems-mkspecs \
+qtsystems-qmlplugins \
${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '',
d)} \
+${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
+qtxmlpatterns-dev \
+qtxmlpatterns-mkspecs \
--
1.9.0
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-devel] [PATCH] ntp: Resolve some abnormal behaviors
Sorry I missed the previous traffic, but does it make more sense to set the
ntp user's home to something like /var/lib/ntp instead? For me it's always
been that way as the typical place for the drift file (written to by the
ntpd process running as ntp) as well as a *.keys file it needed. IMHO the
above with a suitable line in the default ntp.conf would be a Good Thing.
Lastly, what about using pool.ntp.org as the default server for both ntpd
and ntpdate? That way everything works out of the box (as long as there's
a net connection) and users can customize from there. I have a bbappend
for ntp right now, so maybe I should look at the default config again...
On Thu, Feb 27, 2014 at 11:41 PM, Xufeng Zhang
xufeng.zh...@windriver.comwrote:
On 06/10/2013 11:29 PM, Joe MacDonald wrote:
Hey Xufeng,
[[oe] [OE-devel] [PATCH] ntp: Resolve some abnormal behaviors] On
13.05.31 (Fri 14:18) Xufeng Zhang wrote:
The main changes include:
1). Add ntp:ntp(user:group) to system.
2). Running ntpd dameon as ntp:ntp.
3). Move relevant files from /usr/bin to /usr/sbin.
4). Add crypto support.
This one seems to have trailed off. Sorry if you guys were waiting on
my input as well.
Sorry for late response, I have missed this email.
First, I agree with Paul on both #3 and #4.
Now I also agree that I should drop #4.
I would rather see a patch
that updates NTP to use sbindir instead of bindir in the options
I'm not quite understand what's the meaning of in the options.
I'll explain how --with-binsubdir works for ntp:
--with-binsubdir controls whether we use bin_PROGRAMS or sbin_PROGRAMS
for built binaries in Makefile, in others words, it controls where we
install the
binaries. If --with-binsubdir is not set or if --with-binsubdir=bin,
then we use
bindir, otherwise, if --with-binsubdir=sbin, we use sbindir, so if we
want to
install the binaries into sbindir, we must specify --with-binsubdir=sbin.
(or at
least a follow-up indicating that it's infeasible for some reason, I
also don't know what NTP's build system looks like, so maybe that's not
an option). I also agree that my preferred scenario is for the system
to be as secure as possible by default, but crypto support is available
and not everyone wants or needs it. We (relatively) recently when
through an extended discussion about ntp versus ntp-ssl and the current
situation seems to be the best compromise for everyone.
As a more general comment, you have four bullet-points below. That's
normally an indication (to me, at least) that four patches are
appropriate. Looking a bit closer, it looks like two related changes
and two unrelated ones, so I'd want to see three patches for this unless
there's a good reason why all of them are tied together.
#1 and #2 aren't likely to be contentious, so feel free to send out a
single patch doing both of those any time and we can revisit #3 and #4
at your convenience.
Thank you very much for the detail suggestions and explanations!
I'll send V2 patch until we come to a agreement on #3.
Xufeng
Thanks,
-J.
[YOCTO #4567]
[ CQID: WIND00417282 ]
Signed-off-by: Xufeng Zhangxufeng.zh...@windriver.com
---
meta-networking/recipes-support/ntp/files/ntpd|8
meta-networking/recipes-support/ntp/files/ntpdate |6 +++---
meta-networking/recipes-support/ntp/ntp.inc | 20
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/meta-networking/recipes-support/ntp/files/ntpd
b/meta-networking/recipes-support/ntp/files/ntpd
index ae50f13..285f5c0 100755
--- a/meta-networking/recipes-support/ntp/files/ntpd
+++ b/meta-networking/recipes-support/ntp/files/ntpd
@@ -1,7 +1,7 @@
#! /bin/sh
#
# ntpdinit.d script for ntpdc from ntp.isc.org
-test -x /usr/bin/ntpd -a -r /etc/ntp.conf || exit 0
+test -x /usr/sbin/ntpd -a -r /etc/ntp.conf || exit 0
# rcS contains TICKADJ
test -r /etc/default/rcS . /etc/default/rcS
@@ -9,9 +9,9 @@ test -r /etc/default/rcS . /etc/default/rcS
settick(){
# If TICKADJ is set we *must* adjust it before we start, because
the
# driftfile relies on the correct setting
- test -n $TICKADJ -a -x /usr/bin/tickadj {
+ test -n $TICKADJ -a -x /usr/sbin/tickadj {
echo -n Setting tick to $TICKADJ:
- /usr/bin/tickadj $TICKADJ
+ /usr/sbin/tickadj $TICKADJ
echo done
}
}
@@ -21,7 +21,7 @@ startdaemon(){
# this. If ntpd seems to disappear after a while assume TICKADJ
# above is set to a totally incorrect value.
echo -n Starting ntpd:
- start-stop-daemon --start -x /usr/bin/ntpd -- -p
/var/run/ntp.pid $@
+ start-stop-daemon --start -x /usr/sbin/ntpd -- -u ntp:ntp -p
/var/run/ntp.pid $@
echo done
}
stopdaemon(){
diff --git a/meta-networking/recipes-support/ntp/files/ntpdate
