From e3e6454f61ce53b9f33dfcfffc73bb7654be8c1d Mon Sep 17 00:00:00 2001
From: "I-Fan, Chen" <tick@openmoko.com>
Date: Wed, 1 Oct 2008 20:16:22 +0800
Subject: various Openmoko recipes: Adding alias name tags for packages

---
 packages/openmoko-projects/assassin-thumbnail.bb             |  3 +--
 packages/openmoko-projects/diversity-radar_svn.bb            |  2 +-
 packages/openmoko-projects/om-locations_git.bb               |  2 +-
 packages/openmoko-projects/om-maps-berlin_20080430.bb        |  4 ++--
 packages/openmoko-projects/om-maps-buenos-aires_20080430.bb  |  4 ++--
 packages/openmoko-projects/om-maps-hong-kong_20080919.bb     |  2 +-
 packages/openmoko-projects/om-maps-london_20080430.bb        |  4 ++--
 packages/openmoko-projects/om-maps-low-levels_20080430.bb    |  6 ++++--
 packages/openmoko-projects/om-maps-new-york_20080430.bb      |  4 ++--
 packages/openmoko-projects/om-maps-paris_20080430.bb         |  4 ++--
 packages/openmoko-projects/om-maps-providence_20080430.bb    |  4 ++--
 packages/openmoko-projects/om-maps-san-francisco_20080430.bb |  4 ++--
 packages/openmoko-projects/om-maps-sydney_20080430.bb        |  4 ++--
 packages/openmoko-projects/om-maps-taipei_20080430.bb        |  4 ++--
 packages/openmoko-projects/om-maps.inc                       |  3 ++-
 packages/openmoko-projects/openmoko-community-repository.bb  |  4 ++--
 packages/openmoko-projects/pyefl-sudoku_svn.bb               |  2 +-
 packages/openmoko-tools/openmoko-set-root-password.bb        |  3 ++-
 packages/openmoko2/openmoko-calculator2_svn.bb               | 10 +++++++++-
 packages/openmoko2/openmoko-contacts2_svn.bb                 |  3 ++-
 packages/openmoko2/openmoko-dates2_svn.bb                    |  4 ++--
 packages/openmoko2/openmoko-dialer2_svn.bb                   |  3 ++-
 packages/openmoko2/openmoko-mediaplayer2_svn.bb              |  3 ++-
 packages/openmoko2/openmoko-messages2_svn.bb                 |  3 ++-
 packages/openmoko2/openmoko-terminal2_svn.bb                 |  3 ++-
 25 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/packages/openmoko-projects/assassin-thumbnail.bb b/packages/openmoko-projects/assassin-thumbnail.bb
index ece6662b91..2e9afeb2d6 100644
--- a/packages/openmoko-projects/assassin-thumbnail.bb
+++ b/packages/openmoko-projects/assassin-thumbnail.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Assassin Packages Thumbnails"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
-PKG_TAGS_${PN} = "group::unknown"
 LICENSE = "GPL"
 RDEPENDS = "assassin"
 PV = "0.1+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https"
 
diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
index d7163f1f21..7a98d93afb 100644
--- a/packages/openmoko-projects/diversity-radar_svn.bb
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -15,4 +15,4 @@ inherit setuptools
 
 FILES_${PN} += "${prefix}/share/*"
 
-PKG_TAGS_${PN} = "group::communication"
+PKG_TAGS_${PN} = "group::communication alias::Diversity_Radar"
diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index a25a3e21ba..9207502f2f 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -19,4 +19,4 @@ do_configure_prepend() {
        autopoint --force
 }
 
-PKG_TAGS_${PN} = "group::communication"
+PKG_TAGS_${PN} = "group::communication alias::Om_Locations"
diff --git a/packages/openmoko-projects/om-maps-berlin_20080430.bb b/packages/openmoko-projects/om-maps-berlin_20080430.bb
index aaf6e5332c..17bfe725fc 100644
--- a/packages/openmoko-projects/om-maps-berlin_20080430.bb
+++ b/packages/openmoko-projects/om-maps-berlin_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Berlin"
 require om-maps.inc
 
-MAP_NAME = "Berlin"
 MAP_FN = "om-maps-berlin-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
index 81f734f27a..8f2f2a205d 100644
--- a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
+++ b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Buenos Aires"
 require om-maps.inc
 
-MAP_NAME = "Buenos Aires"
 MAP_FN = "om-maps-buenos-aires-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
index 9aecf64816..9b641778ec 100644
--- a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
+++ b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
@@ -1,7 +1,7 @@
 PR = "r1"
 
+MAP_NAME = "Hong Kong"
 require om-maps.inc
 
-MAP_NAME = "Hong Kong"
 MAP_FN = "om-maps-hong-kong-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-london_20080430.bb b/packages/openmoko-projects/om-maps-london_20080430.bb
index d07add5032..f19b956f00 100644
--- a/packages/openmoko-projects/om-maps-london_20080430.bb
+++ b/packages/openmoko-projects/om-maps-london_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "London"
 require om-maps.inc
 
-MAP_NAME = "London"
 MAP_FN = "om-maps-london-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-low-levels_20080430.bb b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
index 7f94c903b5..24c57b6f21 100644
--- a/packages/openmoko-projects/om-maps-low-levels_20080430.bb
+++ b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
@@ -1,7 +1,9 @@
-PR = "r0"
+PR = "r1"
 
+MAP_NAME = "low levels"
 require om-maps.inc
 
-MAP_NAME = "low levels"
+
+PKG_TAGS_${PN} = "alias::${ALIAS_NAME_${PN}}"
 MAP_FN = "om-maps-low-levels-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-new-york_20080430.bb b/packages/openmoko-projects/om-maps-new-york_20080430.bb
index 2fffda62c3..52a40cccc6 100644
--- a/packages/openmoko-projects/om-maps-new-york_20080430.bb
+++ b/packages/openmoko-projects/om-maps-new-york_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "New York"
 require om-maps.inc
 
-MAP_NAME = "New York"
 MAP_FN = "om-maps-new-york-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-paris_20080430.bb b/packages/openmoko-projects/om-maps-paris_20080430.bb
index 663656a673..3c66830cdb 100644
--- a/packages/openmoko-projects/om-maps-paris_20080430.bb
+++ b/packages/openmoko-projects/om-maps-paris_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Paris"
 require om-maps.inc
 
-MAP_NAME = "Paris"
 MAP_FN = "om-maps-paris-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-providence_20080430.bb b/packages/openmoko-projects/om-maps-providence_20080430.bb
index 919e030e17..5fd447b663 100644
--- a/packages/openmoko-projects/om-maps-providence_20080430.bb
+++ b/packages/openmoko-projects/om-maps-providence_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Providence"
 require om-maps.inc
 
-MAP_NAME = "Providence"
 MAP_FN = "om-maps-providence-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
index 6b5f77981a..b4fb9d00e6 100644
--- a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
+++ b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "San Francisco"
 require om-maps.inc
 
-MAP_NAME = "San Francisco"
 MAP_FN = "om-maps-san-francisco-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-sydney_20080430.bb b/packages/openmoko-projects/om-maps-sydney_20080430.bb
index 267b6a1724..81e379c373 100644
--- a/packages/openmoko-projects/om-maps-sydney_20080430.bb
+++ b/packages/openmoko-projects/om-maps-sydney_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Sydney"
 require om-maps.inc
 
-MAP_NAME = "Sydney"
 MAP_FN = "om-maps-sydney-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-taipei_20080430.bb b/packages/openmoko-projects/om-maps-taipei_20080430.bb
index bb017f59fb..fdd5c36f02 100644
--- a/packages/openmoko-projects/om-maps-taipei_20080430.bb
+++ b/packages/openmoko-projects/om-maps-taipei_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Taipei"
 require om-maps.inc
 
-MAP_NAME = "Taipei"
 MAP_FN = "om-maps-taipei-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps.inc b/packages/openmoko-projects/om-maps.inc
index f2ef1dbbec..36081bdcca 100644
--- a/packages/openmoko-projects/om-maps.inc
+++ b/packages/openmoko-projects/om-maps.inc
@@ -11,7 +11,8 @@ FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
 
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
-PKG_TAGS_${PN} = "group::maps"
+ALIAS_NAME_${PN}= "${@bb.data.getVar('MAP_NAME', d, 1).replace(' ','_')}"
+PKG_TAGS_${PN} = "group::maps alias::${ALIAS_NAME_${PN}}"
 
 do_install() {
         install -d ${D}${MAP_DIR}
diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
index d866558fb3..45507233c0 100644
--- a/packages/openmoko-projects/openmoko-community-repository.bb
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration files for online package repositories of Openmoko community repository feeds"
-PR = "r0.02"
+PR = "r0.03"
 
 do_compile() {
     mkdir -p ${S}/${sysconfdir}/opkg
@@ -16,6 +16,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 CONFFILES_${PN} += "${sysconfdir}/opkg/Multiverse-feed.conf"
 
-PKG_TAGS_${PN} = "group::repos"
+PKG_TAGS_${PN} = "group::repos alias::Om_Multiverse"
 
 OPENMOKO_URI = "http://downloads.openmoko.org/repository"
diff --git a/packages/openmoko-projects/pyefl-sudoku_svn.bb b/packages/openmoko-projects/pyefl-sudoku_svn.bb
index 8c1dfe24ec..f44bc0755e 100644
--- a/packages/openmoko-projects/pyefl-sudoku_svn.bb
+++ b/packages/openmoko-projects/pyefl-sudoku_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "python-evas python-edje python-ecore"
 RDEPENDS = "python-evas python-edje python-ecore"
 PV = "0.0.2+svnr${SRCREV}"
-PR = "r1.01"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pyefl-sudoku;proto=http"
 
diff --git a/packages/openmoko-tools/openmoko-set-root-password.bb b/packages/openmoko-tools/openmoko-set-root-password.bb
index f64c7031c1..6176d4aef9 100644
--- a/packages/openmoko-tools/openmoko-set-root-password.bb
+++ b/packages/openmoko-tools/openmoko-set-root-password.bb
@@ -3,12 +3,13 @@ SUMMARY = "On installation you will be prompted to set a root password. With \
 this password you can then log into the machine."
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-PKG_TAGS_${PN} = "group::programming"
+PKG_TAGS_${PN} = "group::programming alias::Root_Password"
 
 SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=root-password;proto=http"
 S = "${WORKDIR}/root-password"
 PV = "1.0+svnr${SRCREV}"
 PE = "1"
+PR = "r1"
 
 do_compile () {
     cd ${S}
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
index ba202bcec9..66a8707c6f 100644
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -2,6 +2,14 @@ DESCRIPTION = "A Calculator for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
+SRC_URI += " file://openmoko-calculator.png "
+
+do_install_append_openmoko() {
+        install -d ${D}/${datadir}/pixmaps/
+        install ${WORKDIR}//openmoko-calculator.png ${D}/${datadir}/pixmaps/openmoko-calculator.png
+}
+
+PKG_TAGS_${PN} = "group::unknown alias::Om_Calculator"
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index d380f32327..203ced3924 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "The Openmoko Address Book"
 SECTION = "openmoko/pim"
+PKG_TAGS_${PN} = "group::communication alias::Om_Contacts2"
 DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
 RDEPENDS = "libedata-book"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index ff3bfa62a6..7a1fb7a6ac 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko2 pkgconfig
 
@@ -16,4 +16,4 @@ do_configure_prepend() {
 	touch gtk-doc.make
 }
 
-
+PKG_TAGS_${PN} = "group::communication alias::Om_Dates2"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index fa76c44a14..2d8bad42be 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/pim"
+PKG_TAGS_${PN} = "group::communication alias::Om_Dialer2"
 DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r8"
+PR = "r9"
 PE = "1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 579789b6a8..4addc51a55 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
 RDEPENDS = "gst-meta-audio gconf gst-plugin-alsa"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 inherit openmoko2
 
@@ -23,3 +23,4 @@ fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
 }
+PKG_TAGS_${PN} = "group::unknown alias::Om_Mediaplayer2"
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
index f28f7f8e0a..d68cd71c95 100644
--- a/packages/openmoko2/openmoko-messages2_svn.bb
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "The Openmoko Message application"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+PKG_TAGS_${PN} = "group::communication alias::Om_Messages2"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
index 3a5ef204ff..48adca8e96 100644
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -3,6 +3,7 @@ SECTION = "openmoko/applications"
 DEPENDS = "vala-native vte libmokoui2"
 RDEPENDS = "ttf-liberation-mono"
 PV = "3.0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+PKG_TAGS_${PN} = "group::programming alias::Om_Terminal2"
 
 inherit openmoko2
-- 
cgit v1.2.3