summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-07 10:20:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:46:24 +0000
commitb65041b6deba496e1620f4f6645a50104899e39d (patch)
tree8ee092c37d7eec201b7948a6766e4e332839109b
parent63041806bd6882470fc2cf98be476aae6bc307d3 (diff)
downloadpoky-b65041b6deba496e1620f4f6645a50104899e39d.tar.gz
meta-yocto/conf/distro/include/*: update image/packagegroup entries
These files were somewhat out-of-date with regard to some of the changes that have happened with packagegroups and images, so update them. (From meta-yocto rev: 752d64f5e2c9cccf939b131bbcb5bd52b5d1e6c6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto/conf/distro/include/distro_alias.inc15
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc5
2 files changed, 6 insertions, 14 deletions
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index d113606cc8..629d1eb3d6 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -51,31 +51,23 @@ DISTRO_PN_ALIAS_pn-connman = "Meego=connman"
51DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core" 51DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core"
52DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" 52DISTRO_PN_ALIAS_pn-connman-gnome = "Intel"
53DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools" 53DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
54DISTRO_PN_ALIAS_pn-core-console = "OE-Core"
55DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core" 54DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core"
56DISTRO_PN_ALIAS_pn-core-image-basic = "OE-Core"
57DISTRO_PN_ALIAS_pn-core-image-clutter = "OE-Core" 55DISTRO_PN_ALIAS_pn-core-image-clutter = "OE-Core"
58DISTRO_PN_ALIAS_pn-core-image-core = "OE-Core" 56DISTRO_PN_ALIAS_pn-core-image-directfb = "OE-Core"
57DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core"
59DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" 58DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core"
60DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" 59DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core"
61DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core" 60DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core"
62DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" 61DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core"
63DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" 62DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core"
64DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" 63DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core"
65DISTRO_PN_ALIAS_pn-core-image-minimal-directdisk = "OE-Core"
66DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "OE-Core" 64DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "OE-Core"
67DISTRO_PN_ALIAS_pn-core-image-minimal-live = "OE-Core"
68DISTRO_PN_ALIAS_pn-core-image-minimal-mtdutils = "OE-Core" 65DISTRO_PN_ALIAS_pn-core-image-minimal-mtdutils = "OE-Core"
69DISTRO_PN_ALIAS_pn-core-image-rt = "OE-Core" 66DISTRO_PN_ALIAS_pn-core-image-rt = "OE-Core"
70DISTRO_PN_ALIAS_pn-core-image-rt-sdk = "OE-Core" 67DISTRO_PN_ALIAS_pn-core-image-rt-sdk = "OE-Core"
71DISTRO_PN_ALIAS_pn-core-image-sato = "OE-Core" 68DISTRO_PN_ALIAS_pn-core-image-sato = "OE-Core"
72DISTRO_PN_ALIAS_pn-core-image-sato-dev = "OE-Core" 69DISTRO_PN_ALIAS_pn-core-image-sato-dev = "OE-Core"
73DISTRO_PN_ALIAS_pn-core-image-sato-directdisk = "OE-Core"
74DISTRO_PN_ALIAS_pn-core-image-sato-live = "OE-Core"
75DISTRO_PN_ALIAS_pn-core-image-sato-sdk = "OE-Core" 70DISTRO_PN_ALIAS_pn-core-image-sato-sdk = "OE-Core"
76DISTRO_PN_ALIAS_pn-core-image-sato-sdk-directdisk = "OE-Core"
77DISTRO_PN_ALIAS_pn-core-image-sato-sdk-live = "OE-Core"
78DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core"
79DISTRO_PN_ALIAS_pn-core-image-weston = "OE-Core" 71DISTRO_PN_ALIAS_pn-core-image-weston = "OE-Core"
80DISTRO_PN_ALIAS_pn-core-image-x11 = "OE-Core" 72DISTRO_PN_ALIAS_pn-core-image-x11 = "OE-Core"
81DISTRO_PN_ALIAS_pn-cross-localedef = "OSPDT" 73DISTRO_PN_ALIAS_pn-cross-localedef = "OSPDT"
@@ -316,11 +308,10 @@ DISTRO_PN_ALIAS_pn-oprofileui-server = "Fedora=oprofileui Ubuntu=oprofile-gui De
316DISTRO_PN_ALIAS_pn-owl-video = "OpenedHand" 308DISTRO_PN_ALIAS_pn-owl-video = "OpenedHand"
317DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" 309DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core"
318DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" 310DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"
319DISTRO_PN_ALIAS_pn-packagegroup-core-basic = "OE-Core" 311DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core"
320DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core" 312DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core"
321DISTRO_PN_ALIAS_pn-packagegroup-core-buildessential = "OE-Core" 313DISTRO_PN_ALIAS_pn-packagegroup-core-buildessential = "OE-Core"
322DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core" 314DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core"
323DISTRO_PN_ALIAS_pn-packagegroup-core-console = "OE-Core"
324DISTRO_PN_ALIAS_pn-packagegroup-core-device-devel = "OE-Core" 315DISTRO_PN_ALIAS_pn-packagegroup-core-device-devel = "OE-Core"
325DISTRO_PN_ALIAS_pn-packagegroup-core-directfb = "OE-Core" 316DISTRO_PN_ALIAS_pn-packagegroup-core-directfb = "OE-Core"
326DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" 317DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 75fc0e01ee..d3ac63fe31 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -95,8 +95,9 @@ RECIPE_MAINTAINER_pn-connman-gnome = "Cristian Iorga <cristian.iorga@intel.com>"
95RECIPE_MAINTAINER_pn-consolekit = "Saul Wold <sgw@linux.intel.com>" 95RECIPE_MAINTAINER_pn-consolekit = "Saul Wold <sgw@linux.intel.com>"
96RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>" 96RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>"
97RECIPE_MAINTAINER_pn-core-image-base = "Saul Wold <sgw@linux.intel.com>" 97RECIPE_MAINTAINER_pn-core-image-base = "Saul Wold <sgw@linux.intel.com>"
98RECIPE_MAINTAINER_pn-core-image-basic = "Saul Wold <sgw@linux.intel.com>"
99RECIPE_MAINTAINER_pn-core-image-clutter = "Saul Wold <sgw@linux.intel.com>" 98RECIPE_MAINTAINER_pn-core-image-clutter = "Saul Wold <sgw@linux.intel.com>"
99RECIPE_MAINTAINER_pn-core-image-directfb = "Saul Wold <sgw@linux.intel.com>"
100RECIPE_MAINTAINER_pn-core-image-full-cmdline = "Saul Wold <sgw@linux.intel.com>"
100RECIPE_MAINTAINER_pn-core-image-lsb-dev = "Saul Wold <sgw@linux.intel.com>" 101RECIPE_MAINTAINER_pn-core-image-lsb-dev = "Saul Wold <sgw@linux.intel.com>"
101RECIPE_MAINTAINER_pn-core-image-lsb = "Saul Wold <sgw@linux.intel.com>" 102RECIPE_MAINTAINER_pn-core-image-lsb = "Saul Wold <sgw@linux.intel.com>"
102RECIPE_MAINTAINER_pn-core-image-lsb-sdk = "Saul Wold <sgw@linux.intel.com>" 103RECIPE_MAINTAINER_pn-core-image-lsb-sdk = "Saul Wold <sgw@linux.intel.com>"
@@ -492,12 +493,12 @@ RECIPE_MAINTAINER_pn-oprofileui-server = "Saul Wold <sgw@linux.intel.com>"
492RECIPE_MAINTAINER_pn-ossp-uuid = "Saul Wold <sgw@linux.intel.com>" 493RECIPE_MAINTAINER_pn-ossp-uuid = "Saul Wold <sgw@linux.intel.com>"
493RECIPE_MAINTAINER_pn-owl-video = "Valentin Popa <valentin.popa@intel.com>" 494RECIPE_MAINTAINER_pn-owl-video = "Valentin Popa <valentin.popa@intel.com>"
494RECIPE_MAINTAINER_pn-packagegroup-base = "Saul Wold <sgw@linux.intel.com>" 495RECIPE_MAINTAINER_pn-packagegroup-base = "Saul Wold <sgw@linux.intel.com>"
495RECIPE_MAINTAINER_pn-packagegroup-core-basic = "Saul Wold <sgw@linux.intel.com>"
496RECIPE_MAINTAINER_pn-packagegroup-core-boot = "Saul Wold <sgw@linux.intel.com>" 496RECIPE_MAINTAINER_pn-packagegroup-core-boot = "Saul Wold <sgw@linux.intel.com>"
497RECIPE_MAINTAINER_pn-packagegroup-core-buildessential = "Saul Wold <sgw@linux.intel.com>" 497RECIPE_MAINTAINER_pn-packagegroup-core-buildessential = "Saul Wold <sgw@linux.intel.com>"
498RECIPE_MAINTAINER_pn-packagegroup-core-clutter = "Ross Burton <ross.burton@intel.com>" 498RECIPE_MAINTAINER_pn-packagegroup-core-clutter = "Ross Burton <ross.burton@intel.com>"
499RECIPE_MAINTAINER_pn-packagegroup-core-device-devel = "Saul Wold <sgw@linux.intel.com>" 499RECIPE_MAINTAINER_pn-packagegroup-core-device-devel = "Saul Wold <sgw@linux.intel.com>"
500RECIPE_MAINTAINER_pn-packagegroup-core-directfb = "Saul Wold <sgw@linux.intel.com>" 500RECIPE_MAINTAINER_pn-packagegroup-core-directfb = "Saul Wold <sgw@linux.intel.com>"
501RECIPE_MAINTAINER_pn-packagegroup-core-full-cmdline = "Saul Wold <sgw@linux.intel.com>"
501RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Saul Wold <sgw@linux.intel.com>" 502RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Saul Wold <sgw@linux.intel.com>"
502RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Saul Wold <sgw@linux.intel.com>" 503RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Saul Wold <sgw@linux.intel.com>"
503RECIPE_MAINTAINER_pn-packagegroup-core-qt4e = "Paul Eggleton <paul.eggleton@linux.intel.com>" 504RECIPE_MAINTAINER_pn-packagegroup-core-qt4e = "Paul Eggleton <paul.eggleton@linux.intel.com>"