diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 41f077c..e69de29 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1 +0,0 @@ -seabios diff --git a/seabios/centos/build_srpm.data b/seabios/centos/build_srpm.data deleted file mode 100644 index 70b4b5d..0000000 --- a/seabios/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=2 diff --git a/seabios/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/seabios/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index d83a5bc..0000000 --- a/seabios/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2278e76d2a6933e91ee176386f7aa86529c2d3e8 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 17:01:00 -0400 -Subject: [PATCH 1/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch - -Conflicts: - SPECS/seabios.spec ---- - SPECS/seabios.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec -index 0b255d3..1603f16 100644 ---- a/SPECS/seabios.spec -+++ b/SPECS/seabios.spec -@@ -1,6 +1,6 @@ - Name: seabios - Version: 1.10.2 --Release: 3%{?dist}.1 -+Release: 3.el7_4.1%{?_tis_dist}.%{tis_patch_ver} - Summary: Open-source legacy BIOS implementation - - Group: Applications/Emulators --- -1.9.1 - diff --git a/seabios/centos/meta_patches/PATCH_ORDER b/seabios/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 15fc799..0000000 --- a/seabios/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,2 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch -meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch diff --git a/seabios/centos/meta_patches/meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch b/seabios/centos/meta_patches/meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch deleted file mode 100644 index c7603b8..0000000 --- a/seabios/centos/meta_patches/meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 604f198f6eb2d43452e35f51b98087a1bb872021 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 17:01:00 -0400 -Subject: [PATCH 2/2] WRS: - meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch - -Conflicts: - SPECS/seabios.spec ---- - SPECS/seabios.spec | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec -index 1603f16..d8c986f 100644 ---- a/SPECS/seabios.spec -+++ b/SPECS/seabios.spec -@@ -37,6 +37,11 @@ Patch10: seabios-virtio-scsi-enumerate-luns-with-REPORT-LUNS.patch - Patch11: seabios-usb-uas-enumerate-luns-with-REPORT-LUNS.patch - # For bz#1472131 - Guest OS will down when disk enable the IOMMU for Virtio - Patch12: seabios-virtio-IOMMU-support.patch -+ -+# WRS patches -+# CGTS-5175: Instance can not startup due to "No bootable device" -+Patch100: CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch -+ - BuildRequires: python iasl - ExclusiveArch: x86_64 %{power64} - -@@ -99,6 +104,9 @@ SeaVGABIOS is an open-source VGABIOS implementation. - %patch11 -p1 - %patch12 -p1 - -+# WRS patches -+%patch100 -p1 -+ - %build - %ifarch x86_64 - export CFLAGS="$RPM_OPT_FLAGS" --- -1.9.1 - diff --git a/seabios/centos/patches/CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch b/seabios/centos/patches/CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch deleted file mode 100644 index 85201b5..0000000 --- a/seabios/centos/patches/CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 7cc3d0e6149ea9276edef25ba85d08879ee40771 Mon Sep 17 00:00:00 2001 -From: Jim Gauld -Date: Thu, 6 Oct 2016 14:18:35 -0400 -Subject: [PATCH 1/1] CGTS-5175: Add instrumentation to debug boot failures - from disk - -This adds print statements with prefix "Debug:" showing -boot register flags before and after interrupt, etc. - -In the case we get instances with "No bootable device", we want -to see more information in the case where retry is not sufficient. ---- - src/boot.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/boot.c b/src/boot.c -index 706b7df..c89086b 100644 ---- a/src/boot.c -+++ b/src/boot.c -@@ -2,6 +2,7 @@ - // - // Copyright (C) 2008-2013 Kevin O'Connor - // Copyright (C) 2002 MandrakeSoft S.A. -+// Copyright (C) 2016 Wind River Systems, Inc. All rights reserved. - // - // This file may be distributed under the terms of the GNU LGPLv3 license. - -@@ -596,7 +597,7 @@ bcv_prepboot(void) - static void - call_boot_entry(struct segoff_s bootsegip, u8 bootdrv) - { -- dprintf(1, "Booting from %04x:%04x\n", bootsegip.seg, bootsegip.offset); -+ printf("Debug: Booting from %04x:%04x\n", bootsegip.seg, bootsegip.offset); - struct bregs br; - memset(&br, 0, sizeof(br)); - br.flags = F_IF; -@@ -622,9 +623,11 @@ boot_disk(u8 bootdrv, int checksig) - br.ah = 2; - br.al = 1; - br.cl = 1; -+ printf("Debug: boot_disk: pre: br.flags=%04x\n", br.flags); - call16_int(0x13, &br); - - if (br.flags & F_CF) { -+ printf("Debug: boot_disk: post: br.flags=%04x, F_CF=%04x\n", br.flags, F_CF); - printf("Boot failed: could not read the boot disk\n\n"); - return; - } -@@ -719,6 +722,7 @@ do_boot(int seq_nr) - if (! CONFIG_BOOT) - panic("Boot support not compiled in.\n"); - -+ printf("Debug: do_boot: seq_nr=%d, BEVCount=%d\n", seq_nr, BEVCount); - if (seq_nr >= BEVCount) - boot_fail(); - -@@ -748,6 +752,7 @@ do_boot(int seq_nr) - } - - // Boot failed: invoke the boot recovery function -+ printf("Debug: do_boot: boot recovery\n"); - struct bregs br; - memset(&br, 0, sizeof(br)); - br.flags = F_IF; --- -1.9.1 - diff --git a/seabios/centos/srpm_path b/seabios/centos/srpm_path deleted file mode 100644 index b3329b1..0000000 --- a/seabios/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/seabios-1.10.2-3.el7_4.1.src.rpm