From 006c4db0974c42ff0f6950dd24e61c008f801679 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 4 Nov 2016 20:17:38 +0000 Subject: distro_check: MeeGo is long dead, compare against Clear Linux instead Instead of checking against a file that represents a distribution that hasn't existed for years, fetch package names for Clear Linux instead. [ YOCTO #10601 ] Signed-off-by: Ross Burton --- meta/lib/oe/distro_check.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py index 00c827e92c..c666ddc257 100644 --- a/meta/lib/oe/distro_check.py +++ b/meta/lib/oe/distro_check.py @@ -43,15 +43,6 @@ def package_name_from_srpm(srpm): (name, version, release) = srpm.replace(".src.rpm", "").rsplit("-", 2) return name -def get_latest_released_meego_source_package_list(d): - "Returns list of all the name os packages in the latest meego distro" - - package_names = set() - with open("/tmp/Meego-1.1", "r") as f: - for line in f: - package_names.add(line.strip() + ":" + "main") - return "1.1", package_names - def get_source_package_list_from_url(url, section, d): "Return a sectioned list of package names from a URL list" @@ -99,6 +90,11 @@ def get_latest_released_mandriva_source_package_list(d): package_names |= get_source_package_list_from_url("http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/%s/SRPMS/main/updates/" % latest, "updates", d) return latest, package_names +def get_latest_released_clear_source_package_list(d): + latest = find_latest_numeric_release("https://download.clearlinux.org/releases/", d) + package_names = get_source_package_list_from_url("https://download.clearlinux.org/releases/%s/clear/source/SRPMS/" % latest, "main", d) + return latest, package_names + def find_latest_debian_release(url, d): "Find the latest listed debian release on the given url" @@ -167,7 +163,7 @@ def create_distro_packages_list(distro_check_dir, d): ("Fedora", get_latest_released_fedora_source_package_list), ("OpenSuSE", get_latest_released_opensuse_source_package_list), ("Mandriva", get_latest_released_mandriva_source_package_list), - ("Meego", get_latest_released_meego_source_package_list) + ("Clear", get_latest_released_clear_source_package_list), ) for name, fetcher_func in per_distro_functions: -- cgit 1.2.3-korg