[meta-oe][PATCH 0/2] PACKAGECONFIG for polkit and foxtrotgps upgrade

[meta-oe][PATCH 0/2] PACKAGECONFIG for polkit and foxtrotgps upgrade

[Martin Jansa]

The following changes since commit f89d930201725d0427b0c1e881cff929c5a8ef7e:

  vsftpd: add new package (2012-02-22 09:45:55 +0100)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (2):
  foxtrotgps: upgrade to 1.1.0
  polkit: enable and disable systemd/consolekit support explicitly

 .../recipes-extended/polkit/polkit_0.104.bbappend  |    7 ++-
 .../foxtrotgps-1.0.1/remove.unused.header.patch    |   40 --------------------
 .../{foxtrotgps_1.0.1.bb => foxtrotgps_1.1.0.bb}   |    8 +--
 3 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
 rename meta-oe/recipes-navigation/foxtrotgps/{foxtrotgps_1.0.1.bb => foxtrotgps_1.1.0.bb} (61%)

-- 
1.7.8.4

[meta-oe][PATCH 1/2] foxtrotgps: upgrade to 1.1.0

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../foxtrotgps-1.0.1/remove.unused.header.patch    |   40 --------------------
 .../{foxtrotgps_1.0.1.bb => foxtrotgps_1.1.0.bb}   |    8 +--
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
 rename meta-oe/recipes-navigation/foxtrotgps/{foxtrotgps_1.0.1.bb => foxtrotgps_1.1.0.bb} (61%)

diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
deleted file mode 100644
index d80d321..0000000
--- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-curl/types.h was removed in
-https://github.com/bagder/curl/commit/2ef7a28a71f819343afefa721e5497119fb2cee0#include/curl
-and is not available in curl-7.21.8 and newer
-
-=== modified file 'foxtrotgps-1.0.1/src/friends.c'
---- foxtrotgps-1.0.1.orig/src/friends.c	2011-05-01 20:51:37 +0000
-+++ foxtrotgps-1.0.1/src/friends.c	2011-07-21 15:34:03 +0000
-@@ -17,7 +17,6 @@
- #include <gtk/gtk.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- 
-
-=== modified file 'foxtrotgps-1.0.1/src/tile_management.c'
---- foxtrotgps-1.0.1.orig/src/tile_management.c	2011-06-02 11:25:49 +0000
-+++ foxtrotgps-1.0.1/src/tile_management.c	2011-07-21 15:34:06 +0000
-@@ -8,7 +8,6 @@
- #include <glib/gprintf.h>
- #include <string.h>
- #include <curl/curl.h>
--#include <curl/types.h> 
- #include <curl/easy.h> 
- #include <math.h>
- #include "globals.h"
-
-=== modified file 'foxtrotgps-1.0.1/src/util.h'
---- foxtrotgps-1.0.1.orig/src/util.h	2010-04-13 02:20:30 +0000
-+++ foxtrotgps-1.0.1/src/util.h	2011-07-21 15:34:05 +0000
-@@ -2,7 +2,6 @@
- #include <gtk/gtk.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- int
- sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**));
-
diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.0.bb
similarity index 61%
rename from meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
rename to meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.0.bb
index 2a8293e..2580abc 100644
--- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.0.bb
@@ -5,12 +5,10 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf libglade sqlite3 libexif gpsd"
-PR = "r1"
 
-SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz \
-           file://remove.unused.header.patch"
-SRC_URI[md5sum] = "982d14cdb0439cc4d6aa6cefc232124d"
-SRC_URI[sha256sum] = "059158fd8e61137e2e6d6e01685add7fb85cce8483faa99efb01187f2ba50841"
+SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz"
+SRC_URI[md5sum] = "1585d332ae546a0f84e8327ac21b27b9"
+SRC_URI[sha256sum] = "2d0d66d3e6d3c6ca1c8e5d82129182a49691b9622067b7c5edf82d808ebf1a77"
 
 inherit autotools pkgconfig perlnative
 
-- 
1.7.8.4

[meta-oe][PATCH 2/2] polkit: enable and disable systemd/consolekit support explicitly

[Martin Jansa]

* people using sysvinit need to add something like
  PACKAGECONFIG = "${@base_contains('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'consolekit', 'systemd', d)}"
  or just
  PACKAGECONFIG = "consolekit"
  to their own .bbappend if they don't want to get systemd in their
  images.
* and for the rest it will enable systemd explititly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
index 3c43970..1e2cccd 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
@@ -1,3 +1,6 @@
-DEPENDS += "systemd"
+PRINC := "${@int(PRINC) + 3}"
 
-PRINC = "1"
+PACKAGECONFIG ??= "systemd"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
+PACKAGECONFIG[consolekit] = ",,,consolekit"
-- 
1.7.8.4