From 625e52baf1485ce810f76504954469d37e6ac3df Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 21 Oct 2017 16:46:08 -0500 Subject: grub: Removing 0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch --- ..._xen-detect-omap3_beagle+-devicetree-file.patch | 92 ---------------------- 1 file changed, 92 deletions(-) delete mode 100644 libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch (limited to 'libre/grub') diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch deleted file mode 100644 index b620a39d0..000000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle+-devicetree-file.patch +++ /dev/null @@ -1,92 +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-10-16 08:28:56.901970897 -0300 -+++ b/util/grub.d/10_linux.in 2015-10-16 08:30:45.112786124 -0300 -@@ -139,6 +139,25 @@ - initrd ${rel_dirname}/${initrd} - EOF - fi -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb -+EOF -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb -+EOF -+ fi -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -222,6 +241,16 @@ - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 -+ fi -+ 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-10-16 08:28:56.901970897 -0300 -+++ b/util/grub.d/20_linux_xen.in 2015-10-16 08:31:03.152921373 -0300 -@@ -132,6 +132,25 @@ - module --nounzip ${rel_dirname}/${initrd} - EOF - fi -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb -+EOF -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb -+EOF -+ fi -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -235,6 +254,16 @@ - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 -+ fi -+ 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