[meta-oe][WIP][PATCH 1/8] ktap: upgrade to 0.4

[meta-oe][WIP][PATCH 1/8] ktap: upgrade to 0.4

[Martin Jansa]

* tag v0.3 (and its SRCREV) doesn't exist in any branch so latest bitbake refuses to fetch it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/ktap/{ktap-module_0.3.bb => ktap-module_0.4.bb} | 0
 meta-oe/recipes-kernel/ktap/ktap.inc                                   | 2 +-
 meta-oe/recipes-kernel/ktap/{ktap_0.3.bb => ktap_0.4.bb}               | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-kernel/ktap/{ktap-module_0.3.bb => ktap-module_0.4.bb} (100%)
 rename meta-oe/recipes-kernel/ktap/{ktap_0.3.bb => ktap_0.4.bb} (100%)

diff --git a/meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb b/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb
similarity index 100%
rename from meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb
rename to meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb
diff --git a/meta-oe/recipes-kernel/ktap/ktap.inc b/meta-oe/recipes-kernel/ktap/ktap.inc
index 278b63e..7e60453 100644
--- a/meta-oe/recipes-kernel/ktap/ktap.inc
+++ b/meta-oe/recipes-kernel/ktap/ktap.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.ktap.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE-GPL;md5=eb723b61539feef013de476e68b5c50a"
 
-SRCREV = "c507eeca662ff00bf67f8c94df35254e0966f214"
+SRCREV = "c8401e07c89cdec9a5f673da4ddb12b7982b522b"
 SRC_URI = "git://github.com/ktap/ktap.git"
 
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-kernel/ktap/ktap_0.3.bb b/meta-oe/recipes-kernel/ktap/ktap_0.4.bb
similarity index 100%
rename from meta-oe/recipes-kernel/ktap/ktap_0.3.bb
rename to meta-oe/recipes-kernel/ktap/ktap_0.4.bb
-- 
1.8.4.3

[meta-oe][WIP][PATCH 2/8] qtserialport-e: Fix branch param

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb | 1 -
 meta-oe/recipes-qt/qtserialport/qtserialport.inc        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb b/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb
index dcaac20..c466562 100644
--- a/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb
+++ b/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb
@@ -3,4 +3,3 @@ inherit qt4e
 require qtserialport.inc
 
 SRCREV = "22e45f0b0f956c025339d72ad53dca57ef684858"
-
diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport.inc b/meta-oe/recipes-qt/qtserialport/qtserialport.inc
index fc2020d..dde49a5 100644
--- a/meta-oe/recipes-qt/qtserialport/qtserialport.inc
+++ b/meta-oe/recipes-qt/qtserialport/qtserialport.inc
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
 inherit pkgconfig
 
 SRC_URI = " \
-    git://gitorious.org/qt/qtserialport.git \
+    git://gitorious.org/qt/qtserialport.git;branch=stable \
 "
 
 S = "${WORKDIR}/git"
-- 
1.8.4.3

[meta-oe][WIP][PATCH 3/8] qconnman*: Fix branch param

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-qt/qconnman/qconnman.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-qt/qconnman/qconnman.inc b/meta-oe/recipes-qt/qconnman/qconnman.inc
index 44ad9a1..664f2a0 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman.inc
+++ b/meta-oe/recipes-qt/qconnman/qconnman.inc
@@ -10,6 +10,6 @@ inherit autotools
 
 PV = "0.0+gitr${SRCPV}"
 SRCREV = "f976b18c7c5584627224784801803e9fd3ebe0ff"
-SRC_URI = "git://github.com/OSSystems/qconnman-ui.git"
+SRC_URI = "git://github.com/OSSystems/qconnman-ui.git;branch=stable"
 
 S = "${WORKDIR}/git/"
-- 
1.8.4.3

[meta-oe][WIP][PATCH 4/8] navit: Fix build with newer freetype

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../navit/navit/freetype-include-path.patch              | 16 ++++++++++++++++
 meta-oe/recipes-navigation/navit/navit_svn.bb            |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch

diff --git a/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
new file mode 100644
index 0000000..b3763b0
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS caused by freetype headers path change.
+Author: Gilles Filippini <pini@debian.org>
+Bug-Debian: http://bugs.debian.org/733378
+Index: navit/navit/font/freetype/font_freetype.c
+===================================================================
+--- navit.orig/navit/font/freetype/font_freetype.c	2013-09-23 10:43:32.000000000 +0200
++++ navit/navit/font/freetype/font_freetype.c	2013-12-30 19:54:45.000000000 +0100
+@@ -32,7 +32,7 @@
+ #if USE_FRIBIDI
+ #include <fribidi.h>
+ #endif
+-#include <freetype/ftglyph.h>
++#include <ftglyph.h>
+ #include "point.h"
+ #include "graphics.h"
+ #include "debug.h"
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb
index 6e81a4b..2661507 100644
--- a/meta-oe/recipes-navigation/navit/navit_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit_svn.bb
@@ -6,4 +6,5 @@ PR = "${INC_PR}.3"
 
 S = "${WORKDIR}/${PN}"
 SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \
+    file://freetype-include-path.patch \
 "
-- 
1.8.4.3

[meta-oe][WIP][PATCH 5/8] libssh: Fix branch param and set PV in recipe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/libssh/{libssh_0.5.5.bb => libssh_git.bb} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libssh/{libssh_0.5.5.bb => libssh_git.bb} (89%)

diff --git a/meta-oe/recipes-support/libssh/libssh_0.5.5.bb b/meta-oe/recipes-support/libssh/libssh_git.bb
similarity index 89%
rename from meta-oe/recipes-support/libssh/libssh_0.5.5.bb
rename to meta-oe/recipes-support/libssh/libssh_git.bb
index fa25119..73b9ec1 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.5.5.bb
+++ b/meta-oe/recipes-support/libssh/libssh_git.bb
@@ -7,7 +7,8 @@ DEPENDS = "zlib openssl libgcrypt"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
 
-SRC_URI = "git://git.libssh.org/projects/libssh.git"
+PV = "0.5.5+gitr${SRCPV}"
+SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-5"
 SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db"
 S = "${WORKDIR}/git"
 
-- 
1.8.4.3

[meta-oe][WIP][PATCH 6/8] freerdp: Fix branch param and set better PV in recipe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/freerdp/freerdp.inc    | 2 --
 meta-oe/recipes-support/freerdp/freerdp_git.bb | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc
index 65c61c2..34dac4b 100644
--- a/meta-oe/recipes-support/freerdp/freerdp.inc
+++ b/meta-oe/recipes-support/freerdp/freerdp.inc
@@ -8,8 +8,6 @@ SECTION = "x11/network"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-INC_PR = "r1"
-
 inherit pkgconfig cmake
 
 EXTRA_OECMAKE += "-DWITH_PULSEAUDIO=ON \
diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb
index 434e89a..0e9bf06 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
@@ -5,13 +5,12 @@ include freerdp.inc
 
 inherit gitpkgv
 
-PV = "gitr${SRCPV}"
+PV = "1.0.2+gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
-PR = "${INC_PR}.2"
 
 EXTRA_OECMAKE += "-DWITH_MANPAGES=OFF"
 
 SRCREV = "f311acaffb9190567e2b478a98d7cbfaf2709f6b"
-SRC_URI = "git://github.com/FreeRDP/FreeRDP.git"
+SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-1.0"
 
 S = "${WORKDIR}/git"
-- 
1.8.4.3

[meta-oe][WIP][PATCH 7/8] ajenti: Bump SRCREV a bit got get revision included in some branch

[Martin Jansa]

* old c08fb4da65923aebd09116750a1f43f13b98a51a exists only in 0.6.2 tag and latest
  bitbake refuses to fetch it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb b/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
index 83e92f6..f499339 100644
--- a/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
+++ b/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "python-pyopenssl python-lxml python-gevent python-greenlet \
 
 PV = "0.6.2+git${SRCPV}"
 
-SRC_URI = "git://github.com/Eugeny/ajenti.git \
+SRC_URI = "git://github.com/Eugeny/ajenti.git;branch=ajenti-0.6.x \
            file://0001-setup.py-remove-extra-data-files.patch \
            file://0002-plugins-hddstat-fix-disk-usage-check-to-work-with-bu.patch \
            file://0003-plugins-sysload-fix-to-work-with-busybox.patch \
@@ -22,8 +22,7 @@ SRC_URI = "git://github.com/Eugeny/ajenti.git \
 DISTRO_FILES = "file://distro-detection-openembedded.patch \
                 file://distributor-logo-openembedded.png"
 
-# Corresponds to the 0.6.2 tag
-SRCREV = "c08fb4da65923aebd09116750a1f43f13b98a51a"
+SRCREV = "411acfd0b96ad7a9bd79b3bdc1f9eef394f62198"
 
 S = "${WORKDIR}/git"
 
-- 
1.8.4.3

[meta-oe][WIP][PATCH 8/8] cloud9: Fix branch param

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index a755470..44b2142 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
            git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
            git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
-           git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect \
+           git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect;branch=ajaxorg \
            git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \
            git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \
            git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \
@@ -29,7 +29,7 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \
            git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \
            git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
-           git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio \
+           git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio;branch=cadorn-upstream \
            git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
            git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
            git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
-- 
1.8.4.3

Re: [meta-oe][WIP][PATCH 1/8] ktap: upgrade to 0.4

[Anders Darander]

Martin Jansa <martin.jansa@gmail.com> wrote:
>* tag v0.3 (and its SRCREV) doesn't exist in any branch so latest
>bitbake refuses to fetch it
>
>Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

This one looks OK to me. I was planning to do the update next week, but that patch could just as well be based on this one instead of the v0.3 recipe. 

So if we want a quick fix for the bitbake fetcher issue, take this patch. 

Acked-by: Anders Darander <anders@chargestorm.se>

-- 
Anders Darander
ChargeStorm AB          Tel: +46 702 44 84 36 
Drottninggatan 20       Email: anders@chargestorm.se
602 24 Norrköping       Web: www.chargestorm.se

Sent from my Android phone with K-9 Mail. Please excuse my brevity.

Re: [meta-oe][WIP][PATCH 7/8] ajenti: Bump SRCREV a bit got get revision included in some branch

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]

On Wed, Jan 01, 2014 at 01:57:25PM +0100, Martin Jansa wrote:
> * old c08fb4da65923aebd09116750a1f43f13b98a51a exists only in 0.6.2 tag and latest
>   bitbake refuses to fetch it
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb b/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
> index 83e92f6..f499339 100644
> --- a/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
> +++ b/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
> @@ -9,7 +9,7 @@ DEPENDS += "python-pyopenssl python-lxml python-gevent python-greenlet \
>  
>  PV = "0.6.2+git${SRCPV}"
>  
> -SRC_URI = "git://github.com/Eugeny/ajenti.git \
> +SRC_URI = "git://github.com/Eugeny/ajenti.git;branch=ajenti-0.6.x \
>             file://0001-setup.py-remove-extra-data-files.patch \
>             file://0002-plugins-hddstat-fix-disk-usage-check-to-work-with-bu.patch \
>             file://0003-plugins-sysload-fix-to-work-with-busybox.patch \
> @@ -22,8 +22,7 @@ SRC_URI = "git://github.com/Eugeny/ajenti.git \
>  DISTRO_FILES = "file://distro-detection-openembedded.patch \
>                  file://distributor-logo-openembedded.png"

This one wasn't merged, because the patches need to be rebased, is there
someone who cares about ajenti and will test it properly in runtime?

Paul? Kevin?

>  
> -# Corresponds to the 0.6.2 tag
> -SRCREV = "c08fb4da65923aebd09116750a1f43f13b98a51a"
> +SRCREV = "411acfd0b96ad7a9bd79b3bdc1f9eef394f62198"
>  
>  S = "${WORKDIR}/git"
>  
> -- 
> 1.8.4.3
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe][WIP][PATCH 7/8] ajenti: Bump SRCREV a bit got get revision included in some branch

[Paul Eggleton]

Hi Martin,

On Thursday 02 January 2014 08:57:24 Martin Jansa wrote:
> On Wed, Jan 01, 2014 at 01:57:25PM +0100, Martin Jansa wrote:
> > * old c08fb4da65923aebd09116750a1f43f13b98a51a exists only in 0.6.2 tag
> > and latest> 
> >   bitbake refuses to fetch it
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > 
> >  meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
> > b/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb index
> > 83e92f6..f499339 100644
> > --- a/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
> > +++ b/meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
> > @@ -9,7 +9,7 @@ DEPENDS += "python-pyopenssl python-lxml python-gevent
> > python-greenlet \> 
> >  PV = "0.6.2+git${SRCPV}"
> > 
> > -SRC_URI = "git://github.com/Eugeny/ajenti.git \
> > +SRC_URI = "git://github.com/Eugeny/ajenti.git;branch=ajenti-0.6.x \
> > 
> >             file://0001-setup.py-remove-extra-data-files.patch \
> >             file://0002-plugins-hddstat-fix-disk-usage-check-to-work-with-
> >             bu.patch \
> >             file://0003-plugins-sysload-fix-to-work-with-busybox.patch \
> > 
> > @@ -22,8 +22,7 @@ SRC_URI = "git://github.com/Eugeny/ajenti.git \
> > 
> >  DISTRO_FILES = "file://distro-detection-openembedded.patch \
> >  
> >                  file://distributor-logo-openembedded.png"
> 
> This one wasn't merged, because the patches need to be rebased, is there
> someone who cares about ajenti and will test it properly in runtime?
> 
> Paul? Kevin?
> Paul? Kevin?

Unfortunately upstream have recently changed their licensing scheme for newer 
versions, to the point where I'm much less interested in maintaining the 
recipe. I have a patch here to just drop it which I'll send out soon.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre