grub: fixing parabola-release and removing grub.cfg

3 files changed, 11 insertions, 155 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 7fd413843..a6387904e 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -14,12 +14,12 @@ _GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953"
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.00.1282.g5ae5c54
-pkgrel=1
+pkgrel=1.1
 epoch="1"
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
 license=('GPL3')
-backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+backup=('etc/default/grub' 'etc/grub.d/40_custom')
 install="${pkgname}.install"
 options=('!makeflags')
 
@@ -44,15 +44,13 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_C
         'http://unifoundry.com/unifont-5.1.20080820.bdf.gz'
         'parabola_grub_mkconfig_fixes.patch'
         '60_memtest86+'
-        'grub.default'
-        'grub.cfg')
+        'grub.default')
 
 md5sums=('SKIP'
          '6b8263ceccef33bd633aa019d74b7943'
-         '67a3edf42dfa463a56cccb5d91b0e993'
+         '7a3f48a0b84c695a213667f825f3719c'
          'be55eabc102f2c60b38ed35c203686d6'
          '52d374e0194e3f2e39ff7c92ecd58a6c'
-         'b166b025c1d674ccac83e1ad94deed05'
          'SKIP'
          'SKIP'
          'SKIP')
@@ -251,9 +249,6 @@ _package_grub-common_and_bios() {
 	msg "Install /etc/default/grub (used by grub-mkconfig)"
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
 	
-	msg "Install grub.cfg for backup array"
-	install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-	
 }
 
 _package_grub-efi() {
diff --git a/libre/grub/grub.cfg b/libre/grub/grub.cfg
deleted file mode 100644
index 32e163f0c..000000000
--- a/libre/grub/grub.cfg
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-insmod part_gpt
-insmod part_msdos
-if [ -s $prefix/grubenv ]; then
-  load_env
-fi
-set default="0"
-
-if [ x"${feature_menuentry_id}" = xy ]; then
-  menuentry_id_option="--id"
-else
-  menuentry_id_option=""
-fi
-
-export menuentry_id_option
-
-if [ "${prev_saved_entry}" ]; then
-  set saved_entry="${prev_saved_entry}"
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
-fi
-
-function savedefault {
-  if [ -z "${boot_once}" ]; then
-    saved_entry="${chosen}"
-    save_env saved_entry
-  fi
-}
-
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-if [ x$feature_default_font_path = xy ] ; then
-   font=unicode
-else
-insmod part_msdos
-insmod ext2
-set root='hd0,msdos5'
-if [ x$feature_platform_search_hint = xy ]; then
-  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5  ad4103fa-d940-47ca-8506-301d8071d467
-else
-  search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
-fi
-    font="/usr/share/grub/unicode.pf2"
-fi
-
-if loadfont $font ; then
-  set gfxmode=auto
-  load_video
-  insmod gfxterm
-  set locale_dir=$prefix/locale
-  set lang=en_US
-  insmod gettext
-fi
-terminal_input console
-terminal_output gfxterm
-set timeout=5
-### END /etc/grub.d/00_header ###
-
-### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
-	load_video
-	set gfxpayload=keep
-	insmod gzio
-	insmod part_msdos
-	insmod ext2
-	set root='hd0,msdos5'
-	if [ x$feature_platform_search_hint = xy ]; then
-	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5  ad4103fa-d940-47ca-8506-301d8071d467
-	else
-	  search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
-	fi
-	echo	'Loading Linux libre kernel ...'
-	linux	/boot/vmlinuz-linux-libre root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw  quiet
-	echo	'Loading initial ramdisk ...'
-	initrd	/boot/initramfs-linux-libre.img
-}
-menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
-	load_video
-	set gfxpayload=keep
-	insmod gzio
-	insmod part_msdos
-	insmod ext2
-	set root='hd0,msdos5'
-	if [ x$feature_platform_search_hint = xy ]; then
-	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5  ad4103fa-d940-47ca-8506-301d8071d467
-	else
-	  search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
-	fi
-	echo	'Loading Linux libre kernel ...'
-	linux	/boot/vmlinuz-linux-libre root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw  quiet
-	echo	'Loading initial ramdisk ...'
-	initrd	/boot/initramfs-linux-libre-fallback.img
-}
-
-### END /etc/grub.d/10_linux ###
-
-### BEGIN /etc/grub.d/20_linux_xen ###
-### END /etc/grub.d/20_linux_xen ###
-
-### BEGIN /etc/grub.d/20_memtest86+ ###
-### END /etc/grub.d/20_memtest86+ ###
-
-### BEGIN /etc/grub.d/30_os-prober ###
-### END /etc/grub.d/30_os-prober ###
-
-### BEGIN /etc/grub.d/40_custom ###
-# This file provides an easy way to add custom menu entries.  Simply type the
-# menu entries you want to add after this comment.  Be careful not to change
-# the 'exec tail' line above.
-### END /etc/grub.d/40_custom ###
-
-### BEGIN /etc/grub.d/41_custom ###
-if [ -f  ${config_directory}/custom.cfg ]; then
-  source ${config_directory}/custom.cfg
-elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then
-  source $prefix/custom.cfg;
-fi
-### END /etc/grub.d/41_custom ###
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 7cf1763a2..fcb302e1d 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -85,12 +85,12 @@ index e27d6f7..2d60949 100644
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
-+  if test -e "/etc/arch-release" ; then
-+    if echo "${basename}" | grep -q 'vmlinuz-linux' ; then
-+      version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`"
++  if test -e "/etc/parabola-release" ; then
++    if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then
++      version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
 +      
 +      if [ "x${version}" = "x" ] ; then
-+        version="core repo kernel"
++        version="libre repo kernel"
 +      else
 +        version="`echo "${version}" | sed -e 's,-,,g'`"
 +        version="${version} kernel"
@@ -118,7 +118,7 @@ index e27d6f7..2d60949 100644
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
-+  if test -e "/etc/arch-release" ; then
++  if test -e "/etc/parabola-release" ; then
 +    is_first_entry="false"
 +    
 +    linux_entry "${OS}" "${version}" true \
@@ -141,7 +141,7 @@ index e27d6f7..2d60949 100644
      is_top_level=false
    fi
  
-+  if ! test -e "/etc/arch-release" ; then
++  if ! test -e "/etc/parabola-release" ; then
    linux_entry "${OS}" "${version}" advanced \
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 +  fi
@@ -153,7 +153,7 @@ index e27d6f7..2d60949 100644
  
  # If at least one kernel was found, then we need to
  # add a closing '}' for the submenu command.
-+if ! test -e "/etc/arch-release" ; then
++if ! test -e "/etc/parabola-release" ; then
  if [ x"$is_top_level" != xtrue ]; then
    echo '}'
  fi