From 36dd2c2fd417ecfd2b7b66eb6516e955528cc4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 14 Oct 2015 09:54:34 -0300 Subject: grub: fix device tree patch --- ..._linux-20_linux_xen-detect-devicetree-dir.patch | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch (limited to 'libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch') diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch b/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch deleted file mode 100644 index 6eeced53d..000000000 --- a/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in ---- a/util/grub.d/10_linux.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/10_linux.in 2015-09-27 18:43:26.911364096 -0300 -@@ -139,6 +139,14 @@ - initrd ${rel_dirname}/${initrd} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version} -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -222,6 +230,10 @@ - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if test -d "${dirname}/dtbs/${version}" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}" >&2 -+ fi -+ - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then - linux_entry "${OS}" "${version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in ---- a/util/grub.d/20_linux_xen.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/20_linux_xen.in 2015-09-27 18:47:34.953427471 -0300 -@@ -132,6 +132,14 @@ - module --nounzip ${rel_dirname}/${initrd} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version} -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -235,6 +243,10 @@ - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if test -d "${dirname}/dtbs/${version}" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}" >&2 -+ fi -+ - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then - linux_entry "${OS}" "${version}" "${xen_version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" -- cgit v1.2.3-2-g168b