pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 296718 from home:michael-chang:branches:Base:System

Browse Source 
- Cleanup patch not applied
  * remove grub2-enable-theme-for-terminal-window.patch
  * grub2.rpmlintrc: remove addFilter("patch-not-applied")

OBS-URL: https://build.opensuse.org/request/show/296718
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=149
This commit is contained in:
Andrei Borzenkov 2015-04-15 07:50:53 +00:00 committed by Git OBS Bridge
parent 9bc71d03db
commit 120644bcea
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
grub2-enable-theme-for-terminal-window.patch
View File

@ -1,14 +0,0 @@
--- a/util/grub.d/00_header.in 2012-03-27 21:45:08.992732967 -0400
+++ b/util/grub.d/00_header.in 2012-03-27 21:45:08.992732967 -0400
@@ -253,8 +253,9 @@
set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
export theme
EOF
- elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
- && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
+ fi
+ if [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
+ && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2
case "$GRUB_BACKGROUND" in
*.png) reader=png ;;

7
grub2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 15 06:02:36 UTC 2015 - mchang@suse.com
- Cleanup patch not applied
* remove grub2-enable-theme-for-terminal-window.patch
* grub2.rpmlintrc: remove addFilter("patch-not-applied")
-------------------------------------------------------------------
Thu Apr 2 04:25:52 UTC 2015 - mchang@suse.com

1
grub2.rpmlintrc
View File

@ -3,7 +3,6 @@ addFilter("non-etc-or-var-file-marked-as-conffile /boot/grub2/grub.cfg")
addFilter("non-conffile-in-etc /etc/bash_completion.d/grub")
addFilter("non-conffile-in-etc /etc/grub.d/README")
addFilter("statically-linked-binary .*/grub2/*/kernel.img")
addFilter("patch-not-applied")
# We need to supply unstripped files for grub
addFilter("unstripped-binary-or-object .*/grub2/*/.*.mod")
# TODO: s390 Experts: is this sensible?!

10
grub2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package grub2
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -58,7 +58,7 @@ BuildRequires: xen-devel
%endif
%if 0%{?suse_version} >= 1210
# Package systemd services files grub2-once.service
BuildRequires: systemd-rpm-macros
BuildRequires: systemd-rpm-macros
%define has_systemd 1
%endif
@ -155,7 +155,6 @@ Patch8: grub2-ppc-terminfo.patch
Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
Patch10: grub2-fix-error-terminal-gfxterm-isn-t-found.patch
Patch12: grub2-fix-menu-in-xen-host-server.patch
Patch13: grub2-enable-theme-for-terminal-window.patch
Patch15: not-display-menu-when-boot-once.patch
Patch16: grub2-fix-Grub2-with-SUSE-Xen-package-install.patch
Patch17: grub2-pass-corret-root-for-nfsroot.patch
@ -397,11 +396,6 @@ mv po/grub.pot po/%{name}.pot
%patch9 -p1
%patch10 -p1
%patch12 -p1
# disable and back to use black colored terminal window (bnc#776244)
# we could enable it when
# 1 we have background with better contrast to the font's color
# 2 we confirm it's eligible to set the terminal background this way
#patch13 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1