]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
FIX #159, #133 345/head
authorJóhann B. Guðmundsson <johannbg@gmail.com>
Thu, 20 Jun 2019 09:39:17 +0000 (09:39 +0000)
committerJóhann B. Guðmundsson <johannbg@gmail.com>
Thu, 20 Jun 2019 09:39:17 +0000 (09:39 +0000)
mkosi

diff --git a/mkosi b/mkosi
index 8f9087d345e1f916158c144dc59f0d9a17dfa418..a9c055759de4a689509a5867f0d566f5a17d70cc 100755 (executable)
--- a/mkosi
+++ b/mkosi
@@ -1902,9 +1902,15 @@ def install_opensuse(args: CommandLineArguments, workspace: str, do_run_build_sc
     if release.isdigit() or release == "tumbleweed":
         release_url = f"{args.mirror}/tumbleweed/repo/oss/"
         updates_url = f"{args.mirror}/update/tumbleweed/"
-    elif release.startswith("13."):
-        release_url = f"{args.mirror}/distribution/{release}/repo/oss/"
-        updates_url = f"{args.mirror}/update/{release}/"
+    elif release == "leap":
+        release_url = f"{args.mirror}/distribution/leap/15.1/repo/oss/"
+        updates_url = f"{args.mirror}/update/leap/15.1/oss/"
+    elif release == "current":
+        release_url = f"{args.mirror}/distribution/openSUSE-stable/repo/oss/"
+        updates_url = f"{args.mirror}/update/openSUSE-current/"
+    elif release == "stable":
+        release_url = f"{args.mirror}/distribution/openSUSE-stable/repo/oss/"
+        updates_url = f"{args.mirror}/update/openSUSE-stable/"
     else:
         release_url = f"{args.mirror}/distribution/leap/{release}/repo/oss/"
         updates_url = f"{args.mirror}/update/leap/{release}/oss/"
@@ -1927,7 +1933,11 @@ def install_opensuse(args: CommandLineArguments, workspace: str, do_run_build_sc
     #
     # Install the "minimal" package set.
     #
-    run(cmdline + ["patterns-base-minimal_base"], check=True)
+    if release.startswith("42."):
+        run(cmdline + ["patterns-openSUSE-minimal_base"], check=True)
+    else:
+        run(cmdline + ["patterns-base-minimal_base"], check=True)
+
 
     #
     # Now install the additional packages if necessary.