From 34cc615f0c846848db2030da5f4917b9093cdc7a Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 26 Apr 2015 01:25:59 +0300 Subject: [sys-boot/grub] upgrade --- sys-boot/grub/files/grub-2.00-secureboot-user-sign-2.patch | 2 +- sys-boot/grub/files/grub-2.00-secureboot-user-sign.patch | 2 +- sys-boot/grub/files/grub.default-2 | 4 ++-- sys-boot/grub/files/grub2-default | 4 ++-- sys-boot/grub/grub-2.00-r4.ebuild | 4 ++-- sys-boot/grub/grub-2.00-r5.ebuild | 6 +++--- sys-boot/grub/grub-2.00.ebuild | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys-boot/grub/files/grub-2.00-secureboot-user-sign-2.patch b/sys-boot/grub/files/grub-2.00-secureboot-user-sign-2.patch index 6882d1f4..9648efa7 100644 --- a/sys-boot/grub/files/grub-2.00-secureboot-user-sign-2.patch +++ b/sys-boot/grub/files/grub-2.00-secureboot-user-sign-2.patch @@ -45,7 +45,7 @@ diff -Nurp grub-2.00.orig/util/grub-install.in grub-2.00/util/grub-install.in + fi + else + echo "Cannot sign ${_image} for SecureBoot" 1>&2 -+ echo "RogentOS keypair at $(basename ${_private}) not found" 1>&2 ++ echo "Kogaion keypair at $(basename ${_private}) not found" 1>&2 + fi + } + diff --git a/sys-boot/grub/files/grub-2.00-secureboot-user-sign.patch b/sys-boot/grub/files/grub-2.00-secureboot-user-sign.patch index 6c02cbd4..01094c8d 100644 --- a/sys-boot/grub/files/grub-2.00-secureboot-user-sign.patch +++ b/sys-boot/grub/files/grub-2.00-secureboot-user-sign.patch @@ -23,7 +23,7 @@ + mv "${_image}.signed" "${_image}" + else + echo "Cannot sign ${_image} for SecureBoot" 1>&2 -+ echo "RogentOS keypair at $(basename ${_private}) not found" 1>&2 ++ echo "Kogaion keypair at $(basename ${_private}) not found" 1>&2 + fi + } + diff --git a/sys-boot/grub/files/grub.default-2 b/sys-boot/grub/files/grub.default-2 index 1894575d..1442fe1e 100644 --- a/sys-boot/grub/files/grub.default-2 +++ b/sys-boot/grub/files/grub.default-2 @@ -10,7 +10,7 @@ # their associated values. GRUB_DEFAULT=saved -GRUB_DISTRIBUTOR="RogentOS" +GRUB_DISTRIBUTOR="Kogaion" GRUB_DEFAULT=0 GRUB_HIDDEN_TIMEOUT=0 @@ -50,7 +50,7 @@ GRUB_COLOR_NORMAL="white/black" GRUB_COLOR_HIGHLIGHT="magenta/black" if [ -f "/etc/default/kogaion-grub" ]; then - # this file is placed by the RogentOS Installer and contains + # this file is placed by the Kogaion Installer and contains # custom GRUB_CMDLINE_LINUX parameters created at install # time. . /etc/default/kogaion-grub diff --git a/sys-boot/grub/files/grub2-default b/sys-boot/grub/files/grub2-default index 7d1423ef..0a29c417 100644 --- a/sys-boot/grub/files/grub2-default +++ b/sys-boot/grub/files/grub2-default @@ -3,7 +3,7 @@ # /boot/grub/grub.cfg. GRUB_DEFAULT=saved -GRUB_DISTRIBUTOR="RogentOS" +GRUB_DISTRIBUTOR="Kogaion" GRUB_HIDDEN_TIMEOUT=0 GRUB_HIDDEN_TIMEOUT_QUIET=true GRUB_TIMEOUT=5 @@ -41,7 +41,7 @@ GRUB_COLOR_NORMAL="white/black" GRUB_COLOR_HIGHLIGHT="magenta/black" if [ -f "/etc/default/kogaion-grub" ]; then - # this file is placed by the RogentOS Installer and contains + # this file is placed by the Kogaion Installer and contains # custom GRUB_CMDLINE_LINUX parameters created at install # time. source /etc/default/kogaion-grub diff --git a/sys-boot/grub/grub-2.00-r4.ebuild b/sys-boot/grub/grub-2.00-r4.ebuild index a72a2b25..4938704b 100644 --- a/sys-boot/grub/grub-2.00-r4.ebuild +++ b/sys-boot/grub/grub-2.00-r4.ebuild @@ -72,7 +72,7 @@ REQUIRED_USE="grub_platforms_qemu? ( truetype ) # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -# sbsigntool is RogentOS specific +# sbsigntool is Kogaion specific RDEPEND=" app-crypt/sbsigntool x11-themes/kogaion-artwork-grub @@ -187,7 +187,7 @@ grub_configure() { *) platform=${MULTIBUILD_VARIANT} ;; esac - # RogentOS: backward compatibility, do not change --with-grubdir + # Kogaion: backward compatibility, do not change --with-grubdir local myeconfargs=( --disable-werror --program-prefix= diff --git a/sys-boot/grub/grub-2.00-r5.ebuild b/sys-boot/grub/grub-2.00-r5.ebuild index 8a85b6fd..223c7f6e 100644 --- a/sys-boot/grub/grub-2.00-r5.ebuild +++ b/sys-boot/grub/grub-2.00-r5.ebuild @@ -72,7 +72,7 @@ REQUIRED_USE="grub_platforms_qemu? ( truetype ) # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -# sbsigntool is RogentOS & Argent specific +# sbsigntool is Kogaion & Argent specific RDEPEND=" app-crypt/sbsigntool x11-themes/kogaion-artwork-grub @@ -187,7 +187,7 @@ grub_configure() { *) platform=${MULTIBUILD_VARIANT} ;; esac - # RogentOS: backward compatibility, do not change --with-grubdir + # Kogaion: backward compatibility, do not change --with-grubdir local myeconfargs=( --disable-werror --program-prefix= @@ -207,7 +207,7 @@ grub_configure() { $(usex efiemu '' --disable-efiemu) ) - # RogentOS: keep --with-grubdir=grub to grub for backward compatibility + # Kogaion: keep --with-grubdir=grub to grub for backward compatibility if use multislot; then myeconfargs+=( --program-transform-name="s,grub,grub2," diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild index 8ad9ba27..71f92968 100644 --- a/sys-boot/grub/grub-2.00.ebuild +++ b/sys-boot/grub/grub-2.00.ebuild @@ -230,7 +230,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.00-genkernel-initramfs-single.patch # Rogentos patch for customization - epatch "${FILESDIR}"/${P}-rogentos-patch.patch + epatch "${FILESDIR}"/${P}-kogaion-patch.patch if [[ ${PV} != 9999 ]]; then epatch "${FILESDIR}/${P}-parallel-make.patch" #424231 -- cgit v1.2.3