From 593ec3a7dc10feeefa880bf1dbe09de841d869e9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 10:51:15 +0000 Subject: import ipxe-20180825-2.git133f4c.el7 --- diff --git a/.gitignore b/.gitignore index 8e78d54..64aad46 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ipxe-20170123-git4e85b27.tar.gz +SOURCES/ipxe-20180825-git133f4c.tar.gz diff --git a/.ipxe.metadata b/.ipxe.metadata index cef9bec..d77eb14 100644 --- a/.ipxe.metadata +++ b/.ipxe.metadata @@ -1 +1 @@ -e5d6d7f33c916e934b0dc77ae1874acb8fa9cad3 SOURCES/ipxe-20170123-git4e85b27.tar.gz +0cd36a1ba686ad75b91cc56e1ae73e20aaec4188 SOURCES/ipxe-20180825-git133f4c.tar.gz diff --git a/SOURCES/0001-Add-redhat-directory.patch b/SOURCES/0001-Add-redhat-directory.patch index 696c9cb..81faef5 100644 --- a/SOURCES/0001-Add-redhat-directory.patch +++ b/SOURCES/0001-Add-redhat-directory.patch @@ -1,4 +1,4 @@ -From 8b3ac2eeb4538f015be22367a9e692cf9be995cd Mon Sep 17 00:00:00 2001 +From b75b2bfd6d8e7e4a8d8dc6910089209082fe5747 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 21 Oct 2015 09:40:25 +0200 Subject: Add redhat directory @@ -12,19 +12,19 @@ Merged patches (20170123): redhat/Makefile | 71 ++++++++ redhat/Makefile.common | 35 ++++ redhat/USAGE | 16 ++ - redhat/ipxe.spec.template | 337 +++++++++++++++++++++++++++++++++++++ + redhat/ipxe.spec.template | 347 +++++++++++++++++++++++++++++++++++++ redhat/rpmbuild/BUILD/.gitignore | 1 + redhat/rpmbuild/RPMS/.gitignore | 1 + redhat/rpmbuild/SOURCES/.gitignore | 1 + redhat/rpmbuild/SPECS/.gitignore | 1 + redhat/rpmbuild/SRPMS/.gitignore | 1 + redhat/scripts/frh.py | 27 +++ - redhat/scripts/git-backport-diff | 302 +++++++++++++++++++++++++++++++++ + redhat/scripts/git-backport-diff | 327 ++++++++++++++++++++++++++++++++++ redhat/scripts/git-compile-check | 215 +++++++++++++++++++++++ - redhat/scripts/process-patches.sh | 77 +++++++++ + redhat/scripts/process-patches.sh | 77 ++++++++ redhat/scripts/tarball_checksum.sh | 3 + src/config/local/general.h | 3 + - 17 files changed, 1101 insertions(+) + 17 files changed, 1136 insertions(+) create mode 100644 .gitpublish create mode 100644 redhat/.gitignore create mode 100644 redhat/Makefile diff --git a/SOURCES/0002-import-EfiRom-from-edk2-BaseTools-RHEL-only.patch b/SOURCES/0002-import-EfiRom-from-edk2-BaseTools-RHEL-only.patch index add56f7..f771fd8 100644 --- a/SOURCES/0002-import-EfiRom-from-edk2-BaseTools-RHEL-only.patch +++ b/SOURCES/0002-import-EfiRom-from-edk2-BaseTools-RHEL-only.patch @@ -1,4 +1,4 @@ -From d596880050a6009629af799243e09f337bcb944a Mon Sep 17 00:00:00 2001 +From 8b74bd14f38ed4defcdea3ef4a15869aa909a02e Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 21 Oct 2015 11:07:05 +0200 Subject: import EfiRom from edk2 BaseTools (RHEL only) diff --git a/SOURCES/0003-add-custom-Makefile-for-EfiRom-RHEL-only.patch b/SOURCES/0003-add-custom-Makefile-for-EfiRom-RHEL-only.patch index 20ca511..f90b3e7 100644 --- a/SOURCES/0003-add-custom-Makefile-for-EfiRom-RHEL-only.patch +++ b/SOURCES/0003-add-custom-Makefile-for-EfiRom-RHEL-only.patch @@ -1,4 +1,4 @@ -From 0a3c58a092024de34fce41b5c99e3c0ab756ece9 Mon Sep 17 00:00:00 2001 +From 3e446e7832cd4f66b352d25092a5dccaa78bd122 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 21 Oct 2015 11:08:59 +0200 Subject: add custom Makefile for EfiRom (RHEL only) diff --git a/SOURCES/0005-Use-spec-compliant-timeouts.patch b/SOURCES/0005-Use-spec-compliant-timeouts.patch index f1a4d50..ceabce8 100644 --- a/SOURCES/0005-Use-spec-compliant-timeouts.patch +++ b/SOURCES/0005-Use-spec-compliant-timeouts.patch @@ -1,4 +1,4 @@ -From bc252caa54fcfb2e9fd0ddb01ebaa50192e85c38 Mon Sep 17 00:00:00 2001 +From c3c4dcf208faeb694df7474743dd785f159d30f6 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Wed, 21 Oct 2015 11:18:40 +0200 Subject: Use spec compliant timeouts diff --git a/SOURCES/0008-Enable-IPv6-protocol-in-non-QEMU-builds.patch b/SOURCES/0008-Enable-IPv6-protocol-in-non-QEMU-builds.patch index 41501dd..7f47df4 100644 --- a/SOURCES/0008-Enable-IPv6-protocol-in-non-QEMU-builds.patch +++ b/SOURCES/0008-Enable-IPv6-protocol-in-non-QEMU-builds.patch @@ -1,4 +1,4 @@ -From ed29bb447c66b611172d682ef32688f7597aacf7 Mon Sep 17 00:00:00 2001 +From ebdaa4f4f00c71cc200861fac96066a1e38dd7f1 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Tue, 28 Jun 2016 14:23:19 +0200 Subject: Enable IPv6 protocol in non-QEMU builds diff --git a/SOURCES/0009-Strip-802.1Q-VLAN-0-priority-tags.patch b/SOURCES/0009-Strip-802.1Q-VLAN-0-priority-tags.patch index e7289a6..ac31349 100644 --- a/SOURCES/0009-Strip-802.1Q-VLAN-0-priority-tags.patch +++ b/SOURCES/0009-Strip-802.1Q-VLAN-0-priority-tags.patch @@ -1,4 +1,4 @@ -From 1a921ececb22bbc41d1fda34576564e84d124a83 Mon Sep 17 00:00:00 2001 +From 2f542b36b149b32325f85ce89a6823ff97a6d675 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Mon, 11 Jul 2016 14:17:36 +0200 Subject: Strip 802.1Q VLAN 0 priority tags @@ -53,10 +53,10 @@ index 2eb6817..2ea1451 100644 switch ( net_proto ) { case htons ( ETH_P_IP ): diff --git a/src/include/ipxe/netdevice.h b/src/include/ipxe/netdevice.h -index a1d207f..cea87f7 100644 +index d498ab6..27dda45 100644 --- a/src/include/ipxe/netdevice.h +++ b/src/include/ipxe/netdevice.h -@@ -719,6 +719,8 @@ extern int net_tx ( struct io_buffer *iobuf, struct net_device *netdev, +@@ -726,6 +726,8 @@ extern int net_tx ( struct io_buffer *iobuf, struct net_device *netdev, extern int net_rx ( struct io_buffer *iobuf, struct net_device *netdev, uint16_t net_proto, const void *ll_dest, const void *ll_source, unsigned int flags ); @@ -66,10 +66,10 @@ index a1d207f..cea87f7 100644 extern struct net_device_configurator * find_netdev_configurator ( const char *name ); diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c -index e6388bf..d1a1a44 100644 +index 9c1b14d..6b974d4 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c -@@ -745,6 +745,13 @@ efi_snp_receive ( EFI_SIMPLE_NETWORK_PROTOCOL *snp, +@@ -813,6 +813,13 @@ efi_snp_receive ( EFI_SIMPLE_NETWORK_PROTOCOL *snp, goto out_bad_ll_header; } @@ -84,10 +84,10 @@ index e6388bf..d1a1a44 100644 if ( ll_header_len ) *ll_header_len = ll_protocol->ll_header_len; diff --git a/src/net/netdevice.c b/src/net/netdevice.c -index 9df2119..c53d5e3 100644 +index 71a37ec..fdf541b 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c -@@ -1028,6 +1028,44 @@ int net_rx ( struct io_buffer *iobuf, struct net_device *netdev, +@@ -1044,6 +1044,44 @@ int net_rx ( struct io_buffer *iobuf, struct net_device *netdev, } /** @@ -132,7 +132,7 @@ index 9df2119..c53d5e3 100644 * Poll the network stack * * This polls all interfaces for received packets, and processes -@@ -1078,6 +1116,12 @@ void net_poll ( void ) { +@@ -1094,6 +1132,12 @@ void net_poll ( void ) { continue; } diff --git a/SOURCES/ipxe-Support-VIRTIO_NET_F_IOMMU_PLATFORM.patch b/SOURCES/ipxe-Support-VIRTIO_NET_F_IOMMU_PLATFORM.patch deleted file mode 100644 index 96dc56a..0000000 --- a/SOURCES/ipxe-Support-VIRTIO_NET_F_IOMMU_PLATFORM.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 615cbcc0d0ebf1509aa15bfc4468aabae3e93626 Mon Sep 17 00:00:00 2001 -From: Xiao Wang -Date: Tue, 18 Jul 2017 09:05:06 +0200 -Subject: [PATCH] Support VIRTIO_NET_F_IOMMU_PLATFORM - -RH-Author: Xiao Wang -Message-id: <1500368706-1228-1-git-send-email-jasowang@redhat.com> -Patchwork-id: 75798 -O-Subject: [RHEL7.4z ipxe PATCH] [virtio] Support VIRTIO_NET_F_IOMMU_PLATFORM -Bugzilla: 1481180 -RH-Acked-by: wexu@redhat.com -RH-Acked-by: Jens Freimann -RH-Acked-by: Maxime Coquelin -RH-Acked-by: Michael S. Tsirkin - -Bugzilla: 1467887 -Test status: Tested by my self -Brew Build: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=13674196 - -Since we don't enable IOMMU at all, we can then simply enable the -IOMMU support by claiming the support of VIRITO_F_IOMMU_PLATFORM. -This fixes booting failure when iommu_platform is set from qemu cli. - -Signed-off-by: Jason Wang -Signed-off-by: Michael Brown -(cherry picked from commit 6a258d8d5523c9b529ae2607d7f49e48eea8beeb) -Signed-off-by: Miroslav Rezanina ---- - src/drivers/net/virtio-net.c | 3 ++- - src/include/ipxe/virtio-ring.h | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/drivers/net/virtio-net.c b/src/drivers/net/virtio-net.c -index 4151532..fe79a92 100644 ---- a/src/drivers/net/virtio-net.c -+++ b/src/drivers/net/virtio-net.c -@@ -259,7 +259,8 @@ static int virtnet_open_modern ( struct net_device *netdev ) { - ( 1ULL << VIRTIO_NET_F_MAC ) | - ( 1ULL << VIRTIO_NET_F_MTU ) | - ( 1ULL << VIRTIO_F_VERSION_1 ) | -- ( 1ULL << VIRTIO_F_ANY_LAYOUT ) ) ); -+ ( 1ULL << VIRTIO_F_ANY_LAYOUT ) | -+ ( 1ULL << VIRTIO_F_IOMMU_PLATFORM ) ) ); - vpm_add_status ( &virtnet->vdev, VIRTIO_CONFIG_S_FEATURES_OK ); - - status = vpm_get_status ( &virtnet->vdev ); -diff --git a/src/include/ipxe/virtio-ring.h b/src/include/ipxe/virtio-ring.h -index e608e62..852769f 100644 ---- a/src/include/ipxe/virtio-ring.h -+++ b/src/include/ipxe/virtio-ring.h -@@ -20,6 +20,7 @@ - #define VIRTIO_F_ANY_LAYOUT 27 - /* v1.0 compliant. */ - #define VIRTIO_F_VERSION_1 32 -+#define VIRTIO_F_IOMMU_PLATFORM 33 - - #define MAX_QUEUE_NUM (256) - --- -1.8.3.1 - diff --git a/SOURCES/ipxe-vlan-cmds.patch b/SOURCES/ipxe-vlan-cmds.patch new file mode 100644 index 0000000..c5dfa43 --- /dev/null +++ b/SOURCES/ipxe-vlan-cmds.patch @@ -0,0 +1,12 @@ +diff -up ./src/config/general.h.vlan ./src/config/general.h +--- ./src/config/general.h.vlan 2018-10-09 13:11:42.940904753 -0400 ++++ ./src/config/general.h 2018-10-09 13:12:03.258821711 -0400 +@@ -140,7 +140,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); + //#define TIME_CMD /* Time commands */ + //#define DIGEST_CMD /* Image crypto digest commands */ + //#define LOTEST_CMD /* Loopback testing commands */ +-//#define VLAN_CMD /* VLAN commands */ ++#define VLAN_CMD /* VLAN commands */ + //#define PXE_CMD /* PXE commands */ + //#define REBOOT_CMD /* Reboot command */ + //#define POWEROFF_CMD /* Power off command */ diff --git a/SPECS/ipxe.spec b/SPECS/ipxe.spec index 8d18b23..f9a5226 100644 --- a/SPECS/ipxe.spec +++ b/SPECS/ipxe.spec @@ -35,12 +35,12 @@ # # And then change these two: -%global date 20170123 -%global hash 4e85b27 +%global date 20180825 +%global hash 133f4c Name: ipxe Version: %{date} -Release: 1.git%{hash}%{?dist}.1 +Release: 2.git%{hash}%{?dist} Summary: A network boot loader Group: System Environment/Base @@ -50,14 +50,13 @@ URL: http://ipxe.org/ Source0: %{name}-%{date}-git%{hash}.tar.gz Source1: USAGE -Patch1: 0001-Add-redhat-directory.patch -Patch2: 0002-import-EfiRom-from-edk2-BaseTools-RHEL-only.patch -Patch3: 0003-add-custom-Makefile-for-EfiRom-RHEL-only.patch -Patch4: 0005-Use-spec-compliant-timeouts.patch -Patch5: 0008-Enable-IPv6-protocol-in-non-QEMU-builds.patch -Patch6: 0009-Strip-802.1Q-VLAN-0-priority-tags.patch -# For bz#1481180 - iommu platform support for ipxe [rhel-7.4.z] -Patch7: ipxe-Support-VIRTIO_NET_F_IOMMU_PLATFORM.patch +Patch0001: 0001-Add-redhat-directory.patch +Patch0002: 0002-import-EfiRom-from-edk2-BaseTools-RHEL-only.patch +Patch0003: 0003-add-custom-Makefile-for-EfiRom-RHEL-only.patch +Patch0005: 0005-Use-spec-compliant-timeouts.patch +Patch0008: 0008-Enable-IPv6-protocol-in-non-QEMU-builds.patch +Patch0009: 0009-Strip-802.1Q-VLAN-0-priority-tags.patch +Patch0010: ipxe-vlan-cmds.patch %ifarch %{buildarches} BuildRequires: perl @@ -124,13 +123,13 @@ cp -a %{SOURCE1} . patch_command="patch -p1 -s" -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%patch0001 -p1 +%patch0002 -p1 +%patch0003 -p1 +%patch0005 -p1 +%patch0008 -p1 +%patch0009 -p1 +%patch0010 -p1 %build %ifarch %{buildarches} @@ -227,10 +226,18 @@ done %endif %changelog -* Thu Aug 17 2017 Miroslav Rezanina - 20170123-1.git4e85b27.el7_4.1 -- ipxe-Support-VIRTIO_NET_F_IOMMU_PLATFORM.patch [bz#1481180] -- Resolves: bz#1481180 - (iommu platform support for ipxe [rhel-7.4.z]) +* Mon Jan 14 2019 Neil Horman - 20180825-2.git133f4c.el7 +- Enable vcreate and vdestroy commands (1583231) + +* Mon Dec 17 2018 Miroslav Rezanina - 20180825-1.git133f4c.el7 +- Rebase to newer upstream [bz#1597210] +- Resolves: bz#1597210 + (Rebase ipxe to latest upstream) + +* Thu Aug 17 2017 Miroslav Rezanina - 20170123-2.git4e85b27.el7 +- ipxe-Support-VIRTIO_NET_F_IOMMU_PLATFORM.patch [bz#1467887] +- Resolves: bz#1467887 + (iommu platform support for ipxe) * Fri Mar 10 2017 Miroslav Rezanina - 20170123-1.git4e85b27.el7 - Rebase to commit 4e85b27 [bz#1413781]