diff options
author | Ross Burton <ross.burton@intel.com> | 2016-11-04 20:17:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:19:53 +0000 |
commit | 4e6c5d87691ef96cb956b880c35f9a5bfeb7a309 (patch) | |
tree | 2d84ad1d44ac9024533ab656ac31f9d0ec989cb3 /meta | |
parent | 56037c731d1eee42062af9a3fae09853ce03176d (diff) | |
download | poky-4e6c5d87691ef96cb956b880c35f9a5bfeb7a309.tar.gz |
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 ]
(From OE-Core rev: 006c4db0974c42ff0f6950dd24e61c008f801679)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/distro_check.py | 16 |
1 files 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): | |||
43 | (name, version, release) = srpm.replace(".src.rpm", "").rsplit("-", 2) | 43 | (name, version, release) = srpm.replace(".src.rpm", "").rsplit("-", 2) |
44 | return name | 44 | return name |
45 | 45 | ||
46 | def get_latest_released_meego_source_package_list(d): | ||
47 | "Returns list of all the name os packages in the latest meego distro" | ||
48 | |||
49 | package_names = set() | ||
50 | with open("/tmp/Meego-1.1", "r") as f: | ||
51 | for line in f: | ||
52 | package_names.add(line.strip() + ":" + "main") | ||
53 | return "1.1", package_names | ||
54 | |||
55 | def get_source_package_list_from_url(url, section, d): | 46 | def get_source_package_list_from_url(url, section, d): |
56 | "Return a sectioned list of package names from a URL list" | 47 | "Return a sectioned list of package names from a URL list" |
57 | 48 | ||
@@ -99,6 +90,11 @@ def get_latest_released_mandriva_source_package_list(d): | |||
99 | 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) | 90 | 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) |
100 | return latest, package_names | 91 | return latest, package_names |
101 | 92 | ||
93 | def get_latest_released_clear_source_package_list(d): | ||
94 | latest = find_latest_numeric_release("https://download.clearlinux.org/releases/", d) | ||
95 | package_names = get_source_package_list_from_url("https://download.clearlinux.org/releases/%s/clear/source/SRPMS/" % latest, "main", d) | ||
96 | return latest, package_names | ||
97 | |||
102 | def find_latest_debian_release(url, d): | 98 | def find_latest_debian_release(url, d): |
103 | "Find the latest listed debian release on the given url" | 99 | "Find the latest listed debian release on the given url" |
104 | 100 | ||
@@ -167,7 +163,7 @@ def create_distro_packages_list(distro_check_dir, d): | |||
167 | ("Fedora", get_latest_released_fedora_source_package_list), | 163 | ("Fedora", get_latest_released_fedora_source_package_list), |
168 | ("OpenSuSE", get_latest_released_opensuse_source_package_list), | 164 | ("OpenSuSE", get_latest_released_opensuse_source_package_list), |
169 | ("Mandriva", get_latest_released_mandriva_source_package_list), | 165 | ("Mandriva", get_latest_released_mandriva_source_package_list), |
170 | ("Meego", get_latest_released_meego_source_package_list) | 166 | ("Clear", get_latest_released_clear_source_package_list), |
171 | ) | 167 | ) |
172 | 168 | ||
173 | for name, fetcher_func in per_distro_functions: | 169 | for name, fetcher_func in per_distro_functions: |