!247 [sync] PR-246: add logo with install
From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
7bd38ef83f
@ -1,7 +1,7 @@
|
||||
%define _empty_manifest_terminate_build 0
|
||||
Name: anaconda
|
||||
Version: 36.16.5
|
||||
Release: 5
|
||||
Release: 6
|
||||
Summary: Graphical system installer
|
||||
License: GPLv2+ and MIT
|
||||
URL: http://fedoraproject.org/wiki/Anaconda
|
||||
@ -29,6 +29,7 @@ Patch9012: Support-configuration-of-additional-boot-arguments.patch
|
||||
Patch9013: support-use-sm3-crypt-user-password.patch
|
||||
Patch9014: bugfix-with-use-local-kickstart-version.patch
|
||||
Patch9015: bugfix-change-gnome-kiosk-to-use-metacity.patch
|
||||
Patch9016: bugfix-add-log-and-background.patch
|
||||
|
||||
%define dasbusver 1.3
|
||||
%define dbusver 1.2.3
|
||||
@ -150,7 +151,6 @@ runtime on NFS/HTTP/FTP servers or local disks.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
sed -i 's/import F36/import DEVEL/g' %{_builddir}/%{name}-%{version}/dracut/parse-kickstart
|
||||
|
||||
%build
|
||||
# use actual build-time release number, not tarball creation time release number
|
||||
@ -268,6 +268,13 @@ update-desktop-database &> /dev/null || :
|
||||
%{_prefix}/libexec/anaconda/dd_*
|
||||
|
||||
%changelog
|
||||
* Thu Nov 24 2022 sunhai <sunhai10@huawei.com> - 36.16.5-6
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:add logo with install
|
||||
the kickstart version change to patch
|
||||
|
||||
* Wed Nov 23 2022 sunhai <sunhai10@huawei.com> - 36.16.5-5
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
46
bugfix-add-log-and-background.patch
Normal file
46
bugfix-add-log-and-background.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From 8b5428e400ac80d57ae6bc6b0ec792e17a62a04e Mon Sep 17 00:00:00 2001
|
||||
From: sun_hai_10 <sunhai10@huawei.com>
|
||||
Date: Thu, 24 Nov 2022 11:13:58 +0800
|
||||
Subject: [PATCH] add log and background
|
||||
|
||||
---
|
||||
data/anaconda-gtk.css | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css
|
||||
index 7de933d..7c6643a 100644
|
||||
--- a/data/anaconda-gtk.css
|
||||
+++ b/data/anaconda-gtk.css
|
||||
@@ -98,12 +98,18 @@ infobar.error {
|
||||
@define-color anaconda_bg_color #2f4265;
|
||||
|
||||
.logo-sidebar {
|
||||
+ background-image: url('/usr/share/anaconda/pixmaps/sidebar-bg.png');
|
||||
+ background-size: 100% 100%;
|
||||
+ background-repeat: no-repeat;
|
||||
background-color: @anaconda_bg_color;
|
||||
}
|
||||
|
||||
/* This is a placeholder to be filled by a product-specific logo. */
|
||||
.logo {
|
||||
- background-image: none;
|
||||
+ background-image: url('/usr/share/anaconda/pixmaps/sidebar-logo.png');
|
||||
+ background-position: 50% 20px;
|
||||
+ background-size: 90%;
|
||||
+ background-repeat: no-repeat;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
@@ -114,6 +120,9 @@ infobar.error {
|
||||
}
|
||||
|
||||
AnacondaSpokeWindow #nav-box {
|
||||
+ background-image: url('/usr/share/anaconda/pixmaps/topbar-bg.png');
|
||||
+ background-size: 100% 100%;
|
||||
+ background-repeat: no-repeat;
|
||||
background-color: @anaconda_bg_color;
|
||||
color: white;
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,12 +1,26 @@
|
||||
From d8f6a8f3e50ea99ed0c9b37da0e3803be7678693 Mon Sep 17 00:00:00 2001
|
||||
From d361beead1ff91273aa0f13147b2b279172133aa Mon Sep 17 00:00:00 2001
|
||||
From: sun_hai_10 <sunhai10@huawei.com>
|
||||
Date: Fri, 11 Nov 2022 10:39:28 +0800
|
||||
Date: Thu, 24 Nov 2022 10:40:41 +0800
|
||||
Subject: [PATCH] with use local kickstart version
|
||||
|
||||
---
|
||||
dracut/parse-kickstart | 2 +-
|
||||
pyanaconda/core/kickstart/version.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
|
||||
index 56cacb8..e0fdd1f 100755
|
||||
--- a/dracut/parse-kickstart
|
||||
+++ b/dracut/parse-kickstart
|
||||
@@ -41,7 +41,7 @@ from pykickstart.constants import *
|
||||
from collections import OrderedDict
|
||||
|
||||
# Import the kickstart version.
|
||||
-from pykickstart.version import F36 as VERSION
|
||||
+from pykickstart.version import DEVEL as VERSION
|
||||
|
||||
# Import all kickstart commands as version-less.
|
||||
from pykickstart.commands.cdrom import FC3_Cdrom as Cdrom
|
||||
diff --git a/pyanaconda/core/kickstart/version.py b/pyanaconda/core/kickstart/version.py
|
||||
index 4170214..df743a6 100644
|
||||
--- a/pyanaconda/core/kickstart/version.py
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user