From 144dc9ca8007cb4390bd9ba3e8b018d7fd92be2c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 11 Aug 2017 18:05:08 +0200 Subject: boot/grub: remove grub is no longer maintained: it is stuck at version 0.97 with huge patches that have no opportunity to be applied upstream, as upstream has even renamed it grub-legacy. Besides, it no longer builds correctly with recent binutils versions, and even the huge patches we could grab from Debian do not help the slightest. Since upstream really considers it dead, and there are at least two alternatives (grub2 and syslinux), just remove grub. Add a legacy entry. Remove the test cases as well. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/fs/test_iso9660.py | 37 -------------------------------- 1 file changed, 37 deletions(-) (limited to 'support/testing/tests/fs/test_iso9660.py') diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py index eec6e89d69..e804808c96 100644 --- a/support/testing/tests/fs/test_iso9660.py +++ b/support/testing/tests/fs/test_iso9660.py @@ -84,43 +84,6 @@ BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}" exit_code = test_touch_file(self.emulator) self.assertEqual(exit_code, 0) -# -# Grub -# - -class TestIso9660GrubExternal(infra.basetest.BRTest): - config = BASIC_CONFIG + \ -""" -BR2_TARGET_ROOTFS_ISO9660=y -# BR2_TARGET_ROOTFS_ISO9660_INITRD is not set -BR2_TARGET_GRUB=y -BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}" -""".format(infra.filepath("conf/grub-menu.lst")) - - def test_run(self): - exit_code = test_mount_internal_external(self.emulator, - self.builddir, internal=False) - self.assertEqual(exit_code, 0) - - exit_code = test_touch_file(self.emulator) - self.assertEqual(exit_code, 1) - -class TestIso9660GrubInternal(infra.basetest.BRTest): - config = BASIC_CONFIG + \ -""" -BR2_TARGET_ROOTFS_ISO9660=y -BR2_TARGET_GRUB=y -BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}" -""".format(infra.filepath("conf/grub-menu.lst")) - - def test_run(self): - exit_code = test_mount_internal_external(self.emulator, - self.builddir, internal=True) - self.assertEqual(exit_code, 0) - - exit_code = test_touch_file(self.emulator) - self.assertEqual(exit_code, 0) - # # Syslinux # -- cgit v1.2.3