Remove zypper from distro tracking files

We no longer have zypper/libzypp/sat-solver, so remove references to
them.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 2f56d44511ddba31b466036fb78a254add71afd1..c88f15d865fbee417c1a07bcb5cc086e6a2b1901 100644 (file)
--- 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
 DISTRO_PN_ALIAS_pn-libxsettings-client = "Debian=libxsettings-client0 Ubuntu=libxsettings-client0 Mandriva=libXsettings-client0"
 DISTRO_PN_ALIAS_pn-libxtrap = "Debian=libxtrap6 Fedora=libXTrap"
 DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc"
-DISTRO_PN_ALIAS_pn-libzypp = "OpenSuse=libzypp Meego=libzypp"
 DISTRO_PN_ALIAS_pn-linux-dummy = "Intel"
 DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers"
 DISTRO_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"
 DISTRO_PN_ALIAS_pn-run-postinsts = "OE-Core"
 DISTRO_PN_ALIAS_pn-sato-icon-theme = "OpenedHand"
 DISTRO_PN_ALIAS_pn-sato-screenshot = "OpenedHand"
-DISTRO_PN_ALIAS_pn-sat-solver = "OSPDT OpenSuSE=satsolver-tools"
 DISTRO_PN_ALIAS_pn-screenshot = "OpenedHand"
 DISTRO_PN_ALIAS_pn-scrnsaverproto = "Meego=xorg-x11-proto-scrnsaverproto Ubuntu=x11proto-scrnsaver-dev Debian=x11proto-scrnsaver-dev"
 DISTRO_PN_ALIAS_pn-settings-daemon = "OpenedHand"
@@ -452,4 +450,3 @@ DISTRO_PN_ALIAS_pn-xwininfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils"
 DISTRO_PN_ALIAS_pn-yaffs2-utils = "OSPDT upstream=http://www.yaffs.net"
 DISTRO_PN_ALIAS_pn-zaurusd = "OpenedHand"
 DISTRO_PN_ALIAS_pn-zeroconf = "OSPDT upstream=http://www.progsoc.org/~wildfire/zeroconf/"
-DISTRO_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 83e520258b032684373a332a06335e751bc83f55..3069f72254505e9f793bc6a9b8c8cc612a3bfcef 100644 (file)
--- 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>"
 RECIPE_MAINTAINER_pn-libxxf86dga = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-libxxf86misc = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-libxxf86vm = "Constantin Musca <constantinx.musca@intel.com>"
-RECIPE_MAINTAINER_pn-libzypp = "Mark Hatle <mark.hatle@windriver.com>"
 RECIPE_MAINTAINER_pn-lighttpd = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-linuxdoc-tools = "Andrei Dinu <andrei.adrianx.dinu@intel.com>"
 RECIPE_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>"
 RECIPE_MAINTAINER_pn-rxvt-unicode = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-sato-icon-theme = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-sato-screenshot = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MAINTAINER_pn-sat-solver = "Mark Hatle <mark.hatle@windriver.com>"
 RECIPE_MAINTAINER_pn-screenshot = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-screen = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-scrnsaverproto = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
@@ -878,4 +876,3 @@ RECIPE_MAINTAINER_pn-zaurusd = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-zeroconf = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-zip = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-zlib = "Radu Moisan <radu.moisan@intel.com>"
-RECIPE_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 f61250aa41d34a11b0a5ee4260436b92ba555513..757e86fe08c8732ad213d5ffeb605826af8190b5 100644 (file)
--- 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"
 RECIPE_COLOR_pn-libxvmc = "yellow"
 RECIPE_COLOR_pn-libxxf86misc = "yellow"
 RECIPE_COLOR_pn-libxxf86vm = "yellow"
-RECIPE_COLOR_pn-libzypp = "yellow"
 RECIPE_COLOR_pn-lighttpd = "yellow"
 RECIPE_COLOR_pn-linuxdoc-tools = "yellow"
 RECIPE_COLOR_pn-loudmouth = "red"
@@ -446,4 +445,3 @@ RECIPE_COLOR_pn-yaffs2-utils = "red"
 RECIPE_COLOR_pn-zeroconf = "red"
 RECIPE_COLOR_pn-zip = "yellow"
 RECIPE_COLOR_pn-zlib = "yellow"
-RECIPE_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 28cb38724a04df6403b2169e1edbd2cf75699a60..06f0cc88d831b3844a1f959dc342644e666ce201 100644 (file)
--- 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"
 RECIPE_UPSTREAM_VERSION_pn-libxxf86vm = "1.1.2"
 RECIPE_UPSTREAM_DATE_pn-libxxf86vm = "Mar 08, 2012"
 CHECK_DATE_pn-libxxf86vm = "Aug 31, 2012"
-RECIPE_UPSTREAM_VERSION_pn-libzypp = "git"
-CHECK_DATE_pn-libzypp = "Aug 31, 2012"
 RECIPE_UPSTREAM_VERSION_pn-lighttpd = "1.4.31"
 RECIPE_UPSTREAM_DATE_pn-lighttpd = "May 31, 2012"
 CHECK_DATE_pn-lighttpd = "Aug 31, 2012"
@@ -1206,7 +1204,6 @@ RECIPE_UPSTREAM_VERSION_pn-run-postinsts = "check"
 RECIPE_UPSTREAM_DATE_pn-rxvt-unicode = "Jan 21, 2012"
 RECIPE_UPSTREAM_VERSION_pn-rxvt-unicode = "9.15"
 CHECK_DATE_pn-rxvt-unicode = "Sep 03, 2012"
-RECIPE_UPSTREAM_VERSION_pn-sat-solver = "0.0-git1+e74e0bfd23e4e95064d08e13efb5de9caf433f40"
 RECIPE_UPSTREAM_DATE_pn-sato-icon-theme = "Nov 06, 2008"
 RECIPE_UPSTREAM_VERSION_pn-sato-icon-theme = "0.4.1"
 CHECK_DATE_pn-sato-icon-theme = "Sep 03, 2012"
@@ -1551,4 +1548,3 @@ CHECK_DATE_pn-zip = "Sep 04, 2012"
 RECIPE_UPSTREAM_VERSION_pn-zlib = "1.2.7"
 RECIPE_UPSTREAM_DATE_pn-zlib = "May 02, 2012"
 CHECK_DATE_pn-zlib = "Sep 04, 2012"
-RECIPE_UPSTREAM_VERSION_pn-zypper = "git"