summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-09 09:09:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 17:51:10 +0100
commitb95356c455ee7611cd3c0a766785a9c13fbe8f69 (patch)
tree8c4c8c7f7d2058fcfbd64648f72c049f20aba6b5 /meta-yocto/conf
parent70b874019ca5893f0b42e96edda95f2fcee078f0 (diff)
downloadpoky-b95356c455ee7611cd3c0a766785a9c13fbe8f69.tar.gz
distro: Remove Pimlico from distro-tracking
(From meta-yocto rev: 62822ea2141345552ab59bb6e673103f1efb6639) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/distro/include/distro_alias.inc4
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc4
-rw-r--r--meta-yocto/conf/distro/include/poky-floating-revisions.inc3
-rw-r--r--meta-yocto/conf/distro/include/recipe_color.inc3
-rw-r--r--meta-yocto/conf/distro/include/upstream_tracking.inc6
5 files changed, 0 insertions, 20 deletions
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 0c0684bd7e..30ec2f6223 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -39,7 +39,6 @@ DISTRO_PN_ALIAS_pn-compositeproto = "Meego=xorg-x11-proto-compositeproto"
39DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" 39DISTRO_PN_ALIAS_pn-connman-gnome = "Intel"
40DISTRO_PN_ALIAS_pn-connman = "Meego=connman" 40DISTRO_PN_ALIAS_pn-connman = "Meego=connman"
41DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools" 41DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
42DISTRO_PN_ALIAS_pn-contacts = "Debian=contacts Fedora=contacts"
43DISTRO_PN_ALIAS_pn-core-console = "OE-Core" 42DISTRO_PN_ALIAS_pn-core-console = "OE-Core"
44DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core" 43DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core"
45DISTRO_PN_ALIAS_pn-core-image-basic = "OE-Core" 44DISTRO_PN_ALIAS_pn-core-image-basic = "OE-Core"
@@ -69,7 +68,6 @@ DISTRO_PN_ALIAS_pn-core-x11 = "OE-Core"
69DISTRO_PN_ALIAS_pn-cross-localedef = "OSPDT" 68DISTRO_PN_ALIAS_pn-cross-localedef = "OSPDT"
70DISTRO_PN_ALIAS_pn-cwautomacros= "OSPDT upstream=http://cwautomacros.berlios.de/" 69DISTRO_PN_ALIAS_pn-cwautomacros= "OSPDT upstream=http://cwautomacros.berlios.de/"
71DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto" 70DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto"
72DISTRO_PN_ALIAS_pn-dates = "Debian=dates Fedora=dates"
73DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1" 71DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1"
74DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand" 72DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand"
75DISTRO_PN_ALIAS_pn-directfb-examples = "Debian=directfb Fedora=directfb" 73DISTRO_PN_ALIAS_pn-directfb-examples = "Debian=directfb Fedora=directfb"
@@ -316,7 +314,6 @@ DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core"
316DISTRO_PN_ALIAS_pn-table = "Intel" 314DISTRO_PN_ALIAS_pn-table = "Intel"
317DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core" 315DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core"
318DISTRO_PN_ALIAS_pn-task-base = "OE-Core" 316DISTRO_PN_ALIAS_pn-task-base = "OE-Core"
319DISTRO_PN_ALIAS_pn-task-core-apps-x11-pimlico = "OE-Core"
320DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core" 317DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core"
321DISTRO_PN_ALIAS_pn-task-core-boot = "OE-Core" 318DISTRO_PN_ALIAS_pn-task-core-boot = "OE-Core"
322DISTRO_PN_ALIAS_pn-task-core-clutter = "OE-Core" 319DISTRO_PN_ALIAS_pn-task-core-clutter = "OE-Core"
@@ -344,7 +341,6 @@ DISTRO_PN_ALIAS_pn-task-qt4e = "OE-Core"
344DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core" 341DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core"
345DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "OE-Core" 342DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "OE-Core"
346DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel" 343DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel"
347DISTRO_PN_ALIAS_pn-tasks = "Debian=tasks Fedora=tasks"
348DISTRO_PN_ALIAS_pn-task-sdk-host = "OE-Core" 344DISTRO_PN_ALIAS_pn-task-sdk-host = "OE-Core"
349DISTRO_PN_ALIAS_pn-task-self-hosted = "OE-Core" 345DISTRO_PN_ALIAS_pn-task-self-hosted = "OE-Core"
350DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" 346DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 0f34d64d18..fe78b3ecf1 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -92,7 +92,6 @@ RECIPE_MAINTAINER_pn-compositeproto = "Valentin Popa <valentin.popa@intel.com>"
92RECIPE_MAINTAINER_pn-connman = "Cristian Iorga <cristian.iorga@intel.com>" 92RECIPE_MAINTAINER_pn-connman = "Cristian Iorga <cristian.iorga@intel.com>"
93RECIPE_MAINTAINER_pn-connman-gnome = "Cristian Iorga <cristian.iorga@intel.com>" 93RECIPE_MAINTAINER_pn-connman-gnome = "Cristian Iorga <cristian.iorga@intel.com>"
94RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>" 94RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>"
95RECIPE_MAINTAINER_pn-contacts = "Valentin Popa <valentin.popa@intel.com>"
96RECIPE_MAINTAINER_pn-core-image-base = "Saul Wold <sgw@linux.intel.com>" 95RECIPE_MAINTAINER_pn-core-image-base = "Saul Wold <sgw@linux.intel.com>"
97RECIPE_MAINTAINER_pn-core-image-basic = "Saul Wold <sgw@linux.intel.com>" 96RECIPE_MAINTAINER_pn-core-image-basic = "Saul Wold <sgw@linux.intel.com>"
98RECIPE_MAINTAINER_pn-core-image-core = "Saul Wold <sgw@linux.intel.com>" 97RECIPE_MAINTAINER_pn-core-image-core = "Saul Wold <sgw@linux.intel.com>"
@@ -116,7 +115,6 @@ RECIPE_MAINTAINER_pn-cronie = "Radu Moisan <radu.moisan@intel.com>"
116RECIPE_MAINTAINER_pn-curl = "Radu Moisan <radu.moisan@intel.com>" 115RECIPE_MAINTAINER_pn-curl = "Radu Moisan <radu.moisan@intel.com>"
117RECIPE_MAINTAINER_pn-cwautomacros = "Cristian Iorga <cristian.iorga@intel.com>" 116RECIPE_MAINTAINER_pn-cwautomacros = "Cristian Iorga <cristian.iorga@intel.com>"
118RECIPE_MAINTAINER_pn-damageproto = "Valentin Popa <valentin.popa@intel.com>" 117RECIPE_MAINTAINER_pn-damageproto = "Valentin Popa <valentin.popa@intel.com>"
119RECIPE_MAINTAINER_pn-dates = "Valentin Popa <valentin.popa@intel.com>"
120RECIPE_MAINTAINER_pn-db = "Cristian Iorga <cristian.iorga@intel.com>" 118RECIPE_MAINTAINER_pn-db = "Cristian Iorga <cristian.iorga@intel.com>"
121RECIPE_MAINTAINER_pn-dbus = "Cristian Iorga <cristian.iorga@intel.com>" 119RECIPE_MAINTAINER_pn-dbus = "Cristian Iorga <cristian.iorga@intel.com>"
122RECIPE_MAINTAINER_pn-dbus-glib = "Scott Garman <scott.a.garman@intel.com>" 120RECIPE_MAINTAINER_pn-dbus-glib = "Scott Garman <scott.a.garman@intel.com>"
@@ -606,7 +604,6 @@ RECIPE_MAINTAINER_pn-sysvinit = "Saul Wold <sgw@linux.intel.com>"
606RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga <cristian.iorga@intel.com>" 604RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga <cristian.iorga@intel.com>"
607RECIPE_MAINTAINER_pn-tar = "Scott Garman <scott.a.garman@intel.com>" 605RECIPE_MAINTAINER_pn-tar = "Scott Garman <scott.a.garman@intel.com>"
608RECIPE_MAINTAINER_pn-task-base = "Saul Wold <sgw@linux.intel.com>" 606RECIPE_MAINTAINER_pn-task-base = "Saul Wold <sgw@linux.intel.com>"
609RECIPE_MAINTAINER_pn-task-core-apps-x11-pimlico = "Cristian Iorga <cristian.iorga@intel.com>"
610RECIPE_MAINTAINER_pn-task-core-basic = "Saul Wold <sgw@linux.intel.com>" 607RECIPE_MAINTAINER_pn-task-core-basic = "Saul Wold <sgw@linux.intel.com>"
611RECIPE_MAINTAINER_pn-task-core-boot = "Saul Wold <sgw@linux.intel.com>" 608RECIPE_MAINTAINER_pn-task-core-boot = "Saul Wold <sgw@linux.intel.com>"
612RECIPE_MAINTAINER_pn-task-core-clutter = "Ross Burton <ross.burton@intel.com>" 609RECIPE_MAINTAINER_pn-task-core-clutter = "Ross Burton <ross.burton@intel.com>"
@@ -624,7 +621,6 @@ RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Saul Wold <sgw@linux.intel.com>
624RECIPE_MAINTAINER_pn-task-core-x11 = "Saul Wold <sgw@linux.intel.com>" 621RECIPE_MAINTAINER_pn-task-core-x11 = "Saul Wold <sgw@linux.intel.com>"
625RECIPE_MAINTAINER_pn-task-core-x11-sato = "Saul Wold <sgw@linux.intel.com>" 622RECIPE_MAINTAINER_pn-task-core-x11-sato = "Saul Wold <sgw@linux.intel.com>"
626RECIPE_MAINTAINER_pn-task-sdk-host = "Saul Wold <sgw@linux.intel.com>" 623RECIPE_MAINTAINER_pn-task-sdk-host = "Saul Wold <sgw@linux.intel.com>"
627RECIPE_MAINTAINER_pn-tasks = "Valentin Popa <valentin.popa@intel.com>"
628RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 624RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
629RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 625RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
630RECIPE_MAINTAINER_pn-tcp-wrappers = "Radu Moisan <radu.moisan@intel.com>" 626RECIPE_MAINTAINER_pn-tcp-wrappers = "Radu Moisan <radu.moisan@intel.com>"
diff --git a/meta-yocto/conf/distro/include/poky-floating-revisions.inc b/meta-yocto/conf/distro/include/poky-floating-revisions.inc
index 46fcbdcd30..af8ef1199e 100644
--- a/meta-yocto/conf/distro/include/poky-floating-revisions.inc
+++ b/meta-yocto/conf/distro/include/poky-floating-revisions.inc
@@ -9,8 +9,6 @@ SRCREV_pn-exmap-console ?= "${AUTOREV}"
9#SRCREV_pn-opkg-utils-naitve ?= "${AUTOREV}" 9#SRCREV_pn-opkg-utils-naitve ?= "${AUTOREV}"
10#SRCREV_pn-opkg-utils ?= "${AUTOREV}" 10#SRCREV_pn-opkg-utils ?= "${AUTOREV}"
11SRCREV_pn-gconf-dbus ?= "${AUTOREV}" 11SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
12SRCREV_pn-contacts ?= "${AUTOREV}"
13SRCREV_pn-dates ?= "${AUTOREV}"
14#SRCREV_pn-gtkhtml2 ?= "${AUTOREV}" 12#SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
15SRCREV_pn-web ?= "${AUTOREV}" 13SRCREV_pn-web ?= "${AUTOREV}"
16SRCREV_pn-evolution-data-server ?= "${AUTOREV}" 14SRCREV_pn-evolution-data-server ?= "${AUTOREV}"
@@ -37,7 +35,6 @@ SRCREV_pn-exmap-console ?= "${AUTOREV}"
37SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}" 35SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}"
38SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}" 36SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}"
39SRCREV_pn-matchbox-theme-sato-2 ?= "${AUTOREV}" 37SRCREV_pn-matchbox-theme-sato-2 ?= "${AUTOREV}"
40SRCREV_pn-tasks ?= "${AUTOREV}"
41SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" 38SRCREV_pn-sato-icon-theme ?= "${AUTOREV}"
42SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" 39SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}"
43SRCREV_pn-oh-puzzles ?= "${AUTOREV}" 40SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index b3f9b460ae..61394293f2 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -52,7 +52,6 @@ RECIPE_COLOR_pn-clutter-gst-1.8 = "red"
52RECIPE_COLOR_pn-clutter-gtk-1.8 = "red" 52RECIPE_COLOR_pn-clutter-gtk-1.8 = "red"
53RECIPE_COLOR_pn-compositeproto = "yellow" 53RECIPE_COLOR_pn-compositeproto = "yellow"
54RECIPE_COLOR_pn-console-tools = "red" 54RECIPE_COLOR_pn-console-tools = "red"
55RECIPE_COLOR_pn-contacts = "yellow"
56RECIPE_COLOR_pn-core-image-clutter = "red" 55RECIPE_COLOR_pn-core-image-clutter = "red"
57RECIPE_COLOR_pn-cpio = "yellow" 56RECIPE_COLOR_pn-cpio = "yellow"
58RECIPE_COLOR_pn-cronie = "yellow" 57RECIPE_COLOR_pn-cronie = "yellow"
@@ -61,7 +60,6 @@ RECIPE_COLOR_pn-cups = "red"
61RECIPE_COLOR_pn-curl = "yellow" 60RECIPE_COLOR_pn-curl = "yellow"
62RECIPE_COLOR_pn-cwautomacros = "yellow" 61RECIPE_COLOR_pn-cwautomacros = "yellow"
63RECIPE_COLOR_pn-damageproto = "yellow" 62RECIPE_COLOR_pn-damageproto = "yellow"
64RECIPE_COLOR_pn-dates = "yellow"
65RECIPE_COLOR_pn-db = "yellow" 63RECIPE_COLOR_pn-db = "yellow"
66RECIPE_COLOR_pn-dbus-glib = "yellow" 64RECIPE_COLOR_pn-dbus-glib = "yellow"
67RECIPE_COLOR_pn-dbus-wait = "yellow" 65RECIPE_COLOR_pn-dbus-wait = "yellow"
@@ -386,7 +384,6 @@ RECIPE_COLOR_pn-task-core-sdk = "red"
386RECIPE_COLOR_pn-task-core-sdk-gmae = "red" 384RECIPE_COLOR_pn-task-core-sdk-gmae = "red"
387RECIPE_COLOR_pn-task-core-standalone-gmae-sdk-target = "red" 385RECIPE_COLOR_pn-task-core-standalone-gmae-sdk-target = "red"
388RECIPE_COLOR_pn-task-core-standalone-sdk-target = "red" 386RECIPE_COLOR_pn-task-core-standalone-sdk-target = "red"
389RECIPE_COLOR_pn-tasks = "yellow"
390RECIPE_COLOR_pn-task-sdk-host = "red" 387RECIPE_COLOR_pn-task-sdk-host = "red"
391RECIPE_COLOR_pn-tcf-agent = "yellow" 388RECIPE_COLOR_pn-tcf-agent = "yellow"
392RECIPE_COLOR_pn-tcp-wrappers = "yellow" 389RECIPE_COLOR_pn-tcp-wrappers = "yellow"
diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index d34d980212..bdd45cdd41 100644
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -122,8 +122,6 @@ RECIPE_UPSTREAM_VERSION_pn-console-tools = "0.3.2"
122RECIPE_UPSTREAM_DATE_pn-console-tools = "Feb 18, 2002" 122RECIPE_UPSTREAM_DATE_pn-console-tools = "Feb 18, 2002"
123CHECK_DATE_pn-console-tools = "Jul 05, 2012" 123CHECK_DATE_pn-console-tools = "Jul 05, 2012"
124RECIPE_UPSTREAM_VERSION_pn-consolekit = "0.4.3" 124RECIPE_UPSTREAM_VERSION_pn-consolekit = "0.4.3"
125RECIPE_UPSTREAM_VERSION_pn-contacts = "0.12+git0+19853893fdb595de6aa59db0d9dc2f9451ed2933"
126RECIPE_UPSTREAM_DATE_pn-contacts = "Nov 01, 2009"
127RECIPE_UPSTREAM_VERSION_pn-core-image-minimal = "1.0" 125RECIPE_UPSTREAM_VERSION_pn-core-image-minimal = "1.0"
128RECIPE_UPSTREAM_VERSION_pn-coreutils = "8.12" 126RECIPE_UPSTREAM_VERSION_pn-coreutils = "8.12"
129RECIPE_UPSTREAM_DATE_pn-coreutils = "Apr 01, 2011" 127RECIPE_UPSTREAM_DATE_pn-coreutils = "Apr 01, 2011"
@@ -148,8 +146,6 @@ CHECK_DATE_pn-cwautomacros = "Jul 06, 2012"
148RECIPE_UPSTREAM_DATE_pn-cwautomacros = "Feb 01, 2011" 146RECIPE_UPSTREAM_DATE_pn-cwautomacros = "Feb 01, 2011"
149RECIPE_UPSTREAM_VERSION_pn-damageproto = "1.2.1" 147RECIPE_UPSTREAM_VERSION_pn-damageproto = "1.2.1"
150RECIPE_UPSTREAM_DATE_pn-damageproto = "Oct 29, 2010" 148RECIPE_UPSTREAM_DATE_pn-damageproto = "Oct 29, 2010"
151RECIPE_UPSTREAM_VERSION_pn-dates = "0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4"
152RECIPE_UPSTREAM_DATE_pn-dates = "Oct 01, 2009"
153RECIPE_UPSTREAM_VERSION_pn-db = "5.0.26" 149RECIPE_UPSTREAM_VERSION_pn-db = "5.0.26"
154RECIPE_NO_UPDATE_REASON_pn-db= "API compatibility issue" 150RECIPE_NO_UPDATE_REASON_pn-db= "API compatibility issue"
155RECIPE_UPSTREAM_DATE_pn-db = "n/a" 151RECIPE_UPSTREAM_DATE_pn-db = "n/a"
@@ -921,8 +917,6 @@ RECIPE_UPSTREAM_VERSION_pn-tar = "1.26"
921RECIPE_UPSTREAM_DATE_pn-tar = "Mar 01, 2011" 917RECIPE_UPSTREAM_DATE_pn-tar = "Mar 01, 2011"
922CHECK_DATE_pn-tar = "Nov 14, 2011" 918CHECK_DATE_pn-tar = "Nov 14, 2011"
923RECIPE_UPSTREAM_DATE_pn-task-base="n/a" 919RECIPE_UPSTREAM_DATE_pn-task-base="n/a"
924RECIPE_UPSTREAM_VERSION_pn-tasks = "0.18"
925RECIPE_UPSTREAM_DATE_pn-tasks = "Jul 01, 2010"
926RECIPE_UPSTREAM_DATE_pn-tcf-agent = "Jul 07, 2011" 920RECIPE_UPSTREAM_DATE_pn-tcf-agent = "Jul 07, 2011"
927RECIPE_UPSTREAM_VERSION_pn-tcl="8.5.11" 921RECIPE_UPSTREAM_VERSION_pn-tcl="8.5.11"
928RECIPE_UPSTREAM_DATE_pn-tcl = "Jul 07, 2011" 922RECIPE_UPSTREAM_DATE_pn-tcl = "Jul 07, 2011"