From 581c656f6d81ce430cb94a6d7d4584a90a2cbe37b99d1c1004a9040f2da04d11 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 18 Mar 2022 14:45:12 +0000 Subject: [PATCH] Accepting request 962733 from home:jtomasiak:branches:systemsmanagement:cockpit - re-add suse-microos-branding.patch from GitHub - add hide-docs.patch (bsc#1197003) OBS-URL: https://build.opensuse.org/request/show/962733 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=86 --- cockpit.changes | 6 ++ cockpit.spec | 4 ++ hide-docs.patch | 124 ++++++++++++++++++++++++++++++++ suse-microos-branding.patch | 138 ++++++++++++++++++++++++++++++++++++ 4 files changed, 272 insertions(+) create mode 100644 hide-docs.patch create mode 100644 suse-microos-branding.patch diff --git a/cockpit.changes b/cockpit.changes index 0e621f2..bf50200 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 18 14:28:24 UTC 2022 - Jacek Tomasiak + +- re-add suse-microos-branding.patch from GitHub +- add hide-docs.patch (bsc#1197003) + ------------------------------------------------------------------- Tue Mar 15 13:42:38 UTC 2022 - Jacek Tomasiak diff --git a/cockpit.spec b/cockpit.spec index 9c0c465..f561ecc 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -65,6 +65,8 @@ Source97: node_modules.spec.inc %include %{_sourcedir}/node_modules.spec.inc Patch0: cockpit-redhatfont.diff Patch1: 0001-selinux-allow-login-to-read-motd-file.patch +Patch2: hide-docs.patch +Patch3: suse-microos-branding.patch # SLE Micro specific patches Patch100: remove-pwscore.patch Patch101: hide-pcp.patch @@ -176,6 +178,8 @@ Recommends: subscription-manager-cockpit %setup -q -n cockpit-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %if 0%{?sle_version} %patch100 -p1 diff --git a/hide-docs.patch b/hide-docs.patch new file mode 100644 index 0000000..41d0cef --- /dev/null +++ b/hide-docs.patch @@ -0,0 +1,124 @@ +From cf16dead8c862fdf0f61a1c7ac0e8804933c812a Mon Sep 17 00:00:00 2001 +From: Jacek Tomasiak +Date: Mon, 14 Mar 2022 12:02:17 +0100 +Subject: [PATCH] Hide links pointing to RHEL docs (bsc#1197003) + +--- + pkg/kdump/manifest.json | 2 +- + pkg/networkmanager/manifest.json | 2 +- + pkg/packagekit/manifest.json | 2 +- + pkg/shell/indexes.js | 2 +- + pkg/storaged/manifest.json | 2 +- + pkg/systemd/manifest.json | 6 +++--- + pkg/users/manifest.json | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/pkg/kdump/manifest.json b/pkg/kdump/manifest.json +index 01e5320e83f..116eb96dbdc 100644 +--- a/pkg/kdump/manifest.json ++++ b/pkg/kdump/manifest.json +@@ -6,7 +6,7 @@ + "tools": { + "index": { + "label": "Kernel Dump", +- "docs": [ ++ "docs-rh": [ + { + "label": "Configuring kdump", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-8-web-console" +diff --git a/pkg/networkmanager/manifest.json b/pkg/networkmanager/manifest.json +index 3e295e9f186..8c7eef6e3b8 100644 +--- a/pkg/networkmanager/manifest.json ++++ b/pkg/networkmanager/manifest.json +@@ -8,7 +8,7 @@ + "index": { + "label": "Networking", + "order": 40, +- "docs": [ ++ "docs-rh": [ + { + "label": "Managing networking bonds", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console" +diff --git a/pkg/packagekit/manifest.json b/pkg/packagekit/manifest.json +index e538b4d7044..2204ae26198 100644 +--- a/pkg/packagekit/manifest.json ++++ b/pkg/packagekit/manifest.json +@@ -8,7 +8,7 @@ + "tools": { + "index": { + "label": "Software Updates", +- "docs": [ ++ "docs-rh": [ + { + "label": "Managing software updates", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-8-web-console" +diff --git a/pkg/shell/indexes.js b/pkg/shell/indexes.js +index adc3c165533..19d912e9bd2 100644 +--- a/pkg/shell/indexes.js ++++ b/pkg/shell/indexes.js +@@ -413,7 +413,7 @@ function MachinesIndex(index_options, machines, loader, mdialogs) { + if (os_release.DOCUMENTATION_URL) + create_item(cockpit.format(_("$0 documentation"), os_release.NAME), os_release.DOCUMENTATION_URL); + +- create_item(_("Web Console"), "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index"); ++ // create_item(_("Web Console"), "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index"); + + docs.forEach(e => create_item(_(e.label), e.url)); + +diff --git a/pkg/storaged/manifest.json b/pkg/storaged/manifest.json +index a554051798d..ef3c205222a 100644 +--- a/pkg/storaged/manifest.json ++++ b/pkg/storaged/manifest.json +@@ -8,7 +8,7 @@ + "index": { + "label": "Storage", + "order": 30, +- "docs": [ ++ "docs-rh": [ + { + "label": "Managing partitions", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-8-web-console" +diff --git a/pkg/systemd/manifest.json b/pkg/systemd/manifest.json +index 0c768360e79..a6e8a9cc17f 100644 +--- a/pkg/systemd/manifest.json ++++ b/pkg/systemd/manifest.json +@@ -9,7 +9,7 @@ + "index": { + "label": "Overview", + "order": 10, +- "docs": [ ++ "docs-rh": [ + { + "label": "Configuring system settings", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/getting-started-with-the-rhel-8-web-console_system-management-using-the-rhel-8-web-console" +@@ -32,7 +32,7 @@ + "services": { + "label": "Services", + "order": 100, +- "docs": [ ++ "docs-rh": [ + { + "label": "Managing services", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-8-web-console" +@@ -51,7 +51,7 @@ + "logs": { + "label": "Logs", + "order": 20, +- "docs": [ ++ "docs-rh": [ + { + "label": "Reviewing logs", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/reviewing-logs_system-management-using-the-rhel-8-web-console" +diff --git a/pkg/users/manifest.json b/pkg/users/manifest.json +index bfb5336770a..ccc408dec19 100644 +--- a/pkg/users/manifest.json ++++ b/pkg/users/manifest.json +@@ -7,7 +7,7 @@ + "index": { + "label": "Accounts", + "order": 70, +- "docs": [ ++ "docs-rh": [ + { + "label": "Managing user accounts", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console" diff --git a/suse-microos-branding.patch b/suse-microos-branding.patch new file mode 100644 index 0000000..2ec8ed3 --- /dev/null +++ b/suse-microos-branding.patch @@ -0,0 +1,138 @@ +From b95f55365f3b221be032b1008bb8032856e31a12 Mon Sep 17 00:00:00 2001 +From: Jacek Tomasiak +Date: Tue, 15 Mar 2022 23:57:12 +0100 +Subject: [PATCH] Add branding for SLE Micro + +This change requires distribution-logos-SLE and wallpaper-branding-SLE +to be available during build and installed on the target system to work +properly. +--- + Makefile.am | 1 + + src/branding/suse-microos/Makefile.am | 11 ++++ + src/branding/suse-microos/branding.css | 87 ++++++++++++++++++++++++++ + 3 files changed, 99 insertions(+) + create mode 100644 src/branding/suse-microos/Makefile.am + create mode 100644 src/branding/suse-microos/branding.css + +diff --git a/Makefile.am b/Makefile.am +index fb619f3f253..ec761210a52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -249,6 +249,7 @@ include src/branding/default/Makefile.am + include src/branding/fedora/Makefile.am + include src/branding/kubernetes/Makefile.am + include src/branding/opensuse/Makefile.am ++include src/branding/suse-microos/Makefile.am + include src/branding/registry/Makefile.am + include src/branding/rhel/Makefile.am + include src/branding/scientific/Makefile.am +diff --git a/src/branding/suse-microos/Makefile.am b/src/branding/suse-microos/Makefile.am +new file mode 100644 +index 00000000000..3f4b762afa5 +--- /dev/null ++++ b/src/branding/suse-microos/Makefile.am +@@ -0,0 +1,11 @@ ++susemicroosbrandingdir = $(datadir)/cockpit/branding/suse-microos ++ ++dist_susemicroosbranding_DATA = \ ++ src/branding/suse-microos/branding.css \ ++ $(NULL) ++ ++install-data-hook:: ++ $(LN_S) -f /usr/share/wallpapers/SLEdefault/contents/images/1920x1200.png $(DESTDIR)$(susemicroosbrandingdir)/default-1920x1200.png ++ $(LN_S) -f /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(susemicroosbrandingdir)/square-hicolor.svg ++ $(LN_S) -f /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(susemicroosbrandingdir)/favicon.ico ++ $(LN_S) -f /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(susemicroosbrandingdir)/apple-touch-icon.png +diff --git a/src/branding/suse-microos/branding.css b/src/branding/suse-microos/branding.css +new file mode 100644 +index 00000000000..e3c7939c464 +--- /dev/null ++++ b/src/branding/suse-microos/branding.css +@@ -0,0 +1,87 @@ ++/* Extra overrides */ ++:root { ++ --eos-bc-green-500: #30ba78; ++ --eos-bc-pine-500: #0c322c; ++ --eos-bc-gray-50: #F2F2F2; ++ --eos-bc-white: #ffffff; ++ --eos-bc-text: #333; ++} ++ ++ ++#brand:before { ++ content: "${PRETTY_NAME}"; ++} ++ ++.login-pf .container { ++ background-color: rgba(255, 255, 255); ++} ++ ++#option-group svg polygon { ++ fill: var(--eos-bc-text); ++} ++ ++/* Nav & sidebar overwrites */ ++.navbar-pf { ++ background: var(--eos-bc-pine-500); ++} ++ ++.navbar-pf-vertical { ++ border-top: none; ++} ++ ++ ++/* Default overrides */ ++ ++.login-note { ++ color: transparent; ++ position: relative; ++} ++ ++body.login-pf { ++ background-color: var(--eos-bc-pine-500); ++ color: var(--eos-bc-text); ++} ++ ++/* Only use background image on desktops */ ++@media(min-width: 1024px) { ++ body.login-pf { ++ background-image: url("default-1920x1200.png"); ++ background-repeat: no-repeat; ++ background-position: 100% 0 !important; ++ background-size: cover; ++ } ++} ++/* Hide badge on desktops (already included in background) */ ++@media(max-width: 1023px) { ++ #badge { ++ width: 51px; ++ height: 45px; ++ background-image: url("square-hicolor.svg"); ++ background-repeat: no-repeat; ++ } ++} ++ ++#brand { ++ width: auto; ++ height: auto; ++ background-image: none; ++ background-repeat: no-repeat; ++ font-size: 2em; ++ white-space: nowrap; ++} ++/* Switch to small font faster to not clip long name */ ++@media(max-width: 560px) { ++ #brand { ++ font-size: inherit; ++ } ++} ++ ++#index-brand { ++ font-weight: bold; ++} ++ ++#index-brand:before { ++ content: "${PRETTY_NAME}"; ++} ++ ++