[oe] [meta-oe][PATCH 4/9] xinput-calibrator: add new version 0.7.5 and include .inc to recipe directly

[Khem Raj]

On Tue, May 10, 2011 at 4:40 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  .../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
>
> diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc
> deleted file mode 100644
> index 691a45c..0000000
> --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator.inc
> +++ /dev/null
> @@ -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"
> -
> diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb
> deleted file mode 100644
> index 2eb3cc9..0000000
> --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.6.1.bb
> +++ /dev/null
> @@ -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
> -}
> diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
> new file mode 100644
> index 0000000..4024883
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
> @@ -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"


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.

> +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
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>