Merge pull request #46 from cfconrad/pr_update_master

Update latest upstream/master 3953469

.gitignore

@@ -1,2 +1,3 @@
 .log/
 .yardoc/
+.vscode/tasks.json

.yupdate.post

@@ -25,8 +25,8 @@ function restart_service() {
 
   if [ -n "$SERVICE_START" ]; then
     SERVICE_START_UNIX_TIME=$(date -d "$SERVICE_START" +"%s")
-    # find the date of the latest file in the gem
-    NEWEST_FILE_TIME=$(find /usr/lib*/ruby/gems/*/gems/$SERVICE_NAME-* -exec stat --format %Y "{}" \; | sort -nr | head -n 1)
+    # find the date of the latest file in the product configuration or in the gem
+    NEWEST_FILE_TIME=$(find /usr/share/agama/products.d /usr/lib*/ruby/gems/*/gems/$SERVICE_NAME-* -exec stat --format %Y "{}" \; | sort -nr | head -n 1)
 
     # when a file is newer than the start time then restart the service
     if [ -n "$NEWEST_FILE_TIME" ] && [ "$SERVICE_START_UNIX_TIME" -lt "$NEWEST_FILE_TIME" ]; then

Rakefile

@@ -170,5 +170,21 @@ if ENV["YUPDATE_FORCE"] == "1" || File.exist?("/.packages.initrd") || live_iso?
       FileUtils.mkdir_p(File.join(destdir, "/usr/share"))
       FileUtils.cp_r("playwright/.", File.join(destdir, "/usr/share/agama-playwright"))
     end
+
+    if ENV["YUPDATE_SKIP_PRODUCTS"] != "1"
+      files = Dir.glob("products.d/*.y{a}ml")
+      files.each do |f|
+        # the sources contain several products, update only the existing files
+        oldfile = File.join("/usr/share/agama/", f)
+        if File.exist?(oldfile)
+          target = File.join(destdir, "/usr/share/agama/", f)
+          FileUtils.mkdir_p(File.dirname(target))
+          FileUtils.cp(f, target)
+        else
+          # if there is a new product file it needs to be copied manually
+          puts "Skipping product file: #{f}"
+        end
+      end
+    end
   end
 end

doc/dbus/bus/org.opensuse.Agama1.Locale.bus.xml

@@ -38,39 +38,47 @@
   </interface>
   <interface name="org.opensuse.Agama1.Locale">
     <!--
-     Get labels for locales. The first pair is english language and territory
-     and second one is localized one to target language from locale.
+     Gets the supported locales information.
+
+     Each element of the list has these parts:
+
+     * The locale code (e.g., "es_ES.UTF-8").
+     * The name of the language according to the language defined by the
+       UILocale property.
+     * The name of the territory according to the language defined by the
+       UILocale property.
      -->
-    <method name="LabelsForLocales">
-      <arg type="a((ss)(ss))" direction="out"/>
+    <method name="ListLocales">
+      <arg type="a(sss)" direction="out"/>
     </method>
     <!--
-     Gets list of locales available on system.
+     Returns a list of the supported keymaps.
 
-     # Examples
+     Each element of the list contains:
 
-     ```
-       use agama_dbus_server::locale::Locale;
-       let locale = Locale::new();
-       assert!(locale.list_ui_locales().unwrap().len() > 0);
-     ```
+     * The keymap identifier (e.g., "es" or "es(ast)").
+     * The name of the keyboard in language set by the UILocale property.
      -->
-    <method name="ListUILocales">
-      <arg type="as" direction="out"/>
-    </method>
-    <method name="ListVConsoleKeyboards">
-      <arg type="as" direction="out"/>
+    <method name="ListKeymaps">
+      <arg type="a(ss)" direction="out"/>
     </method>
+    <!--
+     Returns a list of the supported timezones.
+
+     Each element of the list contains:
+
+     * The timezone identifier (e.g., "Europe/Berlin").
+     * A list containing each part of the name in the language set by the
+       UILocale property.
+     -->
     <method name="ListTimezones">
-      <arg name="locale" type="s" direction="in"/>
-      <arg type="a(ss)" direction="out"/>
+      <arg type="a(sas)" direction="out"/>
     </method>
     <method name="Commit">
     </method>
+    <property name="Keymap" type="s" access="readwrite"/>
     <property name="Locales" type="as" access="readwrite"/>
-    <property name="SupportedLocales" type="as" access="readwrite"/>
     <property name="Timezone" type="s" access="readwrite"/>
     <property name="UILocale" type="s" access="readwrite"/>
-    <property name="VConsoleKeyboard" type="s" access="readwrite"/>
   </interface>
 </node>

doc/dbus/org.opensuse.Agama1.Locale.doc.xml

@@ -1,47 +1,48 @@
-
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <node>
-  <!--
-      org.opensuse.Agama1.Locale:
-
-      Implementation note about language identifiers:
-
-      Maybe use <ulink url="https://www.rubydoc.info/github/yast/yast-packager/master/LanguageTag">yast2-packager/LanguageTag</ulink>.
-      See <ulink url="https://lists.opensuse.org/archives/list/yast-devel&commat;lists.opensuse.org/message/D52PSZ7TRID2RVM6CE6K2C2RUNNGOS6Z/">its announcement on yast-devel</ulink>.
-      See also <ulink url="https://tools.ietf.org/html/rfc4647">RFC 4647 Matching of Language Tags</ulink>.
-  -->
   <interface name="org.opensuse.Agama1.Locale">
     <!--
-     Get labels for locales. The first pair is english language and territory
-     and second one is localized one to target language from locale.
+     Gets the supported locales information.
+
+     Each element of the list has these parts:
+
+     * The locale code (e.g., "es_ES.UTF-8").
+     * The name of the language according to the language defined by the
+       UILocale property.
+     * The name of the territory according to the language defined by the
+       UILocale property.
      -->
-    <method name="LabelsForLocales">
-      <arg type="a((ss)(ss))" direction="out"/>
+    <method name="ListLocales">
+      <arg type="a(sss)" direction="out"/>
     </method>
     <!--
-     Gets list of locales available on system.
+     Returns a list of the supported keymaps.
+
+     Each element of the list contains:
+
+     * The keymap identifier (e.g., "es" or "es(ast)").
+     * The name of the keyboard in language set by the UILocale property.
      -->
-    <method name="ListUILocales">
-      <arg type="as" direction="out"/>
-    </method>
-    <method name="ListVConsoleKeyboards">
-      <arg type="as" direction="out"/>
+    <method name="ListKeymaps">
+      <arg type="a(ss)" direction="out"/>
     </method>
+    <!--
+     Returns a list of the supported timezones.
+
+     Each element of the list contains:
+
+     * The timezone identifier (e.g., "Europe/Berlin").
+     * A list containing each part of the name in the language set by the
+       UILocale property.
+     -->
     <method name="ListTimezones">
-      <arg name="locale" type="s" direction="in"/>
-      <arg type="a(ss)" direction="out"/>
+      <arg type="a(sas)" direction="out"/>
     </method>
     <method name="Commit">
     </method>
+    <property name="Keymap" type="s" access="readwrite"/>
     <property name="Locales" type="as" access="readwrite"/>
-    <property name="SupportedLocales" type="as" access="readwrite"/>
     <property name="Timezone" type="s" access="readwrite"/>
-    <!--
-     Property that controls in which localization human string from backend will come.
-     -->
     <property name="UILocale" type="s" access="readwrite"/>
-    <property name="VConsoleKeyboard" type="s" access="readwrite"/>
   </interface>
 </node>
-

doc/yaml_config.md

@@ -38,6 +38,15 @@ Array of patterns that have to be selected.
 
 Array of patterns that should be selected but can be deselected or skipped if not available.
 
+#### user\_patterns
+
+Array of patterns that are displayed in the pattern selector UI and user can
+select them to install.
+
+If the list is empty then the pattern selector is not displayed. If the key is
+not defined or the value is missing or is `null` then all available user visible
+patterns are displayed.
+
 ### security
 
 Options related to security

products.d/ALP-Dolomite.yaml

@@ -14,12 +14,17 @@ translations:
     cs: SUSE ALP Dolomite je minimální neměnitelný základní OS, zaměřený na
       bezpečnost pro poskytování úplného minima ke spuštění úloh a služeb v
       kontejnerech nebo virtuálních strojích.
+    sv: SUSE ALP Dolomite är en minimal oföränderlig OS-kärna, fokuserad på säkerhet
+      för att tillhandahålla det absoluta minimum för att köra
+      arbetsbelastningar och tjänster som behållare eller virtuella maskiner.
 software:
   mandatory_patterns:
     - alp_base_zypper
     - alp_cockpit
     - alp_hardware
   optional_patterns: null # no optional pattern shared
+  # no user selectable patterns, do not display the pattern selector
+  user_patterns: []
   mandatory_packages:
     - package: ppc64-diag # Needed for hardware-based installations
       archs: ppc64

products.d/agama-products-opensuse.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  4 14:11:51 UTC 2023 - Ancor Gonzalez Sosa <[email protected]>
+
+- Preliminary definitions of openSUSE MicroOS products
+- Remove Leap 16.0 for now
+
 -------------------------------------------------------------------
 Mon Oct 30 14:38:51 UTC 2023 - Josef Reidinger <[email protected]>
 

products.d/agama-products-opensuse.spec

@@ -52,8 +52,9 @@ install -m 0644 *.yaml %{buildroot}%{_datadir}/agama/products.d
 %files
 %dir %{_datadir}/agama
 %dir %{_datadir}/agama/products.d
+%{_datadir}/agama/products.d/microos.yaml
+%{_datadir}/agama/products.d/microos-desktop.yaml
 %{_datadir}/agama/products.d/tumbleweed.yaml
-%{_datadir}/agama/products.d/leap16.yaml
 
 %files -n agama-products-ALP-Dolomite
 %dir %{_datadir}/agama