Compare commits

...

No commits in common. "c8s-stream-rhel" and "c9-beta" have entirely different histories.

4 changed files with 36 additions and 32 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/sgabios-20170427-gitcbaee52.tar.xz SOURCES/sgabios-20180715-git72f39d4.tar.xz

View File

@ -1 +1 @@
5e233c2aee6b1d3b2b6a48f2052796cda80e785e SOURCES/sgabios-20170427-gitcbaee52.tar.xz 63c12b9e4f25247173bb5413e2c3cc90ba28defd SOURCES/sgabios-20180715-git72f39d4.tar.xz

View File

@ -1,19 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@
LDSCRIPT := rom16.ld
LDFLAGS := -T $(LDSCRIPT) -nostdlib
OBJCOPY := objcopy
+HOSTCC := $(CC)
ASRCS = sgabios.S
@@ -55,7 +56,7 @@
$(LD) $(LDFLAGS) $(OBJS) -o $@
csum8: csum8.c
- $(CC) -Wall -O2 -o $@ $<
+ $(HOSTCC) -Wall -O2 -o $@ $<
sgabios.o: buildinfo

View File

@ -2,17 +2,16 @@
%define cross 1 %define cross 1
%endif %endif
%global hash cbaee52 %global hash 72f39d4
%global date 20170427 %global date 20180715
Name: sgabios Name: sgabios
Epoch: 1 Epoch: 1
Version: 0.%{date}git Version: 0.%{date}git
Release: 3%{?dist} Release: 8%{?dist}
Summary: Serial graphics BIOS option rom Summary: Serial graphics BIOS option rom
Group: Applications/Emulators
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/qemu/sgabios URL: https://github.com/qemu/sgabios
# There are no upstream releases. This archive is prepared as follows: # There are no upstream releases. This archive is prepared as follows:
@ -23,7 +22,6 @@ URL: https://github.com/qemu/sgabios
# date=`git log -1 --format='%cd' --date=short | tr -d -` # date=`git log -1 --format='%cd' --date=short | tr -d -`
# git archive --prefix sgabios-${date}-git${hash}/ ${hash} | xz -7e > ../openbios-${date}-git${hash}.tar.xz # git archive --prefix sgabios-${date}-git${hash}/ ${hash} | xz -7e > ../openbios-${date}-git${hash}.tar.xz
Source0: sgabios-%{date}-git%{hash}.tar.xz Source0: sgabios-%{date}-git%{hash}.tar.xz
Patch0: sgabios-hostcc.patch
%if 0%{?cross} %if 0%{?cross}
BuildRequires: binutils-x86_64-linux-gnu gcc-x86_64-linux-gnu BuildRequires: binutils-x86_64-linux-gnu gcc-x86_64-linux-gnu
@ -31,6 +29,8 @@ Buildarch: noarch
%else %else
ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64
%endif %endif
BuildRequires: make
BuildRequires: gcc
Requires: %{name}-bin = %{epoch}:%{version}-%{release} Requires: %{name}-bin = %{epoch}:%{version}-%{release}
@ -89,13 +89,36 @@ install -m 0644 sgabios.bin $RPM_BUILD_ROOT%{_datadir}/sgabios
%changelog %changelog
* Fri Jun 28 2019 Danilo de Paula <ddepaula@redhat.com> - 1:0.20170427git-3 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.20180715git-8
- Rebuild all virt packages to fix RHEL's upgrade path - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
- Resolves: rhbz#1695587 Related: rhbz#1991688
(Ensure modular RPM upgrade path)
* Wed Jun 27 2018 Danilo de Paula <ddepaula@redhat.com> - 1:0.20170427git-2 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.20180715git-7
- Trigger a new sgabios build - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.20180715git-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.20180715git-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.20180715git-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.20180715git-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.20180715git-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 31 2018 Cole Robinson <crobinso@redhat.com> - 1:0.20180715.git-1
- Update to qemu sgabios 72f39d4
* Mon Jul 23 2018 Paolo Bonzini <pbonzini@redhat.com> - 1:0.20170427git-3
- Add explicit BuildRequires for GCC (Resolves: #1606338)
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.20170427git-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Mar 25 2018 Cole Robinson <crobinso@redhat.com> - 1:0.20170427git-1 * Sun Mar 25 2018 Cole Robinson <crobinso@redhat.com> - 1:0.20170427git-1
- Switch to qemu sgabios repo, which has an extra bugfix - Switch to qemu sgabios repo, which has an extra bugfix