summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-03 16:43:36 +0000
committerGerrit Code Review <review@openstack.org>2018-08-03 16:43:36 +0000
commit4651af29422b4834e1444f90d3554cef2e2c362c (patch)
treedd6a38ca3120d4aaa056d9bf5bcb2fb8a58eec77
parentc688c8410e899db2adb50eb7519e80ea601b3de0 (diff)
parentb7bce6b9ff7735515f64508af0b71d2eb6aba0b0 (diff)
Merge "Remove package seabios."
-rw-r--r--centos_pkg_dirs1
-rw-r--r--seabios/centos/build_srpm.data1
-rw-r--r--seabios/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch26
-rw-r--r--seabios/centos/meta_patches/PATCH_ORDER2
-rw-r--r--seabios/centos/meta_patches/meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch41
-rw-r--r--seabios/centos/patches/CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch67
-rw-r--r--seabios/centos/srpm_path1
7 files changed, 0 insertions, 139 deletions
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 @@
1seabios
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 @@
1TIS_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 @@
1From 2278e76d2a6933e91ee176386f7aa86529c2d3e8 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 17:01:00 -0400
4Subject: [PATCH 1/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
5
6Conflicts:
7 SPECS/seabios.spec
8---
9 SPECS/seabios.spec | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec
13index 0b255d3..1603f16 100644
14--- a/SPECS/seabios.spec
15+++ b/SPECS/seabios.spec
16@@ -1,6 +1,6 @@
17 Name: seabios
18 Version: 1.10.2
19-Release: 3%{?dist}.1
20+Release: 3.el7_4.1%{?_tis_dist}.%{tis_patch_ver}
21 Summary: Open-source legacy BIOS implementation
22
23 Group: Applications/Emulators
24--
251.9.1
26
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 @@
10001-Update-package-versioning-for-TIS-format.patch
2meta-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 @@
1From 604f198f6eb2d43452e35f51b98087a1bb872021 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 17:01:00 -0400
4Subject: [PATCH 2/2] WRS:
5 meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch
6
7Conflicts:
8 SPECS/seabios.spec
9---
10 SPECS/seabios.spec | 8 ++++++++
11 1 file changed, 8 insertions(+)
12
13diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec
14index 1603f16..d8c986f 100644
15--- a/SPECS/seabios.spec
16+++ b/SPECS/seabios.spec
17@@ -37,6 +37,11 @@ Patch10: seabios-virtio-scsi-enumerate-luns-with-REPORT-LUNS.patch
18 Patch11: seabios-usb-uas-enumerate-luns-with-REPORT-LUNS.patch
19 # For bz#1472131 - Guest OS will down when disk enable the IOMMU for Virtio
20 Patch12: seabios-virtio-IOMMU-support.patch
21+
22+# WRS patches
23+# CGTS-5175: Instance can not startup due to "No bootable device"
24+Patch100: CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch
25+
26 BuildRequires: python iasl
27 ExclusiveArch: x86_64 %{power64}
28
29@@ -99,6 +104,9 @@ SeaVGABIOS is an open-source VGABIOS implementation.
30 %patch11 -p1
31 %patch12 -p1
32
33+# WRS patches
34+%patch100 -p1
35+
36 %build
37 %ifarch x86_64
38 export CFLAGS="$RPM_OPT_FLAGS"
39--
401.9.1
41
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 @@
1From 7cc3d0e6149ea9276edef25ba85d08879ee40771 Mon Sep 17 00:00:00 2001
2From: Jim Gauld <james.gauld@windriver.com>
3Date: Thu, 6 Oct 2016 14:18:35 -0400
4Subject: [PATCH 1/1] CGTS-5175: Add instrumentation to debug boot failures
5 from disk
6
7This adds print statements with prefix "Debug:" showing
8boot register flags before and after interrupt, etc.
9
10In the case we get instances with "No bootable device", we want
11to see more information in the case where retry is not sufficient.
12---
13 src/boot.c | 7 ++++++-
14 1 file changed, 6 insertions(+), 1 deletion(-)
15
16diff --git a/src/boot.c b/src/boot.c
17index 706b7df..c89086b 100644
18--- a/src/boot.c
19+++ b/src/boot.c
20@@ -2,6 +2,7 @@
21 //
22 // Copyright (C) 2008-2013 Kevin O'Connor <kevin@koconnor.net>
23 // Copyright (C) 2002 MandrakeSoft S.A.
24+// Copyright (C) 2016 Wind River Systems, Inc. All rights reserved.
25 //
26 // This file may be distributed under the terms of the GNU LGPLv3 license.
27
28@@ -596,7 +597,7 @@ bcv_prepboot(void)
29 static void
30 call_boot_entry(struct segoff_s bootsegip, u8 bootdrv)
31 {
32- dprintf(1, "Booting from %04x:%04x\n", bootsegip.seg, bootsegip.offset);
33+ printf("Debug: Booting from %04x:%04x\n", bootsegip.seg, bootsegip.offset);
34 struct bregs br;
35 memset(&br, 0, sizeof(br));
36 br.flags = F_IF;
37@@ -622,9 +623,11 @@ boot_disk(u8 bootdrv, int checksig)
38 br.ah = 2;
39 br.al = 1;
40 br.cl = 1;
41+ printf("Debug: boot_disk: pre: br.flags=%04x\n", br.flags);
42 call16_int(0x13, &br);
43
44 if (br.flags & F_CF) {
45+ printf("Debug: boot_disk: post: br.flags=%04x, F_CF=%04x\n", br.flags, F_CF);
46 printf("Boot failed: could not read the boot disk\n\n");
47 return;
48 }
49@@ -719,6 +722,7 @@ do_boot(int seq_nr)
50 if (! CONFIG_BOOT)
51 panic("Boot support not compiled in.\n");
52
53+ printf("Debug: do_boot: seq_nr=%d, BEVCount=%d\n", seq_nr, BEVCount);
54 if (seq_nr >= BEVCount)
55 boot_fail();
56
57@@ -748,6 +752,7 @@ do_boot(int seq_nr)
58 }
59
60 // Boot failed: invoke the boot recovery function
61+ printf("Debug: do_boot: boot recovery\n");
62 struct bregs br;
63 memset(&br, 0, sizeof(br));
64 br.flags = F_IF;
65--
661.9.1
67
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 @@
1mirror:Source/seabios-1.10.2-3.el7_4.1.src.rpm