- merged 2.12 from PLD

[packages/grub2.git] / tld-mkconfigdir.patch

diff --git a/tld-mkconfigdir.patch b/tld-mkconfigdir.patch
index 5d6943e60a6ee16e9a53ef674abdd2c1d2493cb7..3ab26d722454197c6b227195f4b1f3fa55946ce1 100644 (file)
--- a/tld-mkconfigdir.patch
+++ b/tld-mkconfigdir.patch
@@ -1,7 +1,7 @@
-diff -dur grub-2.00.orig/conf/Makefile.common grub-2.00/conf/Makefile.common
---- grub-2.00.orig/conf/Makefile.common        2012-10-27 15:05:15.000000000 +0200
-+++ grub-2.00/conf/Makefile.common     2012-10-27 15:06:09.135719113 +0200
-@@ -98,7 +98,7 @@
+diff -ur grub-2.04.orig/conf/Makefile.common grub-2.04/conf/Makefile.common
+--- grub-2.04.orig/conf/Makefile.common        2019-08-18 15:43:56.021000000 +0200
++++ grub-2.04/conf/Makefile.common     2019-08-18 15:44:44.088000000 +0200
+@@ -61,7 +61,7 @@
  
  # Other variables
  
@@ -10,12 +10,12 @@ diff -dur grub-2.00.orig/conf/Makefile.common grub-2.00/conf/Makefile.common
  platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
  starfielddir = $(pkgdatadir)/themes/starfield
  
-diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
---- grub-2.00.orig/util/grub-mkconfig.in       2012-10-27 15:05:15.000000000 +0200
-+++ grub-2.00/util/grub-mkconfig.in    2012-10-27 15:06:40.696227008 +0200
-@@ -35,7 +35,7 @@
-     pkgdatadir="${datadir}/@PACKAGE@"
- fi
+diff -ur grub-2.04.orig/util/grub-mkconfig.in grub-2.04/util/grub-mkconfig.in
+--- grub-2.04.orig/util/grub-mkconfig.in       2019-08-18 15:43:56.080000000 +0200
++++ grub-2.04/util/grub-mkconfig.in    2019-08-18 15:44:44.089000000 +0200
+@@ -37,7 +37,7 @@
+ export pkgdatadir
+ 
  grub_cfg=""
 -grub_mkconfig_dir="${sysconfdir}"/grub.d
 +grub_mkconfig_dir=/lib/grub.d