Rebase to version shipped with qemu 2.8

This commit is contained in:
Cole Robinson 2016-12-04 18:08:35 -05:00
parent f1f245f0ed
commit 912144213e
4 changed files with 15 additions and 11 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ noarch/
/ipxe-20150407-gitdc795b9f.tar.xz /ipxe-20150407-gitdc795b9f.tar.xz
/ipxe-20150821-git4e03af8.tar.xz /ipxe-20150821-git4e03af8.tar.xz
/ipxe-20160622-git0418631.tar.xz /ipxe-20160622-git0418631.tar.xz
/ipxe-20161108-gitb991c67.tar.xz

View File

@ -1,5 +1,5 @@
From 59b02541da838ce9a0246178deb3c377109589bb Mon Sep 17 00:00:00 2001 From b20b539a701c14af82d94b8ff7c22282fe5454d3 Mon Sep 17 00:00:00 2001
Message-Id: <59b02541da838ce9a0246178deb3c377109589bb.1447780013.git.crobinso@redhat.com> Message-Id: <b20b539a701c14af82d94b8ff7c22282fe5454d3.1480892146.git.crobinso@redhat.com>
From: Cole Robinson <crobinso@redhat.com> From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 17 Nov 2015 11:56:06 -0500 Date: Tue, 17 Nov 2015 11:56:06 -0500
Subject: [PATCH ipxe] build: Enable IPv6 for in qemu config Subject: [PATCH ipxe] build: Enable IPv6 for in qemu config
@ -12,16 +12,16 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1280318
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/src/config/qemu/general.h b/src/config/qemu/general.h diff --git a/src/config/qemu/general.h b/src/config/qemu/general.h
index 30f60d3..61d0ad4 100644 index a084497..e94eee2 100644
--- a/src/config/qemu/general.h --- a/src/config/qemu/general.h
+++ b/src/config/qemu/general.h +++ b/src/config/qemu/general.h
@@ -8,3 +8,6 @@ @@ -13,3 +13,6 @@
* without unrestricted_guest support
/* Work around missing EFI_PXE_BASE_CODE_PROTOCOL */ */
#define EFI_DOWNGRADE_UX #undef TIVOLI_VMM_WORKAROUND
+ +
+/* Enable IPv6 */ +/* Enable IPv6 */
+#define NET_PROTO_IPV6 +#define NET_PROTO_IPV6
-- --
2.5.0 2.9.3

View File

@ -37,8 +37,8 @@
# #
# And then change these two: # And then change these two:
%global hash 0418631 %global hash b991c67
%global date 20160622 %global date 20161108
Name: ipxe Name: ipxe
Version: %{date} Version: %{date}
@ -222,6 +222,9 @@ done
%endif %endif
%changelog %changelog
* Sun Dec 04 2016 Cole Robinson <crobinso@redhat.com> - 20161108-1.gitb991c67
- Rebase to version shipped with qemu 2.8
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20150821-3.git4e03af8 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20150821-3.git4e03af8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1 +1 @@
689ef95af01011a8ddf4d31fef38dee5 ipxe-20160622-git0418631.tar.xz e4e639cd1498c7f6d6c76ae283691aa0 ipxe-20161108-gitb991c67.tar.xz