From 357cb104623904969d27ee9c7691d3c91dc0fffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 3 Mar 2023 15:53:07 +0100 Subject: [PATCH 01/10] Revert "Adapt files for the SLE-15-SP5 branch" This reverts commit 8bbe15b636c6c3462b32d7474990e905df7494eb. --- .github/workflows/ci.yml | 22 +++++++++++++++++----- Rakefile | 2 -- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 694c1349a..893e3b41c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,11 @@ jobs: strategy: fail-fast: false + matrix: + distro: [ "tumbleweed", "leap_latest" ] container: - image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby + image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: @@ -35,6 +37,8 @@ jobs: # send the coverage report to coveralls.io - name: Coveralls Report + # send it only from the TW build to avoid duplicate submits + if: ${{ matrix.distro == 'tumbleweed' }} uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -44,9 +48,11 @@ jobs: strategy: fail-fast: false + matrix: + distro: [ "leap_latest" ] container: - image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby + image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: @@ -61,9 +67,11 @@ jobs: strategy: fail-fast: false + matrix: + distro: [ "tumbleweed", "leap_latest" ] container: - image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby + image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: @@ -81,9 +89,11 @@ jobs: strategy: fail-fast: false + matrix: + distro: [ "leap_latest" ] container: - image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby + image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: @@ -100,9 +110,11 @@ jobs: strategy: fail-fast: false + matrix: + distro: [ "leap_latest" ] container: - image: registry.opensuse.org/yast/sle-15/sp5/containers/yast-ruby + image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: diff --git a/Rakefile b/Rakefile index 87bac5b87..546f654fd 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,4 @@ require "yast/rake" - -Yast::Tasks.submit_to :sle15sp5 require "find" require "English" From bf6150dcb5f8ddd3fab17f6e3fd6abca0746cbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 3 Mar 2023 15:53:10 +0100 Subject: [PATCH 02/10] Bump version to 4.6.0 --- package/yast2-installation.changes | 5 +++++ package/yast2-installation.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index f91b5975a..fd550dcc4 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák + +- Bump version to 4.6.0 (bsc#1208913) + ------------------------------------------------------------------- Wed Jan 25 19:56:12 UTC 2023 - Knut Anderssen diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 8f8390026..f33fe7a94 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.5.15 +Version: 4.6.0 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only From 9e7c6aabe6e2a96d0b50a3bea388c9723f5ab842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Mon, 3 Apr 2023 14:11:03 +0200 Subject: [PATCH 03/10] yupdate - improved Live ISO detection, added "--force" option - related to bsc#1206927 - 4.6.2 --- bin/yupdate | 21 +++++++++++++++++---- package/yast2-installation.changes | 7 +++++++ package/yast2-installation.spec | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/bin/yupdate b/bin/yupdate index 47d35e41d..8390516fe 100755 --- a/bin/yupdate +++ b/bin/yupdate @@ -584,14 +584,20 @@ module YUpdate # the inst-sys contains the /.packages.initrd file with a list of packages return if File.exist?("/.packages.initrd") - # live medium uses overlay FS for the root - return if `mount`.match?(/^\w+ on \/ type overlay/) + mount_out = `mount` + # live medium uses overlay FS or device mapper for the root + if mount_out.match?(/^\w+ on \/ type overlay/) || + mount_out.match?(/^\/dev\/mapper\/live-rw on \/ /) + + return + end return if in_container? # exit immediately if running in an installed system warn "ERROR: This script can only work in the installation system (inst-sys), " \ "live medium or in a container!" + warn "If you are sure it is OK to use the script add the --force option." exit 1 end @@ -620,16 +626,23 @@ module YUpdate # parse the command line options class Options def self.parse(argv) + force = argv.include?("--force") + if force + argv.delete("--force") + # pass the force option to the executed scripts + ENV["YUPDATE_FORCE"] = "1" + end + command = argv.shift case command when "version" VersionCommand.new when "overlay" - System.check! + System.check! unless force OverlayCommand.new(argv) when "patch" - System.check! + System.check! unless force PatchCommand.new(argv) when "servers" ServersCommand.new(argv) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 2b8908437..7e8581917 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 3 12:04:23 UTC 2023 - Ladislav Slezák + +- yupdate - improved Live ISO detection, added "--force" option + (related to bsc#1206927) +- 4.6.2 + ------------------------------------------------------------------- Mon Mar 13 08:49:20 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index cc84c978a..265097d06 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.6.1 +Version: 4.6.2 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only From aafc5715d41737d5c54a89a2765fa51682f373ef Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Thu, 11 May 2023 16:26:08 +0200 Subject: [PATCH 04/10] Add X resources for xterm font size to /root/.Xdefaults --- startup/YaST2.call | 50 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/startup/YaST2.call b/startup/YaST2.call index 032a75f5f..dba0da699 100755 --- a/startup/YaST2.call +++ b/startup/YaST2.call @@ -179,6 +179,50 @@ function set_qt_scale_factor () { } +function calculate_xterm_font_size() { +#------------------------------------------------------ +# Calculate an appropriate font size for xterm based on the DPI +# ($1) and set XTERM_FONT_SIZE accordingly. +# --- + + local DPI=${1:-96} + + if [ ${DPI:-0} -le 96 ]; then + XTERM_FONT_SIZE=10 + elif [ $DPI -le 192 ]; then + XTERM_FONT_SIZE=12 + else + XTERM_FONT_SIZE=14 + fi + + export XTERM_FONT_SIZE + log "\tXTERM_FONT_SIZE: $XTERM_FONT_SIZE for $DPI dpi" +} + + +function add_x11_resources() { +#------------------------------------------------------ +# Add some X resources for xterm to /root/.Xdefaults +# +# Notice that this file is only used if nothing has been +# loaded into the X server with 'xrdb' yet. +# --- + + local RESOURCE_FILE=/root/.Xdefaults + XTERM_FONT_SIZE=${XTERM_FONT_SIZE:-12} + log "\tAdding X resources for xterm to $RESOURCE_FILE" + + cat >>$RESOURCE_FILE < Date: Thu, 11 May 2023 18:46:26 +0200 Subject: [PATCH 05/10] Version bump and change log --- package/yast2-installation.changes | 8 ++++++++ package/yast2-installation.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 7e8581917..885f2b08a 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 11 16:44:38 UTC 2023 - Stefan Hundhammer + +- Use a larger font for xterm during installation via X resources + (bsc#1211267) + Details: https://github.com/yast/yast-installation/pull/1085 + 4.6.3 + ------------------------------------------------------------------- Mon Apr 3 12:04:23 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 265097d06..694150f33 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.6.2 +Version: 4.6.3 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only From 64355e1bd543a848410d9500395fbda429be0695 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Mon, 15 May 2023 10:06:36 +0200 Subject: [PATCH 06/10] Enable overriding XTERM_FONT_SIZE fom the environment --- startup/YaST2.call | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/startup/YaST2.call b/startup/YaST2.call index dba0da699..4b55533a7 100755 --- a/startup/YaST2.call +++ b/startup/YaST2.call @@ -185,14 +185,30 @@ function calculate_xterm_font_size() { # ($1) and set XTERM_FONT_SIZE accordingly. # --- + if [ -n "$XTERM_FONT_SIZE" ]; then + # Enable overriding the xterm font size from the command line or + # from an installation ISO boot parameter: + # + # Either boot the installation ISO with something like + # + # XTERM_FONT_SIZE=21 + # + # (which will end up in the environment) + # or start this script in DPI debugging mode with + # + # FAKE_MON_WIDTH_MM=200 XTERM_FONT_SIZE=21 ./YaST2.call + log "\tUsing XTERM_FONT_SIZE from environment: ${XTERM_FONT_SIZE}" + return + fi + local DPI=${1:-96} if [ ${DPI:-0} -le 96 ]; then - XTERM_FONT_SIZE=10 + XTERM_FONT_SIZE=10 elif [ $DPI -le 192 ]; then - XTERM_FONT_SIZE=12 + XTERM_FONT_SIZE=12 else - XTERM_FONT_SIZE=14 + XTERM_FONT_SIZE=14 fi export XTERM_FONT_SIZE From fecf801a22efff0dce26a68742c86aa8c7b06b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 11 Jul 2023 14:43:05 +0200 Subject: [PATCH 07/10] Fixed yupdate script (bsc#1213197) (#1094) Fixed yupdate script (bsc#1213197) --- bin/yupdate | 13 +++++++++---- package/yast2-installation.changes | 7 +++++++ package/yast2-installation.spec | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bin/yupdate b/bin/yupdate index 8390516fe..21e77280b 100755 --- a/bin/yupdate +++ b/bin/yupdate @@ -717,7 +717,9 @@ module YUpdate # add the default "yast" GitHub organization if missing repo = "yast/#{repo}" unless repo.include?("/") downloader = GithubDownloader.new(repo, branch) - install_tar(downloader) + # the GitHub tarballs have all content in a "-" subdirectory + dir = repo.split("/", 2).last + "-" + branch + install_tar(downloader, dir) end def install_from_tar(url) @@ -766,12 +768,15 @@ module YUpdate raise "Script #{File.basename(script)} failed" unless system(script) end - def install_tar(downloader) + # extract the tarball into a temporary directory and install it + # @param downloader the downloader to use + # @param subdir subdirectory in the source tarball + def install_tar(downloader, subdir = "") Dir.mktmpdir do |download_dir| downloader.extract_to(download_dir) - run_pre_script(download_dir) + run_pre_script(File.join(download_dir, subdir)) install_sources(download_dir) - run_post_script(download_dir) + run_post_script(File.join(download_dir, subdir)) end end diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 446a29065..f3208d6e0 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 11 07:20:29 UTC 2023 - Ladislav Slezák + +- Fixed yupdate script to properly run pre/post scripts + when patching from GitHub (bsc#1213197) +- 4.6.5 + ------------------------------------------------------------------- Thu Jun 15 15:01:13 UTC 2023 - Stefan Hundhammer diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index d25842d68..744f5f418 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.6.4 +Version: 4.6.5 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only From d1fce751982eedb8380fd8fe0d958c7b994a24ea Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Fri, 4 Aug 2023 09:07:50 +0200 Subject: [PATCH 08/10] Fixed symbols used for refering to particular labels. bsc#1213959 The issue was most probably introduced here 661f8f5d6 --- src/lib/installation/clients/inst_upgrade_urls.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/installation/clients/inst_upgrade_urls.rb b/src/lib/installation/clients/inst_upgrade_urls.rb index 5dd2a9552..8f4e34e17 100644 --- a/src/lib/installation/clients/inst_upgrade_urls.rb +++ b/src/lib/installation/clients/inst_upgrade_urls.rb @@ -150,10 +150,10 @@ def repo_action(status) when :removed # TRANSLATORS: The action to perform with a repository _("Remove") - when :disable + when :disabled # TRANSLATORS: The action to perform with a repository _("Disable") - when :enable + when :enabled # TRANSLATORS: The action to perform with a repository _("Enable") else From f453eb16a5cab6e7958374d6cb9a3387161b7717 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Fri, 4 Aug 2023 09:11:13 +0200 Subject: [PATCH 09/10] Updated changelog --- package/yast2-installation.changes | 8 ++++++++ package/yast2-installation.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index f3208d6e0..6aa33c0b1 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 4 07:09:13 UTC 2023 - Michal Filka + +- bsc#1213959 + - Change status label properly when toggling status in the + "Previousy used repositories" dialog. +- 4.6.6 + ------------------------------------------------------------------- Tue Jul 11 07:20:29 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 744f5f418..ad27e8d5e 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.6.5 +Version: 4.6.6 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only From 256c69b49133b7622791c37a80f25f0a9673b026 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Tue, 15 Aug 2023 10:44:58 +0200 Subject: [PATCH 10/10] Require awk (bsc#1214277) --- package/yast2-installation.changes | 6 ++++++ package/yast2-installation.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 6aa33c0b1..22ffd1ef2 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 15 08:42:50 UTC 2023 - Stefan Hundhammer + +- Require awk for use in startup scripts (bsc#1214277) +- 4.6.7 + ------------------------------------------------------------------- Fri Aug 4 07:09:13 UTC 2023 - Michal Filka diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index ad27e8d5e..a5308b330 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.6.6 +Version: 4.6.7 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only @@ -58,6 +58,8 @@ Requires: coreutils Requires: gzip # use in startup scripts Requires: initviocons +# bsc#1214277; require awk, not gawk, to allow for lighterweight alternatives like busybox +Requires: awk # Needed call /sbin/ip in vnc.sh/network.sh Requires: iproute2 # for the first/second stage of installation