summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-09-28 01:28:53 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2015-09-28 01:28:53 -0300
commitbe1869f8b454629cf5fce9ca52343e1c7f22f4d1 (patch)
tree5f7502c442441d1fb6f00b5ef17649dedad300cb
parent55b0c3522ff56f6ef5e65d3a6b15428331d10d4d (diff)
grub: fix name devicetree path (dtb -> dtbs)
-rw-r--r--libre/grub/PKGBUILD4
-rw-r--r--libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch16
2 files changed, 10 insertions, 10 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index ad5792225..d2a7a4605 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -31,7 +31,7 @@ _UNIFONT_VER="6.3.20131217"
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
pkgver=2.02.beta2
-pkgrel=5.parabola3
+pkgrel=5.parabola4
epoch="1"
url="https://www.gnu.org/software/grub/"
arch=('x86_64' 'i686' 'armv7h')
@@ -93,7 +93,7 @@ md5sums=('SKIP'
'e506ae4a9f9f7d1b765febfa84e10d48'
'be55eabc102f2c60b38ed35c203686d6'
'8d1dd54ae4a1b550c097e056892ce953'
- '2687392cc5d709b4ef465b1efe91d053'
+ '4a73f776bbc5cb26969dc7ce3588da78'
'e0133ad89ab3014210d4599f396a556e')
validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
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
index 8c8e31788..6eeced53d 100644
--- 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
@@ -5,12 +5,12 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
initrd ${rel_dirname}/${initrd}
EOF
fi
-+ if test -d "${rel_dirname}/dtb/${version}" ; then
++ 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}/dtb/${version}
++ devicetree ${rel_dirname}/dtbs/${version}
+EOF
+ fi
sed "s/^/$submenu_indentation/" << EOF
@@ -20,8 +20,8 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
linux_root_device_thisversion=${GRUB_DEVICE}
fi
-+ if test -d "${dirname}/dtb/${version}" ; then
-+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtb/${version}" >&2
++ 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
@@ -34,12 +34,12 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
module --nounzip ${rel_dirname}/${initrd}
EOF
fi
-+ if test -d "${rel_dirname}/dtb/${version}" ; then
++ 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}/dtb/${version}
++ devicetree ${rel_dirname}/dtbs/${version}
+EOF
+ fi
sed "s/^/$submenu_indentation/" << EOF
@@ -49,8 +49,8 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
linux_root_device_thisversion=${GRUB_DEVICE}
fi
-+ if test -d "${dirname}/dtb/${version}" ; then
-+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtb/${version}" >&2
++ 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