Pull request #8
cover Pull request #8
Hi,
please merge small fixes I had in contrib/shr for some time
Pull URL: git://gitorious.org/shr/meta-openembedded.git
Branch: jama/meta-oe
Browse: http://gitorious.org/shr/meta-openembedded/commits/jama/meta-oe
Thanks,
Martin Jansa <[email protected]>
---
Martin Jansa (8):
udev: drop udev-compat for zaurus devices
libxfixes, util-macros: drop from meta-oe, now they are in oe-core
gst-plugins-base: drop 0.10.30 from meta-oe, there is 0.10.32 in
oe-core
xinput-calibrator: add new version 0.7.5 and include .inc to recipe
directly
python-argparse: add new recipe to provide argparse module for python
and python-native older then 2.7
gdbus-binding-tool: bump SRCREV
glib-2.0: add git version for 2.29.3+git, which has gdbus-codegen
included
connman: drop older 0.72
Simon Busch (1):
connman: add recipe for the latest released version 0.73
meta-oe/recipes-connectivity/connman/connman.inc | 5 +
.../connman/{connman_0.72.bb => connman_0.73.bb} | 4 +-
meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 +
.../60_wait-longer-for-threads-to-die.patch | 33 ++++++
.../glib-2.0/glib-2.0/configure-libtool.patch | 38 +++++++
.../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 +++++
.../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 +++++
.../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 ++++++++++++++++++++
.../glib-2.0/remove.test.for.qsort_r.patch | 54 ++++++++++
meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 29 ++++++
meta-oe/recipes-core/glib-2.0/glib.inc | 37 +++++++
meta-oe/recipes-core/udev/udev_165.bb | 26 -----
.../gdbus-binding-tool/gdbus-binding-tool_git.bb | 6 +-
.../python/python-argparse_1.2.1.bb | 16 +++
.../xinput-calibrator/xinput-calibrator.inc | 12 ---
.../xinput-calibrator/xinput-calibrator_0.6.1.bb | 17 ---
.../xinput-calibrator/xinput-calibrator_0.7.5.bb | 22 ++++
meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb | 22 ----
.../xorg-util/util-macros_1.13.0.bb | 15 ---
.../xorg-util/xorg-util-common.inc | 11 --
.../gst-plugins-base-tremor.patch | 17 ---
.../gstreamer/gst-plugins-base_0.10.30.bb | 22 ----
.../recipes-multimedia/gstreamer/gst-plugins.inc | 41 --------
23 files changed, 397 insertions(+), 188 deletions(-)
rename meta-oe/recipes-connectivity/connman/{connman_0.72.bb => connman_0.73.bb} (80%)
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
create mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc
create mode 100644 meta-oe/recipes-devtools/python/python-argparse_1.2.1.bb
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb
create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-util/util-macros_1.13.0.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-util/xorg-util-common.inc
delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch
delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins.incSignature · 1 line
1.7.5.rc3
PATCH 1/9 udev: drop udev-compat for zaurus devices
--- meta-oe/recipes-core/udev/udev_165.bb | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-)
meta-oe/recipes-core/udev/udev_165.bb +0 -26
@@ -93,32 +93,6 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" -RPROVIDES_udev_append = " udev-compat-wrapper" -RDEPENDS_udev_append_spitz = " udev-compat" -do_unpack_append_spitz() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} -RDEPENDS_udev_append_akita = " udev-compat" -do_unpack_append_akita() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} -RDEPENDS_udev_append_c7x0 = " udev-compat" -do_unpack_append_c7x0() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} -RDEPENDS_udev_append_poodle = " udev-compat" -do_unpack_append_poodle() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} - -# Modify init script on platforms that need to boot old kernels: -do_apply_compat_wrapper() { - cd ${WORKDIR} - sed -i "s:/sbin/udevd:\$UDEVD:g;s:/sbin/udevadm:\$UDEVADM:g" init - patch <udev-compat-wrapper-patch - cd - -} - do_install () { install -d ${D}${usrsbindir} \ ${D}${sbindir}
Signature · 1 line
1.7.5.rc3
PATCH 2/9 libxfixes, util-macros: drop from meta-oe, now they are in oe-core
In reply to Martin Jansa--- meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb | 22 -------------------- .../xorg-util/util-macros_1.13.0.bb | 15 ------------- .../xorg-util/xorg-util-common.inc | 11 ---------- 3 files changed, 0 insertions(+), 48 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb delete mode 100644 meta-oe/recipes-graphics/xorg-util/util-macros_1.13.0.bb delete mode 100644 meta-oe/recipes-graphics/xorg-util/xorg-util-common.inc
meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb deleted +0 -22
@@ -1,22 +0,0 @@ -SUMMARY = "XFixes: X Fixes extension library." - -DESCRIPTION = "X applications have often needed to work around various \ -shortcomings in the core X window system. This extension is designed to \ -provide the minimal server-side support necessary to eliminate problems \ -caused by these workarounds." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" - -DEPENDS += "virtual/libx11 xproto fixesproto xextproto" -PE = "1" -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "678071bd7f9f7467e2fc712d81022318" -SRC_URI[sha256sum] = "537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3" - -BBCLASSEXTEND = "native" - -XORG_PN = "libXfixes"
meta-oe/recipes-graphics/xorg-util/util-macros_1.13.0.bb deleted +0 -15
@@ -1,15 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662" - -ALLOW_EMPTY = "1" -BBCLASSEXTEND = "native nativesdk" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1" -SRC_URI[sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
meta-oe/recipes-graphics/xorg-util/xorg-util-common.inc deleted +0 -11
@@ -1,11 +0,0 @@ -HOMEPAGE = "http://www.x.org" -SECTION = "x11/utils" -LICENSE = "MIT-X" - -INC_PR = "r2" - -SRC_URI = "${XORG_MIRROR}/individual/util/${BPN}-${PV}.tar.gz" - -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools pkgconfig
Signature · 1 line
1.7.5.rc3
PATCH 3/9 gst-plugins-base: drop 0.10.30 from meta-oe, there is 0.10.32 in oe-core
In reply to Martin Jansa* gst-python needs at least 0.10.32
* http://lists.freedesktop.org/archives/gstreamer-bugs/2011-January/073592.html
--- .../gst-plugins-base-tremor.patch | 17 -------- .../gstreamer/gst-plugins-base_0.10.30.bb | 22 ---------- .../recipes-multimedia/gstreamer/gst-plugins.inc | 41 -------------------- 3 files changed, 0 insertions(+), 80 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins.inc
meta-oe/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Remove -DTREMOR option since Tremor has dropped its internal -libogg2, and gst-plugins-base has dependency on that. - -Signed-off-by: Dongxiao Xu <[email protected]> - -diff -ruN gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am gst-plugins-base-0.10.30/ext/vorbis/Makefile.am ---- gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am 2010-11-17 16:11:03.000000000 +0800 -+++ gst-plugins-base-0.10.30/ext/vorbis/Makefile.am 2010-11-17 16:12:41.000000000 +0800 -@@ -28,7 +28,7 @@ - libgstivorbisdec_la_SOURCES = gstivorbisdec.c \ - gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c - libgstivorbisdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -- -DTREMOR $(IVORBIS_CFLAGS) -+ $(IVORBIS_CFLAGS) - libgstivorbisdec_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@[email protected] \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@[email protected] \
meta-oe/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb deleted +0 -22
@@ -1,22 +0,0 @@ -require gst-plugins.inc - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ - file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ - file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" - -DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora" - -SRC_URI += " file://gst-plugins-base-tremor.patch" - -PR = "r2" - -inherit gettext - -EXTRA_OECONF += "--disable-freetypetest --disable-pango" - -do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm -f ${S}/m4/lib-link.m4 -}
meta-oe/recipes-multimedia/gstreamer/gst-plugins.inc deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
1.7.5.rc3
PATCH 4/9 xinput-calibrator: add new version 0.7.5 and include .inc to recipe directly
In reply to Martin Jansa--- .../xinput-calibrator/xinput-calibrator.inc | 12 ---------- .../xinput-calibrator/xinput-calibrator_0.6.1.bb | 17 --------------- .../xinput-calibrator/xinput-calibrator_0.7.5.bb | 22 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc deleted +0 -12
@@ -1,12 +0,0 @@ -DESCRIPTION = "A generic touchscreen calibration program for X.Org" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" -LICENSE = "MIT/X11" -DEPENDS = "virtual/libx11 libxi" - -INC_PR = "r8" - -inherit autotools - -RDEPENDS_${PN} = "xinput" -RRECOMMENDS_${PN} = "pointercal-xinput" -
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb deleted +0 -17
@@ -1,17 +0,0 @@ -require xinput-calibrator.inc - -LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" - -SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7" -PR = "${INC_PR}.0" -S = "${WORKDIR}/git/" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -d ${D}${datadir}/applications/ - install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop - install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh -}
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +22 -0
@@ -0,0 +1,22 @@ +DESCRIPTION = "A generic touchscreen calibration program for X.Org" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" +LICENSE = "MIT/X11" +LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" +DEPENDS = "virtual/libx11 libxi" + +inherit autotools + +RDEPENDS_${PN} = "xinput" +RRECOMMENDS_${PN} = "pointercal-xinput" + +SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz" +SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa" +SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971" + +S = "${WORKDIR}/xinput_calibrator-${PV}" + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh + install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh +}
Signature · 1 line
1.7.5.rc3
PATCH 5/9 python-argparse: add new recipe to provide argparse module for python and python-native older then 2.7
In reply to Martin Jansa--- .../python/python-argparse_1.2.1.bb | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-devtools/python/python-argparse_1.2.1.bb
meta-oe/recipes-devtools/python/python-argparse_1.2.1.bb new file +16 -0
@@ -0,0 +1,16 @@ +DESCRIPTION = "Python command-line parsing library" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=09d08bb5b7047e2688ea3faad6408aa8" +SRCNAME = argparse + +SRC_URI = "http://argparse.googlecode.com/files/${SRCNAME}-${PV}.tar.gz" +SRC_URI[md5sum] = "2fbef8cb61e506c706957ab6e135840c" +SRC_URI[sha256sum] = "ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +BBCLASSEXTEND = "native"
Signature · 1 line
1.7.5.rc3
PATCH 6/9 gdbus-binding-tool: bump SRCREV
In reply to Martin Jansa* old version was failing to build after upgrading glib-2.0
* needs new python-argparse and libffi
* be aware that command line params changed as well as generated code, and this recipe will be deprecated as soon as we switch to glib-2.29.3 or newer
--- .../gdbus-binding-tool/gdbus-binding-tool_git.bb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb +3 -3
@@ -1,6 +1,6 @@ DESCRIPTION = "gdbus-binding-tool is used to generate C code for interacting with remote objects using D-Bus." -DEPENDS = "glib-2.0 gdbus-binding-tool-native" -DEPENDS_virtclass-native = "glib-2.0-native" +DEPENDS = "glib-2.0 libffi python-argparse gdbus-binding-tool-native" +DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-argparse-native" RDEPENDS_${PN} = "glib-2.0-utils" # taken from glib where this is supposed to be moved later LICENSE = "LGPLv2+ & BSD & public domain"
@@ -12,7 +12,7 @@ inherit autotools pkgconfig SRC_URI = "git://anongit.freedesktop.org/~david/${BPN};protocol=git;branch=master \ file://COPYING" -SRCREV = "229fd9adbb6bd9d824b38a3bd092229016540f41" +SRCREV = "286f4eaf48ea79821be5a4e6bf493566b156faa4" PV = "0.1+gitr${SRCPV}" S = "${WORKDIR}/git"
Signature · 1 line
1.7.5.rc3
PATCH 7/9 glib-2.0: add git version for 2.29.3+git, which has gdbus-codegen included
In reply to Martin Jansa* add negative DEFAULT_PREFERRENCE for now
--- meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 + .../60_wait-longer-for-threads-to-die.patch | 33 ++++++ .../glib-2.0/glib-2.0/configure-libtool.patch | 38 +++++++ .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 +++++ .../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 +++++ .../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 ++++++++++++++++++++ .../glib-2.0/remove.test.for.qsort_r.patch | 54 ++++++++++ meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 29 ++++++ meta-oe/recipes-core/glib-2.0/glib.inc | 37 +++++++ 9 files changed, 349 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb create mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc
meta-oe/recipes-core/glib-2.0/glib-2.0.inc new file +6 -0
@@ -0,0 +1,6 @@ + +python () { + import bb + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +}
meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch new file +33 -0
@@ -0,0 +1,33 @@ +copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity. +Added to poky by Kevin Tian <[email protected]>, 06/25/2010 +Rebased for glib-2.27.3 by Dongxiao Xu <[email protected]>, 11/16/2010 + +Upstream-Status: Inappropriate [patches for test code] + +diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c +--- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 ++++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 +@@ -5,8 +5,8 @@ + + #include <glib.h> + +-#define DEBUG_MSG(x) +-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */ ++/* #define DEBUG_MSG(x) */ ++#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); + + #define WAIT 5 /* seconds */ + #define MAX_THREADS 10 +@@ -124,10 +124,10 @@ + DEBUG_MSG (("[unused] stopping unused threads")); + g_thread_pool_stop_unused_threads (); + +- DEBUG_MSG (("[unused] waiting ONE second for threads to die")); ++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); + + /* Some time for threads to die. */ +- g_usleep (G_USEC_PER_SEC); ++ g_usleep (5 * G_USEC_PER_SEC); + + DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", + g_thread_pool_get_num_unused_threads (),
meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch new file +38 -0
@@ -0,0 +1,38 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though +# Rebased to glib-2.27.3 by Dongxiao Xu <[email protected]> + +Upstream-Status: Inappropriate [configuration] + +diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac +--- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 ++++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 +@@ -1385,7 +1385,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1450,7 +1450,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1524,7 +1524,7 @@ + + AC_MSG_CHECKING(for the suffix of module shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot
meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch new file +24 -0
@@ -0,0 +1,24 @@ +fix g_once_init_enter compile failure + +Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded +back in the 2.22 timeframe. It appears to still be present in 2.27. + +http://www.mail-archive.com/[email protected]/msg005 + +Signed-off-by: Darren Hart <[email protected]> + +Upstream-Status: Pending + +Index: glib-2.27.5/glib/gthread.h +=================================================================== +--- glib-2.27.5.orig/glib/gthread.h ++++ glib-2.27.5/glib/gthread.h +@@ -344,7 +344,7 @@ void g_once_init_leav + G_INLINE_FUNC gboolean + g_once_init_enter (volatile gsize *value_location) + { +- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL) ++ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL) + return FALSE; + else + return g_once_init_enter_impl (value_location);
meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch new file +24 -0
@@ -0,0 +1,24 @@ +# an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container +# for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d +# in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4. +# +# keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more +# portable here. mark for upstream +# +# by Kevin Tian <[email protected]>, 06/25/2010 +# Rebased by Dongxiao Xu <[email protected]>, 11/16/2010 + +Upstream-Status: Inappropriate [configuration] + +diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in +--- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 ++++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 +@@ -52,7 +52,7 @@ + datadir=@datadir@ + datarootdir=@datarootdir@ + +-gettext_dir=$prefix/share/glib-2.0/gettext ++gettext_dir=@datadir@/glib-2.0/gettext + + while test $# -gt 0; do + case "$1" in
meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch new file +104 -0
104 lines not on this page · raw message
meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch new file +54 -0
54 lines not on this page · raw message
meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb new file +29 -0
@@ -0,0 +1,29 @@ +require glib.inc + +PE = "1" + +DEFAULT_PREFERENCE = "-1" + +DEPENDS += "libffi" + +SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \ + file://configure-libtool.patch \ + file://60_wait-longer-for-threads-to-die.patch \ + file://g_once_init_enter.patch \ + file://remove.test.for.qsort_r.patch \ + " +SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4" +PV = "2.29.3+gitr${SRCPV}" +S = "${WORKDIR}/git" + +# Only apply this patch for target recipe on uclibc +SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" + +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" +BBCLASSEXTEND = "native" + +do_configure_prepend() { + # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) + sed -i '/^docs/d' ${S}/configure.ac + sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am +}
meta-oe/recipes-core/glib-2.0/glib.inc new file +37 -0
@@ -0,0 +1,37 @@ +SUMMARY = "A general-purpose utility library" +DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on." +# pcre is under BSD; +# docs/reference/COPYING is with a 'public domai'-like license! +LICENSE = "LGPLv2+ & BSD & public domain" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://glib/glib.h;startline=4;endline=17;md5=a4332fe58b076f29d07c9c066d2967b6 \ + file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ + file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ + file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \ + file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" + +require glib-2.0.inc + +DEPENDS = "glib-2.0-native gtk-doc-native zip dbus" +DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native" +DEPENDS_virtclass-nativesdk = "libtool-nativesdk" +PACKAGES =+ "glib-2.0-utils " + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +inherit autotools pkgconfig gettext + +S = "${WORKDIR}/glib-${PV}" + +EXTRA_OECONF = "--disable-debug --enable-included-printf=no" +EXTRA_OECONF_virtclass-native = "" +EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" + +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/glib-2.0/include ${libdir}/gdbus-codegen/*.py" + +ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
1.7.5.rc3
PATCH 8/9 connman: add recipe for the latest released version 0.73
In reply to Martin JansaFrom: Simon Busch <[email protected]>
* MJ merged connman.inc changes from oe.dev with it
--- meta-oe/recipes-connectivity/connman/connman.inc | 5 +++ .../recipes-connectivity/connman/connman_0.73.bb | 31 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-connectivity/connman/connman_0.73.bb
meta-oe/recipes-connectivity/connman/connman.inc +5 -0
@@ -71,6 +71,11 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/bonobo/servers \ ${datadir}/dbus-1/system-services/*" +# Package up systemd files +FILES_${PN} += "${base_libdir}/systemd" +# Needed when using DNS proxy feature +RRECOMMENDS_${PN} += "dnsmasq-dbus" + FILES_${PN}-test-utils += "${libdir}/connman/test/*" FILES_${PN}-scripts += "${libdir}/connman/scripts"
meta-oe/recipes-connectivity/connman/connman_0.73.bb new file +31 -0
@@ -0,0 +1,31 @@ +require connman.inc +# connman requires libXtables now +DEPENDS += "iptables" +PR = "r0" + +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-ofono \ + --enable-resolvconf \ + --enable-dnsproxy \ + --enable-tools \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://link-against-libnl2.patch \ + file://connman \ +" + +SRC_URI[md5sum] = "01085b2ed8f7b11a41724f1528720cc7" +SRC_URI[sha256sum] = "b71ff2c3925ea82a7ebf818685f809e595d5c47d767005dfb149c6264b098417"
Signature · 1 line
1.7.5.rc3
PATCH 9/9 connman: drop older 0.72
In reply to Martin Jansa--- .../recipes-connectivity/connman/connman_0.72.bb | 31 -------------------- 1 files changed, 0 insertions(+), 31 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/connman/connman_0.72.bb
meta-oe/recipes-connectivity/connman/connman_0.72.bb deleted +0 -31
@@ -1,31 +0,0 @@ -require connman.inc -# connman requires libXtables now -DEPENDS += "iptables" -PR = "r0" - -EXTRA_OECONF += "\ - --disable-gtk-doc \ - --enable-debug \ - --enable-threads \ - --enable-loopback \ - --enable-ethernet \ - --enable-wifi \ - --disable-wimax \ - --enable-bluetooth \ - --enable-ofono \ - --enable-resolvconf \ - --enable-dnsproxy \ - --enable-tools \ - --disable-polkit \ - --enable-client \ - --enable-fake \ -" - -SRC_URI = "\ - http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ - file://link-against-libnl2.patch \ - file://connman \ -" - -SRC_URI[md5sum] = "800f9356e0471c88819eee7184713a1f" -SRC_URI[sha256sum] = "9c8ad312573683fc9f50d5042d4a87ddc8e0700b27ac1b0fb8dc2e8b7424a60f"
Signature · 1 line
1.7.5.rc3
Re: [meta-oe][PATCH 1/9] udev: drop udev-compat for zaurus devices
In reply to Martin Jansa-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
We should consider using 168 in meta-oe, it's a lot faster than 168. 169 breaks crosscompilation, I'm talking to Kay to get that fixed before the release.
Quoted 32 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta-oe/recipes-core/udev/udev_165.bb | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-)meta-oe/recipes-core/udev/udev_165.bb +0
-19@@ -93,32 +93,6 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" -RPROVIDES_udev_append = " udev-compat-wrapper" -RDEPENDS_udev_append_spitz = " udev-compat" -do_unpack_append_spitz() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} -RDEPENDS_udev_append_akita = " udev-compat" -do_unpack_append_akita() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} -RDEPENDS_udev_append_c7x0 = " udev-compat" -do_unpack_append_c7x0() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} -RDEPENDS_udev_append_poodle = " udev-compat" -do_unpack_append_poodle() { - bb.build.exec_func('do_apply_compat_wrapper', d) -} - -# Modify init script on platforms that need to boot old kernels:
meta-oe/recipes-core/udev/udev_165.bb FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" · line 98
Quoted 10 lines
meta-oe/recipes-core/udev/udev_165.bb +0
-7-do_apply_compat_wrapper() { - cd ${WORKDIR} - sed -i "s:/sbin/udevd:\$UDEVD:g;s:/sbin/udevadm:\$UDEVADM:g" init - patch <udev-compat-wrapper-patch - cd - -} - do_install () { install -d ${D}${usrsbindir} \ ${D}${sbindir}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNySh0MkyGM64RGpERApb8AJ9FdRGGPOLFm0wHC17RJQ0+ghlH/gCfSXzo joJcRTKPRdHzyuMMt6k3rzY=
=TBuV
-----END PGP SIGNATURE-----
Koen Kooi
Applied-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 7 lines · Martin Jansa
Hi,
please merge small fixes I had in contrib/shr for some time
Pull URL:
git://gitorious.org/shr/meta-openembedded.git
Branch: jama/meta-oe
Browse: http://gitorious.org/shr/meta-openembedded/commits/jama/meta-oe
Applied, thanks
Quoted 59 lines
Thanks,
Martin Jansa <[email protected]>
---Martin Jansa (8):
udev: drop udev-compat for zaurus devices
libxfixes, util-macros: drop from meta-oe, now they are in oe-core
gst-plugins-base: drop 0.10.30 from meta-oe, there is 0.10.32 in
oe-core
xinput-calibrator: add new version 0.7.5 and include .inc to recipe
directly
python-argparse: add new recipe to provide argparse module for python
and python-native older then 2.7
gdbus-binding-tool: bump SRCREV
glib-2.0: add git version for 2.29.3+git, which has gdbus-codegen
included
connman: drop older 0.72Simon Busch (1):
connman: add recipe for the latest released version 0.73meta-oe/recipes-connectivity/connman/connman.inc | 5 + .../connman/{connman_0.72.bb => connman_0.73.bb} | 4 +- meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 + .../60_wait-longer-for-threads-to-die.patch | 33 ++++++ .../glib-2.0/glib-2.0/configure-libtool.patch | 38 +++++++ .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 +++++ .../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 +++++ .../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 ++++++++++++++++++++ .../glib-2.0/remove.test.for.qsort_r.patch | 54 ++++++++++ meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 29 ++++++ meta-oe/recipes-core/glib-2.0/glib.inc | 37 +++++++ meta-oe/recipes-core/udev/udev_165.bb | 26 ----- .../gdbus-binding-tool/gdbus-binding-tool_git.bb | 6 +- .../python/python-argparse_1.2.1.bb | 16 +++ .../xinput-calibrator/xinput-calibrator.inc | 12 --- .../xinput-calibrator/xinput-calibrator_0.6.1.bb | 17 --- .../xinput-calibrator/xinput-calibrator_0.7.5.bb | 22 ++++ meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb | 22 ---- .../xorg-util/util-macros_1.13.0.bb | 15 --- .../xorg-util/xorg-util-common.inc | 11 -- .../gst-plugins-base-tremor.patch | 17 --- .../gstreamer/gst-plugins-base_0.10.30.bb | 22 ---- .../recipes-multimedia/gstreamer/gst-plugins.inc | 41 -------- 23 files changed, 397 insertions(+), 188 deletions(-) rename meta-oe/recipes-connectivity/connman/{connman_0.72.bb => connman_0.73.bb} (80%) create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch create mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb create mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc create mode 100644 meta-oe/recipes-devtools/python/python-argparse_1.2.1.bb delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc
Quoted 9 lines
delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bb delete mode 100644 meta-oe/recipes-graphics/xorg-util/util-macros_1.13.0.bb delete mode 100644 meta-oe/recipes-graphics/xorg-util/xorg-util-common.inc delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb delete mode 100644 meta-oe/recipes-multimedia/gstreamer/gst-plugins.inc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNySgzMkyGM64RGpERAookAJ970DTnwqWpnQZIgQp4MuF7RzIrxwCgvTDz pT+2hxISlVgqULqQrDPFyDw=
=1cAw
-----END PGP SIGNATURE-----
Re: [meta-oe][PATCH 1/9] udev: drop udev-compat for zaurus devices
In reply to Koen KooiQuoted 3 lines · Koen Kooi
We should consider using 168 in meta-oe, it's a lot faster than 168. 169 breaks crosscompilation, I'm talking to Kay to get that fixed before the release.
Agreed, I had this in my queue, because I was trying to build my spitz images from meta-shr before meta-handhelds was announced (and I stopped trying for now).
Regards,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-oe][PATCH 4/9] xinput-calibrator: add new version 0.7.5 and include .inc to recipe directly
In reply to Martin JansaQuoted 59 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
.../xinput-calibrator/xinput-calibrator.inc | 12 ---------- .../xinput-calibrator/xinput-calibrator_0.6.1.bb | 17 --------------- .../xinput-calibrator/xinput-calibrator_0.7.5.bb | 22 ++++++++++++++++++++3 files changed, 22 insertions(+), 29 deletions(-)delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc deleted +0
-12@@ -1,12 +0,0 @@ -DESCRIPTION = "A generic touchscreen calibration program for X.Org" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" -LICENSE = "MIT/X11" -DEPENDS = "virtual/libx11 libxi" - -INC_PR = "r8" - -inherit autotools - -RDEPENDS_${PN} = "xinput" -RRECOMMENDS_${PN} = "pointercal-xinput" -meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb deleted +0
-17@@ -1,17 +0,0 @@ -require xinput-calibrator.inc - -LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" - -SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7" -PR = "${INC_PR}.0" -S = "${WORKDIR}/git/" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -d ${D}${datadir}/applications/ - install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop - install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh -}meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +2
-0@@ -0,0 +1,22 @@ +DESCRIPTION = "A generic touchscreen calibration program for X.Org" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb line 12
Quoted 10 lines
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +10
-0+LICENSE = "MIT/X11" +LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" +DEPENDS = "virtual/libx11 libxi" + +inherit autotools + +RDEPENDS_${PN} = "xinput" +RRECOMMENDS_${PN} = "pointercal-xinput" + +SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"
this is causing some gripe.
$ wget http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz --2011-05-10 23:16:17-- http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz Resolving github.com... 207.97.227.239 Connecting to github.com|207.97.227.239|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz [following] --2011-05-10 23:16:17-- https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz Connecting to github.com|207.97.227.239|:443... connected. ERROR: certificate common name `*.github.com' doesn't match requested host name `github.com'. To connect to github.com insecurely, use `--no-check-certificate'.
Which seems to be a known problem with wget as described here
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=409938
So one option we have is to cache the tar on angstrom mirror.
Quoted 19 lines
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +10
-1+SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa" +SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971" + +S = "${WORKDIR}/xinput_calibrator-${PV}" + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh + install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh +} --1.7.5.rc3
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 4/9] xinput-calibrator: add new version 0.7.5 and include .inc to recipe directly
Quoted 90 lines · Khem Raj
Quoted 59 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
.../xinput-calibrator/xinput-calibrator.inc | 12 ---------- .../xinput-calibrator/xinput-calibrator_0.6.1.bb | 17 --------------- .../xinput-calibrator/xinput-calibrator_0.7.5.bb | 22 ++++++++++++++++++++3 files changed, 22 insertions(+), 29 deletions(-)delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc deleted +0
-12@@ -1,12 +0,0 @@ -DESCRIPTION = "A generic touchscreen calibration program for X.Org" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" -LICENSE = "MIT/X11" -DEPENDS = "virtual/libx11 libxi" - -INC_PR = "r8" - -inherit autotools - -RDEPENDS_${PN} = "xinput" -RRECOMMENDS_${PN} = "pointercal-xinput" -meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb deleted +0
-17@@ -1,17 +0,0 @@ -require xinput-calibrator.inc - -LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" - -SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7" -PR = "${INC_PR}.0" -S = "${WORKDIR}/git/" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh - ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator - install -d ${D}${datadir}/applications/ - install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop - install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh -}meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +2
-0@@ -0,0 +1,22 @@ +DESCRIPTION = "A generic touchscreen calibration program for X.Org" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator"meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb line 12
Quoted 10 lines
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb new file +10
-0+LICENSE = "MIT/X11" +LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" +DEPENDS = "virtual/libx11 libxi" + +inherit autotools + +RDEPENDS_${PN} = "xinput" +RRECOMMENDS_${PN} = "pointercal-xinput" + +SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz"this is causing some gripe.
$ wget http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz --2011-05-10 23:16:17-- http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz Resolving github.com... 207.97.227.239 Connecting to github.com|207.97.227.239|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz [following] --2011-05-10 23:16:17-- https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz Connecting to github.com|207.97.227.239|:443... connected. ERROR: certificate common name `*.github.com' doesn't match requested host name `github.com'. To connect to github.com insecurely, use `--no-check-certificate'.
Quoted 5 lines
Which seems to be a known problem with wget as described here
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=409938So one option we have is to cache the tar on angstrom mirror.
or we could fix it with patching bitbake.conf something like this
http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/commit/?h=kraj/misc-fixes&id=570e4eedba1c7de84db20de8f2c8730ce6c8a249
Re: [meta-oe][PATCH 4/9] xinput-calibrator: add new version 0.7.5 and include .inc to recipe directly
Quoted 4 lines · Khem Raj
Quoted 3 lines · Khem Raj
On Tue, May 10, 2011 at 4:40 AM, Martin Jansa <[email protected]> wrote:
this is causing some gripe.
Quoted 14 lines
Quoted 6 lines
$ wget http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz --2011-05-10 23:16:17-- http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz Resolving github.com... 207.97.227.239 Connecting to github.com|207.97.227.239|:80... connected. HTTP request sent, awaiting response... 301 Moved PermanentlyQuoted 8 lines
Location: https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz [following] --2011-05-10 23:16:17-- https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz Connecting to github.com|207.97.227.239|:443... connected. ERROR: certificate common name `*.github.com' doesn't match requested host name `github.com'. To connect to github.com insecurely, use `--no-check-certificate'.
strange here it finally resolves to cloud.github.com with common name matching
wget http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
--2011-05-11 09:13:11-- http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
Resolving github.com... 207.97.227.239
Connecting to github.com|207.97.227.239|:80... connected.
HTTP request sent, awaiting response... 301 Moved Permanently
Location: https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz [following] --2011-05-11 09:13:11-- https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
Connecting to github.com|207.97.227.239|:443... connected.
HTTP request sent, awaiting response... 302 Found
Location: http://cloud.github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz [following] --2011-05-11 09:13:12-- http://cloud.github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
Resolving cloud.github.com... 205.251.205.31, 205.251.205.41, 205.251.205.93, ...
Connecting to cloud.github.com|205.251.205.31|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 355313 (347K) [application/octet-stream]
Saving to: `xinput_calibrator-0.7.5.tar.gz.1'
100%[===================================================================================================================================================================================================>] 355 313 624K/s in 0,6s
2011-05-11 09:13:18 (624 KB/s) - `xinput_calibrator-0.7.5.tar.gz.1' saved [355313/355313]
but maybe my wget should also check certificate before accepting 302
$ wget --version GNU Wget 1.12 built on linux-gnu.
Quoted 9 lines
Quoted 6 lines
Which seems to be a known problem with wget as described here
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=409938So one option we have is to cache the tar on angstrom mirror.
or we could fix it with patching bitbake.conf something like this
http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/commit/?h=kraj/misc-fixes&id=570e4eedba1c7de84db20de8f2c8730ce6c8a249
looks reasonable as we're checking checksum on downloaded archive anyway
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]