Browse Source

Merge "Remove package seabios."

changes/73/600173/1
Zuul 9 months ago
parent
commit
4651af2942

+ 0
- 1
centos_pkg_dirs View File

@@ -1 +0,0 @@
1
-seabios

+ 0
- 1
seabios/centos/build_srpm.data View File

@@ -1 +0,0 @@
1
-TIS_PATCH_VER=2

+ 0
- 25
seabios/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch View File

@@ -1,26 +0,0 @@
1
-From 2278e76d2a6933e91ee176386f7aa86529c2d3e8 Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 17:01:00 -0400
4
-Subject: [PATCH 1/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
5
-
6
-Conflicts:
7
-	SPECS/seabios.spec
8
----
9
- SPECS/seabios.spec | 2 +-
10
- 1 file changed, 1 insertion(+), 1 deletion(-)
11
-
12
-diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec
13
-index 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
-1.9.1
25
-

+ 0
- 2
seabios/centos/meta_patches/PATCH_ORDER View File

@@ -1,2 +0,0 @@
1
-0001-Update-package-versioning-for-TIS-format.patch
2
-meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch

+ 0
- 40
seabios/centos/meta_patches/meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch View File

@@ -1,41 +0,0 @@
1
-From 604f198f6eb2d43452e35f51b98087a1bb872021 Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 17:01:00 -0400
4
-Subject: [PATCH 2/2] WRS:
5
- meta-CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch
6
-
7
-Conflicts:
8
-	SPECS/seabios.spec
9
----
10
- SPECS/seabios.spec | 8 ++++++++
11
- 1 file changed, 8 insertions(+)
12
-
13
-diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec
14
-index 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
-1.9.1
40
-

+ 0
- 66
seabios/centos/patches/CGTS-5175-Add-instrumentation-to-debug-boot-failures.patch View File

@@ -1,67 +0,0 @@
1
-From 7cc3d0e6149ea9276edef25ba85d08879ee40771 Mon Sep 17 00:00:00 2001
2
-From: Jim Gauld <james.gauld@windriver.com>
3
-Date: Thu, 6 Oct 2016 14:18:35 -0400
4
-Subject: [PATCH 1/1] CGTS-5175: Add instrumentation to debug boot failures
5
- from disk
6
-
7
-This adds print statements with prefix "Debug:" showing
8
-boot register flags before and after interrupt, etc.
9
-
10
-In the case we get instances with "No bootable device", we want
11
-to 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
-
16
-diff --git a/src/boot.c b/src/boot.c
17
-index 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
-1.9.1
66
-

+ 0
- 1
seabios/centos/srpm_path View File

@@ -1 +0,0 @@
1
-mirror:Source/seabios-1.10.2-3.el7_4.1.src.rpm

Loading…
Cancel
Save