From 914e923d52314022b64ee792d60590489be318af Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 6 Oct 2014 15:47:39 -0500 Subject: Remove many obsolete distributions and add newer distributions instead This resolves Bug 1879 --- knetworkconf/backends/platform.pl.in | 170 ++++++++--------------------------- 1 file changed, 39 insertions(+), 131 deletions(-) (limited to 'knetworkconf') diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in index 0e60dcd..777dfec 100644 --- a/knetworkconf/backends/platform.pl.in +++ b/knetworkconf/backends/platform.pl.in @@ -38,43 +38,28 @@ require "$SCRIPTSDIR/xml.pl$DOTIN"; $PLATFORM_INFO = { - "debian-2.2" => "Debian GNU/Linux 2.2 Potato", - "debian-3.0" => "Debian GNU/Linux 3.0 Woody", - "debian-3.1" => "Debian GNU/Linux 3.1 Sarge", - "debian-4.0" => "Debian GNU/Linux 4.0 Etch", "debian-5.0" => "Debian GNU/Linux 5.0 Lenny", "debian-6.0" => "Debian GNU/Linux 6.0 Squeeze", "debian-7.0" => "Debian GNU/Linux 7.0 Wheezy", + "debian-8.0" => "Debian GNU/Linux 8.0 Jessie", "debian-testing" => "Debian GNU/Linux Testing/Unstable", - "ubuntu-5.04" => "Kubuntu 5.04, Hoary Hedgehog", - "ubuntu-5.10" => "Kubuntu 5.10, Breezy Badger", - "ubuntu-6.06" => "Kubuntu 6.06, Dapper Drake", - "ubuntu-6.10" => "Kubuntu 6.10, Edgy Eft", - "ubuntu-7.04" => "Kubuntu 7.04, Feisty Fawn", - "ubuntu-7.10" => "Kubuntu 7.10, Gutsy Gibbon", - "ubuntu-8.04" => "Kubuntu 8.04, Hardy Heron", - "ubuntu-8.10" => "Kubuntu 8.10, Intrepid Ibex", - "ubuntu-9.04" => "Kubuntu 9.04, Jaunty Jackalope", - "ubuntu-9.10" => "Kubuntu 9.10, Karmic Koala", - "ubuntu-10.04" => "Kubuntu 10.04, Lucid Lynx", - "ubuntu-10.10" => "Kubuntu 10.10, Maverick Meerkat", - "ubuntu-11.04" => "Kubuntu 11.04, Natty Narwhal", - "ubuntu-11.10" => "Kubuntu 11.10, Oneiric Ocelot", - "ubuntu-12.04" => "Kubuntu 12.04, Precise Pangolin", - "ubuntu-12.10" => "Kubuntu 12.10, Quantal Quetzal", - "ubuntu-13.04" => "Kubuntu 13.04, Raring Ringtail", - "redhat-5.2" => "Red Hat Linux 5.2 Apollo", - "redhat-6.0" => "Red Hat Linux 6.0 Hedwig", - "redhat-6.1" => "Red Hat Linux 6.1 Cartman", - "redhat-6.2" => "Red Hat Linux 6.2 Zoot", - "redhat-7.0" => "Red Hat Linux 7.0 Guinness", - "redhat-7.1" => "Red Hat Linux 7.1 Seawolf", - "redhat-7.2" => "Red Hat Linux 7.2 Enigma", - "redhat-7.3" => "Red Hat Linux 7.3 Valhalla", - "redhat-8.0" => "Red Hat Linux 8.0 Psyche", - "redhat-9" => "Red Hat Linux 9.0 Shrike", + "ubuntu-8.04" => "Ubuntu 8.04, Hardy Heron", + "ubuntu-8.10" => "Ubuntu 8.10, Intrepid Ibex", + "ubuntu-9.04" => "Ubuntu 9.04, Jaunty Jackalope", + "ubuntu-9.10" => "Ubuntu 9.10, Karmic Koala", + "ubuntu-10.04" => "Ubuntu 10.04, Lucid Lynx", + "ubuntu-10.10" => "Ubuntu 10.10, Maverick Meerkat", + "ubuntu-11.04" => "Ubuntu 11.04, Natty Narwhal", + "ubuntu-11.10" => "Ubuntu 11.10, Oneiric Ocelot", + "ubuntu-12.04" => "Ubuntu 12.04, Precise Pangolin", + "ubuntu-12.10" => "Ubuntu 12.10, Quantal Quetzal", + "ubuntu-13.04" => "Ubuntu 13.04, Raring Ringtail", + "ubuntu-13.10" => "Ubuntu 13.10, Saucy Salamander", + "ubuntu-14.04" => "Ubuntu 14.04, Trusty Tahr", + "ubuntu-14.10" => "Ubuntu 14.10, Utopic Unicorn", "rhel-5" => "Enterprise Linux 5", "rhel-6" => "Enterprise Linux 6", + "rhel-7" => "Enterprise Linux 7", "openna-1.0" => "OpenNA Linux 1.0 VSLC", "mandrake-7.1" => "Linux Mandrake 7.1", "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey", @@ -89,25 +74,17 @@ $PLATFORM_INFO = { "mandriva-2006.1" => "Mandriva Linux 2006.1", "mandriva-2007.0" => "Mandriva Linux 2007.0", "mandriva-2007.1" => "Mandriva Linux 2007.1", - "yoper-2.2" => "Yoper Linux 2.2", - "blackpanther-4.0" => "Black Panther OS 4.0", - "conectiva-9" => "Conectiva Linux 9", - "conectiva-10" => "Conectiva Linux 10", - "suse-7.0" => "SuSE Linux 7.0", - "suse-9.0" => "SuSE Linux 9.0", - "suse-9.1" => "SuSE Linux 9.1", + "suse-10.0" => "SuSE Linux 10.0", + "suse-10.1" => "SuSE Linux 10.1", + "suse-10.2" => "SuSE Linux 10.2", + "suse-10.3" => "SuSE Linux 10.3", + "suse-10.4" => "SuSE Linux 10.4", + "suse-10.0" => "SuSE Linux 10.0", + "suse-11.0" => "SuSE Linux 11.0", + "suse-11.1" => "SuSE Linux 11.1", + "suse-11.2" => "SuSE Linux 11.2", + "suse-11.3" => "SuSE Linux 11.3", "turbolinux-7.0" => "Turbolinux 7.0", - "slackware-8.0.0" => "Slackware 8.0.0", - "slackware-8.1" => "Slackware 8.1", - "slackware-9.0.0" => "Slackware 9.0.0", - "slackware-9.1.0" => "Slackware 9.1.0", - "slackware-10.0.0" => "Slackware 10.0.0", - "slackware-10.1.0" => "Slackware 10.1.0", - "slackware-10.2.0" => "Slackware 10.2.0", - "slackware-11.0.0" => "Slackware 11.0.0", - "slackware-12.0.0" => "Slackware 12.0.0", - "slackware-12.1.0" => "Slackware 12.1.0", - "slackware-12.2.0" => "Slackware 12.2.0", "slackware-13.0.0" => "Slackware 13.0.0", "slackware-13.1.0" => "Slackware 13.1.0", "slackware-13.37.0" => "Slackware 13.37.0", @@ -116,22 +93,25 @@ $PLATFORM_INFO = { "freebsd-4" => "FreeBSD 4", "freebsd-5" => "FreeBSD 5", "freebsd-6" => "FreeBSD 6", + "freebsd-7" => "FreeBSD 7", + "freebsd-8" => "FreeBSD 8", + "freebsd-9" => "FreeBSD 9", + "freebsd-10" => "FreeBSD 10", "gentoo" => "Gentoo Linux", - "vlos-1.2" => "Vida Linux OS 1.2", "archlinux" => "Arch Linux", "pld-1.0" => "PLD 1.0 Ra", "pld-1.1" => "PLD 1.1 Ra", - "pld-1.99" => "PLD 1.99 Ac-pre", + "pld-2.0" => "PLD 2.0 Ac", + "pld-3.0" => "PLD 3.0 Th", "vine-3.0" => "Vine Linux 3.0", "vine-3.1" => "Vine Linux 3.1", - "fedora-1" => "Fedora Core 1 (Yarrow)", - "fedora-2" => "Fedora Core 2 (Tettnang)", - "fedora-3" => "Fedora Core 3 (Heidelberg)", - "fedora-4" => "Fedora Core 4 (Stentz)", - "fedora-5" => "Fedora Core 5 (Bordeaux)", "fedora-15" => "Fedora 15 (LoveLock)", "fedora-16" => "Fedora 16 (Verne)", "fedora-17" => "Fedora 17 (Beefy Miracle)", + "fedora-18" => "Fedora 18 (Spherical Cow)", + "fedora-19" => "Fedora 19 (Schrödinger's Cat)", + "fedora-20" => "Fedora 20 (Heisenbug)", + "fedora-21" => "Fedora 21", "rpath" => "rPath Linux", "ark" => "Ark Linux", }; @@ -144,9 +124,7 @@ sub check_lsb my %distmap = ("Debian" => "debian"), - ("Mandrake" => "mandrake"), - ("Conectiva" => "conectiva"), - ("Blackpanther" => "blackpanther"); + ("Mandrake" => "mandrake"); # gst_prefix not required here: parse already does that for us. $dist = lc (&gst_parse_sh ("/etc/lsb-release", "DISTRIB_ID")); @@ -314,57 +292,6 @@ sub check_mandriva return -1; } -sub check_yoper -{ - open YOPER, "$gst_prefix/etc/yoper-release" or return -1; - while () - { - $ver = $_; - chomp ($ver); - if ($ver =~ m/Yoper (\S+)/) - { - close YOPER; - # find the first digit of our release - $mystring= ~m/(\d)/; - #store it in $fdigit - $fdigit= $1; - # the end of the release is marked with -2 so find the - - $end = index($ver,"-"); - $start = index($ver,$fdigit); - # extract the substring into $newver - $newver= substr($ver,$start,$end-$start); - print $newver; - return "yoper-$newver"; - } - } - close YOPER; - return -1; -} - -sub check_blackpanther -{ - open BLACKPANTHER, "$gst_prefix/etc/blackPanther-release" or return -1; - - while () - { - $ver = $_; - chomp ($ver); - if ($ver =~ /^Linux Black Panther release (\S+)/) - { - close BLACKPANTHER; - return "blackPanther-$1"; - } - elsif ($ver =~ /^Black Panther ( L|l)inux release ([\d\.]+)/i) - { - close BLACKPANTHER; - return "blackPanther-$2"; - } - } - - close BLACKPANTHER; - return -1; -} - sub check_fedora { open FEDORA, "$gst_prefix/etc/fedora-release" or return -1; @@ -412,25 +339,6 @@ sub check_rpath return -1; } -sub check_conectiva -{ - open RELEASE, "$gst_prefix/etc/conectiva-release" or return -1; - - while () - { - chomp; - - if (/^Conectiva Linux (\S+)/) - { - close RELEASE; - return "conectiva-$1"; - } - } - - close RELEASE; - return -1; -} - sub check_turbolinux { open RELEASE, "$gst_prefix/etc/turbolinux-release" or return -1; @@ -616,8 +524,8 @@ sub gst_platform_guess my %check = ( # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther - "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine, - \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna, + "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_vine, + \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna, \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ], "FreeBSD" => [ \&check_freebsd ], "SunOS" => [ \&check_solaris ] -- cgit v1.2.1