summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf/distro
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-02-04 11:02:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-04 12:41:58 +0000
commited523e1f558a8fe40415f896f7c85f87a3d1163c (patch)
treebacb7fcfcd8b858612a0826e61fce959f384a548 /meta-yocto/conf/distro
parent1d376f9f184eb31577bb2410dee1cbe08719f98b (diff)
downloadpoky-ed523e1f558a8fe40415f896f7c85f87a3d1163c.tar.gz
Remove zypper from distro tracking files
We no longer have zypper/libzypp/sat-solver, so remove references to them. (From meta-yocto rev: 3a30ea7b938d5d9931adc96bc698a0f25cf1c320) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf/distro')
-rw-r--r--meta-yocto/conf/distro/include/distro_alias.inc3
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc3
-rw-r--r--meta-yocto/conf/distro/include/recipe_color.inc2
-rw-r--r--meta-yocto/conf/distro/include/upstream_tracking.inc4
4 files changed, 0 insertions, 12 deletions
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 2f56d44511..c88f15d865 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -209,7 +209,6 @@ DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva
209DISTRO_PN_ALIAS_pn-libxsettings-client = "Debian=libxsettings-client0 Ubuntu=libxsettings-client0 Mandriva=libXsettings-client0" 209DISTRO_PN_ALIAS_pn-libxsettings-client = "Debian=libxsettings-client0 Ubuntu=libxsettings-client0 Mandriva=libXsettings-client0"
210DISTRO_PN_ALIAS_pn-libxtrap = "Debian=libxtrap6 Fedora=libXTrap" 210DISTRO_PN_ALIAS_pn-libxtrap = "Debian=libxtrap6 Fedora=libXTrap"
211DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc" 211DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc"
212DISTRO_PN_ALIAS_pn-libzypp = "OpenSuse=libzypp Meego=libzypp"
213DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" 212DISTRO_PN_ALIAS_pn-linux-dummy = "Intel"
214DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers" 213DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers"
215DISTRO_PN_ALIAS_pn-linux-libc-headers-yocto = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers" 214DISTRO_PN_ALIAS_pn-linux-libc-headers-yocto = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers"
@@ -356,7 +355,6 @@ DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
356DISTRO_PN_ALIAS_pn-run-postinsts = "OE-Core" 355DISTRO_PN_ALIAS_pn-run-postinsts = "OE-Core"
357DISTRO_PN_ALIAS_pn-sato-icon-theme = "OpenedHand" 356DISTRO_PN_ALIAS_pn-sato-icon-theme = "OpenedHand"
358DISTRO_PN_ALIAS_pn-sato-screenshot = "OpenedHand" 357DISTRO_PN_ALIAS_pn-sato-screenshot = "OpenedHand"
359DISTRO_PN_ALIAS_pn-sat-solver = "OSPDT OpenSuSE=satsolver-tools"
360DISTRO_PN_ALIAS_pn-screenshot = "OpenedHand" 358DISTRO_PN_ALIAS_pn-screenshot = "OpenedHand"
361DISTRO_PN_ALIAS_pn-scrnsaverproto = "Meego=xorg-x11-proto-scrnsaverproto Ubuntu=x11proto-scrnsaver-dev Debian=x11proto-scrnsaver-dev" 359DISTRO_PN_ALIAS_pn-scrnsaverproto = "Meego=xorg-x11-proto-scrnsaverproto Ubuntu=x11proto-scrnsaver-dev Debian=x11proto-scrnsaver-dev"
362DISTRO_PN_ALIAS_pn-settings-daemon = "OpenedHand" 360DISTRO_PN_ALIAS_pn-settings-daemon = "OpenedHand"
@@ -452,4 +450,3 @@ DISTRO_PN_ALIAS_pn-xwininfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils"
452DISTRO_PN_ALIAS_pn-yaffs2-utils = "OSPDT upstream=http://www.yaffs.net" 450DISTRO_PN_ALIAS_pn-yaffs2-utils = "OSPDT upstream=http://www.yaffs.net"
453DISTRO_PN_ALIAS_pn-zaurusd = "OpenedHand" 451DISTRO_PN_ALIAS_pn-zaurusd = "OpenedHand"
454DISTRO_PN_ALIAS_pn-zeroconf = "OSPDT upstream=http://www.progsoc.org/~wildfire/zeroconf/" 452DISTRO_PN_ALIAS_pn-zeroconf = "OSPDT upstream=http://www.progsoc.org/~wildfire/zeroconf/"
455DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 83e520258b..3069f72254 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -469,7 +469,6 @@ RECIPE_MAINTAINER_pn-libxxf86dga ="Saul Wold <sgw@linux.intel.com>"
469RECIPE_MAINTAINER_pn-libxxf86dga = "Constantin Musca <constantinx.musca@intel.com>" 469RECIPE_MAINTAINER_pn-libxxf86dga = "Constantin Musca <constantinx.musca@intel.com>"
470RECIPE_MAINTAINER_pn-libxxf86misc = "Constantin Musca <constantinx.musca@intel.com>" 470RECIPE_MAINTAINER_pn-libxxf86misc = "Constantin Musca <constantinx.musca@intel.com>"
471RECIPE_MAINTAINER_pn-libxxf86vm = "Constantin Musca <constantinx.musca@intel.com>" 471RECIPE_MAINTAINER_pn-libxxf86vm = "Constantin Musca <constantinx.musca@intel.com>"
472RECIPE_MAINTAINER_pn-libzypp = "Mark Hatle <mark.hatle@windriver.com>"
473RECIPE_MAINTAINER_pn-lighttpd = "Constantin Musca <constantinx.musca@intel.com>" 472RECIPE_MAINTAINER_pn-lighttpd = "Constantin Musca <constantinx.musca@intel.com>"
474RECIPE_MAINTAINER_pn-linuxdoc-tools = "Andrei Dinu <andrei.adrianx.dinu@intel.com>" 473RECIPE_MAINTAINER_pn-linuxdoc-tools = "Andrei Dinu <andrei.adrianx.dinu@intel.com>"
475RECIPE_MAINTAINER_pn-linux-dummy = "Saul Wold <sgw@linux.intel.com>" 474RECIPE_MAINTAINER_pn-linux-dummy = "Saul Wold <sgw@linux.intel.com>"
@@ -718,7 +717,6 @@ RECIPE_MAINTAINER_pn-run-postinsts = "Cristian Iorga <cristian.iorga@intel.com>"
718RECIPE_MAINTAINER_pn-rxvt-unicode = "Radu Moisan <radu.moisan@intel.com>" 717RECIPE_MAINTAINER_pn-rxvt-unicode = "Radu Moisan <radu.moisan@intel.com>"
719RECIPE_MAINTAINER_pn-sato-icon-theme = "Constantin Musca <constantinx.musca@intel.com>" 718RECIPE_MAINTAINER_pn-sato-icon-theme = "Constantin Musca <constantinx.musca@intel.com>"
720RECIPE_MAINTAINER_pn-sato-screenshot = "Saul Wold <sgw@linux.intel.com>" 719RECIPE_MAINTAINER_pn-sato-screenshot = "Saul Wold <sgw@linux.intel.com>"
721RECIPE_MAINTAINER_pn-sat-solver = "Mark Hatle <mark.hatle@windriver.com>"
722RECIPE_MAINTAINER_pn-screenshot = "Constantin Musca <constantinx.musca@intel.com>" 720RECIPE_MAINTAINER_pn-screenshot = "Constantin Musca <constantinx.musca@intel.com>"
723RECIPE_MAINTAINER_pn-screen = "Constantin Musca <constantinx.musca@intel.com>" 721RECIPE_MAINTAINER_pn-screen = "Constantin Musca <constantinx.musca@intel.com>"
724RECIPE_MAINTAINER_pn-scrnsaverproto = "Laurentiu Palcu <laurentiu.palcu@intel.com>" 722RECIPE_MAINTAINER_pn-scrnsaverproto = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
@@ -878,4 +876,3 @@ RECIPE_MAINTAINER_pn-zaurusd = "Radu Moisan <radu.moisan@intel.com>"
878RECIPE_MAINTAINER_pn-zeroconf = "Cristian Iorga <cristian.iorga@intel.com>" 876RECIPE_MAINTAINER_pn-zeroconf = "Cristian Iorga <cristian.iorga@intel.com>"
879RECIPE_MAINTAINER_pn-zip = "Radu Moisan <radu.moisan@intel.com>" 877RECIPE_MAINTAINER_pn-zip = "Radu Moisan <radu.moisan@intel.com>"
880RECIPE_MAINTAINER_pn-zlib = "Radu Moisan <radu.moisan@intel.com>" 878RECIPE_MAINTAINER_pn-zlib = "Radu Moisan <radu.moisan@intel.com>"
881RECIPE_MAINTAINER_pn-zypper = "Mark Hatle <mark.hatle@windriver.com>"
diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index f61250aa41..757e86fe08 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -244,7 +244,6 @@ RECIPE_COLOR_pn-libxv = "yellow"
244RECIPE_COLOR_pn-libxvmc = "yellow" 244RECIPE_COLOR_pn-libxvmc = "yellow"
245RECIPE_COLOR_pn-libxxf86misc = "yellow" 245RECIPE_COLOR_pn-libxxf86misc = "yellow"
246RECIPE_COLOR_pn-libxxf86vm = "yellow" 246RECIPE_COLOR_pn-libxxf86vm = "yellow"
247RECIPE_COLOR_pn-libzypp = "yellow"
248RECIPE_COLOR_pn-lighttpd = "yellow" 247RECIPE_COLOR_pn-lighttpd = "yellow"
249RECIPE_COLOR_pn-linuxdoc-tools = "yellow" 248RECIPE_COLOR_pn-linuxdoc-tools = "yellow"
250RECIPE_COLOR_pn-loudmouth = "red" 249RECIPE_COLOR_pn-loudmouth = "red"
@@ -446,4 +445,3 @@ RECIPE_COLOR_pn-yaffs2-utils = "red"
446RECIPE_COLOR_pn-zeroconf = "red" 445RECIPE_COLOR_pn-zeroconf = "red"
447RECIPE_COLOR_pn-zip = "yellow" 446RECIPE_COLOR_pn-zip = "yellow"
448RECIPE_COLOR_pn-zlib = "yellow" 447RECIPE_COLOR_pn-zlib = "yellow"
449RECIPE_COLOR_pn-zypper = "yellow"
diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index 28cb38724a..06f0cc88d8 100644
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -885,8 +885,6 @@ CHECK_DATE_pn-libxxf86misc = "Aug 31, 2012"
885RECIPE_UPSTREAM_VERSION_pn-libxxf86vm = "1.1.2" 885RECIPE_UPSTREAM_VERSION_pn-libxxf86vm = "1.1.2"
886RECIPE_UPSTREAM_DATE_pn-libxxf86vm = "Mar 08, 2012" 886RECIPE_UPSTREAM_DATE_pn-libxxf86vm = "Mar 08, 2012"
887CHECK_DATE_pn-libxxf86vm = "Aug 31, 2012" 887CHECK_DATE_pn-libxxf86vm = "Aug 31, 2012"
888RECIPE_UPSTREAM_VERSION_pn-libzypp = "git"
889CHECK_DATE_pn-libzypp = "Aug 31, 2012"
890RECIPE_UPSTREAM_VERSION_pn-lighttpd = "1.4.31" 888RECIPE_UPSTREAM_VERSION_pn-lighttpd = "1.4.31"
891RECIPE_UPSTREAM_DATE_pn-lighttpd = "May 31, 2012" 889RECIPE_UPSTREAM_DATE_pn-lighttpd = "May 31, 2012"
892CHECK_DATE_pn-lighttpd = "Aug 31, 2012" 890CHECK_DATE_pn-lighttpd = "Aug 31, 2012"
@@ -1206,7 +1204,6 @@ RECIPE_UPSTREAM_VERSION_pn-run-postinsts = "check"
1206RECIPE_UPSTREAM_DATE_pn-rxvt-unicode = "Jan 21, 2012" 1204RECIPE_UPSTREAM_DATE_pn-rxvt-unicode = "Jan 21, 2012"
1207RECIPE_UPSTREAM_VERSION_pn-rxvt-unicode = "9.15" 1205RECIPE_UPSTREAM_VERSION_pn-rxvt-unicode = "9.15"
1208CHECK_DATE_pn-rxvt-unicode = "Sep 03, 2012" 1206CHECK_DATE_pn-rxvt-unicode = "Sep 03, 2012"
1209RECIPE_UPSTREAM_VERSION_pn-sat-solver = "0.0-git1+e74e0bfd23e4e95064d08e13efb5de9caf433f40"
1210RECIPE_UPSTREAM_DATE_pn-sato-icon-theme = "Nov 06, 2008" 1207RECIPE_UPSTREAM_DATE_pn-sato-icon-theme = "Nov 06, 2008"
1211RECIPE_UPSTREAM_VERSION_pn-sato-icon-theme = "0.4.1" 1208RECIPE_UPSTREAM_VERSION_pn-sato-icon-theme = "0.4.1"
1212CHECK_DATE_pn-sato-icon-theme = "Sep 03, 2012" 1209CHECK_DATE_pn-sato-icon-theme = "Sep 03, 2012"
@@ -1551,4 +1548,3 @@ CHECK_DATE_pn-zip = "Sep 04, 2012"
1551RECIPE_UPSTREAM_VERSION_pn-zlib = "1.2.7" 1548RECIPE_UPSTREAM_VERSION_pn-zlib = "1.2.7"
1552RECIPE_UPSTREAM_DATE_pn-zlib = "May 02, 2012" 1549RECIPE_UPSTREAM_DATE_pn-zlib = "May 02, 2012"
1553CHECK_DATE_pn-zlib = "Sep 04, 2012" 1550CHECK_DATE_pn-zlib = "Sep 04, 2012"
1554RECIPE_UPSTREAM_VERSION_pn-zypper = "git"