From c5e12ed186571ce33b720cab9efd0d7ca0016481 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Wed, 22 Jan 2025 08:53:54 +0100 Subject: [PATCH 1/6] Patch for makefile to support SLE builds --- live/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/live/Makefile b/live/Makefile index cb1535e0d9..af167f01b7 100644 --- a/live/Makefile +++ b/live/Makefile @@ -15,6 +15,8 @@ FLAVOR = openSUSE # to use a different project run "make build OBS_PROJECT=" OBS_PROJECT = "systemsmanagement:Agama:Devel" OBS_PACKAGE = "agama-installer" +# to use internal OBS add "OBS_API=https://api.suse.de" +OBS_API = "https://api.opensuse.org" # files to copy from src/ COPY_FILES = $(patsubst $(SRCDIR)/%,$(DESTDIR)/%,$(wildcard $(SRCDIR)/*)) @@ -53,8 +55,9 @@ $(DESTDIR)/%.tar.xz: % $$(shell find % -type f,l) # build the ISO locally build: $(DESTDIR) - if [ ! -e $(DESTDIR)/.osc ]; then make clean; osc co -o $(DESTDIR) $(OBS_PROJECT) $(OBS_PACKAGE); fi + if [ ! -e $(DESTDIR)/.osc ]; then make clean; osc -A $(OBS_API) co -o $(DESTDIR) $(OBS_PROJECT) $(OBS_PACKAGE); fi $(MAKE) all - (cd $(DESTDIR) && osc build -M $(FLAVOR) images) + # allow passing optional parameters to osc like "-p " or "-k " + (cd $(DESTDIR) && osc -A $(OBS_API) build -M $(FLAVOR) $(OSC_OPTS) images) .PHONY: build all clean From 9d119422fedf17a26cd858368cca91449bba6ac4 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Wed, 22 Jan 2025 08:54:36 +0100 Subject: [PATCH 2/6] IceWM theme / setup inspired by yast --- live/root/etc/icewm/preferences.yast2 | 125 ++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 live/root/etc/icewm/preferences.yast2 diff --git a/live/root/etc/icewm/preferences.yast2 b/live/root/etc/icewm/preferences.yast2 new file mode 100644 index 0000000000..2a212aa00f --- /dev/null +++ b/live/root/etc/icewm/preferences.yast2 @@ -0,0 +1,125 @@ +# IceWM configuration file for use during installation + +# Hide taskbar +ShowTaskBar=0 + +# Hide titlebar buttons and window menu +TitleButtonsLeft="" +TitleButtonsRight="" +WinMenuItems="" + +# Enable Alt+Tab +QuickSwitch=1 +KeySysSwitchNext="Alt+Tab" +KeySysSwitchLast="Alt+Shift+Tab" + +# Disable Windows key +Win95Keys=0 + +# Colors +# HACK: "hide" the title during installation by setting the same foreground +# and background colors (see https://bugzilla.suse.com/show_bug.cgi?id=965086) +ColorActiveTitleBar="rgb:28/ae/73" +ColorActiveTitleBarText="rgb:28/ae/73" +# HACK: "hide" the title during installation by setting the same foreground +# and background colors (see https://bugzilla.suse.com/show_bug.cgi?id=965086) +ColorNormalTitleBar="rgb:65/65/65" +ColorNormalTitleBarText="rgb:65/65/65" +ColorActiveBorder="rgb:2d/2d/2d" +ColorNormalBorder="rgb:2d/2d/2d" + +# Borders +BorderSizeX=3 +BorderSizeY=3 +DlgBorderSizeX=3 +DlgBorderSizeY=3 + +# Disable most shortcuts +# :r !grep -o '\ Date: Wed, 22 Jan 2025 10:48:20 +0100 Subject: [PATCH 3/6] Updated changelog --- live/src/agama-installer.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes index b3380f4586..38ed101793 100644 --- a/live/src/agama-installer.changes +++ b/live/src/agama-installer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 22 09:46:50 UTC 2025 - Michal Filka + +- bsc#1235478 + - tuned IceWM setup to disable some desktop functionality like + opening main menu using the Win key + ------------------------------------------------------------------- Mon Jan 20 10:37:43 UTC 2025 - Imobach Gonzalez Sosa From 0bef6f99330a7c2ccfc0f810d4c9151925de0296 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Fri, 31 Jan 2025 12:38:57 +0100 Subject: [PATCH 4/6] Updated packages list in kiwi file with fonts for xterm --- live/src/agama-installer.changes | 6 ++++++ live/src/agama-installer.kiwi | 1 + 2 files changed, 7 insertions(+) diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes index 38ed101793..06b1ae4ff4 100644 --- a/live/src/agama-installer.changes +++ b/live/src/agama-installer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 31 11:37:57 UTC 2025 - Michal Filka + +- added fonts to avoid xterm crash when trying to open xterm's + popup menu (Ctrl + click) + ------------------------------------------------------------------- Wed Jan 22 09:46:50 UTC 2025 - Michal Filka diff --git a/live/src/agama-installer.kiwi b/live/src/agama-installer.kiwi index 4350da69b2..3a80ea8996 100644 --- a/live/src/agama-installer.kiwi +++ b/live/src/agama-installer.kiwi @@ -150,6 +150,7 @@ + From 7120abfc536805edde27a80699e87623a6530be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 4 Feb 2025 14:09:16 +0100 Subject: [PATCH 5/6] Change the default xterm menu font ...instead of installing extra font package (23MB compressed size) --- live/root/root/.Xdefaults | 2 ++ live/src/agama-installer.kiwi | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 live/root/root/.Xdefaults diff --git a/live/root/root/.Xdefaults b/live/root/root/.Xdefaults new file mode 100644 index 0000000000..b2344f6800 --- /dev/null +++ b/live/root/root/.Xdefaults @@ -0,0 +1,2 @@ +! Use the default font also for the xterm menus (Ctrl + click) +XTerm*font: fixed \ No newline at end of file diff --git a/live/src/agama-installer.kiwi b/live/src/agama-installer.kiwi index 3a80ea8996..4350da69b2 100644 --- a/live/src/agama-installer.kiwi +++ b/live/src/agama-installer.kiwi @@ -150,7 +150,6 @@ - From 6fb93812e9d0d735c0f07f2375261adda3580511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 4 Feb 2025 14:15:17 +0100 Subject: [PATCH 6/6] Enable some IceWM features in the config Enable displaying the window title, the maximize/minimize buttons and the window actions menu in the title bar. YaST uses popup windows where these features are not wanted, but Agama displays popups in the main browser window (so technically they are not popups and we do not use any `alert()` or similar functions). And these features might be useful when running xterm debug window. --- live/root/etc/icewm/preferences.yast2 | 21 --------------------- live/root/root/.Xdefaults | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/live/root/etc/icewm/preferences.yast2 b/live/root/etc/icewm/preferences.yast2 index 2a212aa00f..4c47102782 100644 --- a/live/root/etc/icewm/preferences.yast2 +++ b/live/root/etc/icewm/preferences.yast2 @@ -3,11 +3,6 @@ # Hide taskbar ShowTaskBar=0 -# Hide titlebar buttons and window menu -TitleButtonsLeft="" -TitleButtonsRight="" -WinMenuItems="" - # Enable Alt+Tab QuickSwitch=1 KeySysSwitchNext="Alt+Tab" @@ -16,18 +11,6 @@ KeySysSwitchLast="Alt+Shift+Tab" # Disable Windows key Win95Keys=0 -# Colors -# HACK: "hide" the title during installation by setting the same foreground -# and background colors (see https://bugzilla.suse.com/show_bug.cgi?id=965086) -ColorActiveTitleBar="rgb:28/ae/73" -ColorActiveTitleBarText="rgb:28/ae/73" -# HACK: "hide" the title during installation by setting the same foreground -# and background colors (see https://bugzilla.suse.com/show_bug.cgi?id=965086) -ColorNormalTitleBar="rgb:65/65/65" -ColorNormalTitleBarText="rgb:65/65/65" -ColorActiveBorder="rgb:2d/2d/2d" -ColorNormalBorder="rgb:2d/2d/2d" - # Borders BorderSizeX=3 BorderSizeY=3 @@ -117,9 +100,5 @@ DesktopWinMenuButton=0 DesktopWinListButton=0 DesktopMenuButton=0 -# Disable maximize and rollup -TitleBarMaximizeButton=0 -TitleBarRollupButton=0 - # Disable possibility to move the base window, BNC 466827 ClientWindowMouseActions=0 diff --git a/live/root/root/.Xdefaults b/live/root/root/.Xdefaults index b2344f6800..463bc3902b 100644 --- a/live/root/root/.Xdefaults +++ b/live/root/root/.Xdefaults @@ -1,2 +1,2 @@ ! Use the default font also for the xterm menus (Ctrl + click) -XTerm*font: fixed \ No newline at end of file +XTerm*font: fixed