Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=7023e1b1148d103a0ce87a8adc4240eaef9e50be
commit 7023e1b1148d103a0ce87a8adc4240eaef9e50be Author: DeX77 <de...@frugalware.org> Date: Thu Jul 13 14:10:34 2017 +0200 grub2-2.02-13-x86_64 * remove nomodeset quirk for nvidia: no longer needed diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild index fece10a..69dd707 100644 --- a/source/base/grub2/FrugalBuild +++ b/source/base/grub2/FrugalBuild @@ -5,7 +5,7 @@ pkgname=grub2 _F_archive_name=grub pkgver=2.02 -pkgrel=12 +pkgrel=13 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; rodepends=('grub-theme-frugalware' 'scriptlet-core') @@ -184,7 +184,7 @@ sha1sums=('3d7eb6eaab28b88cb969ba9ab24af959f4d1b178' \ 'f4cb59b77d91c15792a39f81e1516c25d17c4453' \ '9c9a1e45f8fe857a9cdc9cc79b0781e39b6d71c5' \ '93199e15aa5f3adf7aaca91f1392e444bf25028c' \ - 'af8f6a3114857e97e25b47273ac3b1c952586bbe' \ + 'c71279a2b9951e9b209460e194f8be2d513ae483' \ '8075e7d9b3e8c41a5d4b654c4d34ba3de209f161') subpkgs=('grub2-mkfont') diff --git a/source/base/grub2/grub2-frugalware-config.patch b/source/base/grub2/grub2-frugalware-config.patch index f6ecfe0..fe9ab7e 100644 --- a/source/base/grub2/grub2-frugalware-config.patch +++ b/source/base/grub2/grub2-frugalware-config.patch @@ -1,6 +1,6 @@ ---- grub-2.02-beta3/util/grub.d/10_linux.in 2016-05-31 17:08:22.000000000 +0200 -+++ grub-2.02-beta3.new/util/grub.d/10_linux.in 2016-05-31 17:10:24.000000000 +0200 -@@ -79,6 +79,26 @@ +--- grub-2.02/util/grub.d/10_linux.in 2017-07-13 13:56:53.000000000 +0200 ++++ grub-2.02.new/util/grub.d/10_linux.in 2017-07-13 13:55:50.000000000 +0200 +@@ -79,6 +79,19 @@ title_correction_code= @@ -17,17 +17,10 @@ +$(tail -n +2 /proc/swaps) +EOF + -+_modeset="" -+ -+for i in `find /lib/modules -regex '^.*/\(nvidia\|fglrx\)\.ko.*$'`; do -+ _modeset="nomodeset" -+ break -+done -+ linux_entry () { os="$1" -@@ -106,6 +126,8 @@ +@@ -106,6 +119,8 @@ fi if [ x$type != xsimple ] ; then case $type in @@ -36,21 +29,21 @@ recovery) title="$(printf "$(mktitle) (recovery mode)" "${version}")" ;; *) -@@ -154,11 +176,11 @@ +@@ -154,11 +169,11 @@ fi if [ -d /sys/firmware/efi ]; then sed "s/^/$submenu_indentation/" << EOF - ${linuxefi} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -+ ${linuxefi} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ${_resume} ${_modeset} ++ ${linuxefi} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ${_resume} EOF else sed "s/^/$submenu_indentation/" << EOF - linux${sixteenbit} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -+ linux${sixteenbit} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ${_resume} ${_modeset} ++ linux${sixteenbit} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ${_resume} EOF fi if test -n "${initrd}" ; then -@@ -286,11 +308,12 @@ +@@ -286,11 +301,12 @@ is_top_level=false fi _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
