From 2159728da8c54a5afb1e73aca97660aaa8815b7b Mon Sep 17 00:00:00 2001
From: Stefan Hundhammer <shundhammer@suse.de>
Date: Mon, 8 Jul 2024 14:09:35 +0200
Subject: [PATCH 1/3] Disable installer self-update for QR media (bsc#1227503)

---
 Rakefile                   |  6 ++++++
 control/control.leanos.xml | 23 +++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index dd45ea8..a7a9003 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,6 +3,12 @@ require "yast/rake"
 Yast::Tasks.submit_to :sle15sp6
 
 Yast::Tasks.configuration do |conf|
+  # submit to the specific QR project, not to standard SP6
+  conf.obs_api = "https://api.suse.de"
+  conf.obs_target = "SUSE_SLE-15-SP6_Update_QR"
+  conf.obs_sr_project = "SUSE:SLE-15-SP6:Update:QR"
+  conf.obs_project = "Devel:YaST:SLE-15-SP6-QR"
+
   # lets ignore license check for now
   conf.skip_license_check << /.*/
 end
diff --git a/control/control.leanos.xml b/control/control.leanos.xml
index fe155b8..797b699 100644
--- a/control/control.leanos.xml
+++ b/control/control.leanos.xml
@@ -74,12 +74,15 @@ textdomain="control"
             </service>
         </services_proposal>
 
+        <!-- Note: the self update step ("update_installer") is disabled
+             for quarterly media respins, the data below would be ignored anyway. -->
+
         <!-- self-update URL -->
         <!-- $os_release_version will be replaced by VERSION defined in /etc/os-release file (inst-sys). -->
         <!-- $arch will be replaced by the machine architecture. -->
-        <self_update_url>https://installer-updates.suse.com/SUSE/Updates/SLE-INSTALLER/$os_release_version/$arch/update</self_update_url>
+        <!-- <self_update_url>https://installer-updates.suse.com/SUSE/Updates/SLE-INSTALLER/$os_release_version/$arch/update</self_update_url> -->
         <!-- self-update ID. SCC recognize for SLE15 ID SLES -->
-        <self_update_id>SLES</self_update_id>
+        <!-- <self_update_id>SLES</self_update_id> -->
 
         <!-- Information about required media if the user has skipped the registration -->
         <!-- $os_release_version will be replaced by VERSION defined in /etc/os-release file (inst-sys). -->
@@ -521,10 +524,14 @@ Please visit us at http://www.suse.com/.
                     <name>setup_dhcp</name>
                 </module>
                 <!-- As soon as possible but after network is initialized -->
+                <!-- Disabled for quarterly media respins, there is in an updated inst-sys
+                     which might contain newer packages than the self update repository -->
+                <!--
                 <module>
                     <label>Installer Update</label>
                     <name>update_installer</name>
                 </module>
+                -->
                 <module>
                     <name>complex_welcome</name>
                     <label>Welcome</label>
@@ -593,10 +600,14 @@ Please visit us at http://www.suse.com/.
                     <name>setup_dhcp</name>
                 </module>
                 <!-- As soon as possible but after network is initialized -->
+                <!-- Disabled for quarterly media respins, there is in an updated inst-sys
+                     which might contain newer packages than the self update repository -->
+                <!--
                 <module>
                     <label>Installer Update</label>
                     <name>update_installer</name>
                 </module>
+                -->
                 <module>
                     <name>complex_welcome</name>
                     <label>Welcome</label>
@@ -716,12 +727,16 @@ Please visit us at http://www.suse.com/.
                     <name>install_inf</name>
                 </module>
                 <!-- As soon as possible -->
+                <!-- Disabled for quarterly media respins, there is in an updated inst-sys
+                     which might contain newer packages than the self update repository -->
+                <!--
                 <module>
                     <label>Installer Update</label>
                     <name>update_installer</name>
                     <enable_back>no</enable_back>
                     <enable_next>yes</enable_next>
                 </module>
+                -->
                 <!-- bsc#1047060: Module used only to display a beta warning in case README.BETA
                 file exists. Other than that, the module is completely skipped in auto mode -->
                 <module>
@@ -756,12 +771,16 @@ Please visit us at http://www.suse.com/.
             <stage>initial</stage>
             <modules config:type="list">
                 <!-- As soon as possible -->
+                <!-- Disabled for quarterly media respins, there is in an updated inst-sys
+                     which might contain newer packages than the self update repository -->
+                <!--
                 <module>
                     <label>Installer Update</label>
                     <name>update_installer</name>
                     <enable_back>no</enable_back>
                     <enable_next>yes</enable_next>
                 </module>
+                -->
                 <!-- bsc#1047060: Module used only to display a beta warning in case README.BETA
                 file exists. Other than that, the module is completely skipped in auto mode -->
                 <module>

From 235ec9744059c809ae2b1cd175770a4c802c83f8 Mon Sep 17 00:00:00 2001
From: Stefan Hundhammer <shundhammer@suse.de>
Date: Mon, 8 Jul 2024 14:11:45 +0200
Subject: [PATCH 2/3] Version bump and change log

---
 package/skelcd-control-leanos.changes | 6 ++++++
 package/skelcd-control-leanos.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/skelcd-control-leanos.changes b/package/skelcd-control-leanos.changes
index 8949dd2..384dbc2 100644
--- a/package/skelcd-control-leanos.changes
+++ b/package/skelcd-control-leanos.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  8 12:10:36 UTC 2024 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Disable installer self-update for QR media
+- 15.6.4.1
+
 -------------------------------------------------------------------
 Wed Mar 13 13:39:00 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
 
diff --git a/package/skelcd-control-leanos.spec b/package/skelcd-control-leanos.spec
index 769889a..c243a33 100644
--- a/package/skelcd-control-leanos.spec
+++ b/package/skelcd-control-leanos.spec
@@ -100,7 +100,7 @@ Requires:       sap-installation-wizard
 
 URL:            https://github.com/yast/skelcd-control-leanos
 AutoReqProv:    off
-Version:        15.6.4
+Version:        15.6.4.1
 Release:        0
 Summary:        Leanos control file needed for installation
 License:        MIT

From 8f6e4ee338b692569a8fa3c3fbb00c9cd47a9f4d Mon Sep 17 00:00:00 2001
From: Stefan Hundhammer <shundhammer@suse.de>
Date: Mon, 8 Jul 2024 15:17:32 +0200
Subject: [PATCH 3/3] Added bug # in change log

---
 package/skelcd-control-leanos.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/skelcd-control-leanos.changes b/package/skelcd-control-leanos.changes
index 384dbc2..ff7012c 100644
--- a/package/skelcd-control-leanos.changes
+++ b/package/skelcd-control-leanos.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon Jul  8 12:10:36 UTC 2024 - Stefan Hundhammer <shundhammer@suse.com>
 
-- Disable installer self-update for QR media
+- Disable installer self-update for QR media (bsc#1227503)
 - 15.6.4.1
 
 -------------------------------------------------------------------