[legal] Relicense files under GPL2_OR_LATER_OR_UBDL

Relicence files with kind permission from the following contributors:

  Alex Williamson <alex.williamson@redhat.com>
  Eduardo Habkost <ehabkost@redhat.com>
  Greg Jednaszewski <jednaszewski@gmail.com>
  H. Peter Anvin <hpa@zytor.com>
  Marin Hannache <git@mareo.fr>
  Robin Smidsrød <robin@smidsrod.no>
  Shao Miller <sha0.miller@gmail.com>
  Thomas Horsten <thomas@horsten.com>

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/i386/core/pci_autoboot.c b/src/arch/i386/core/pci_autoboot.c
index a3eb1f97dda58644a3353f8fef946fe43631750e..3375980919e3fc127da99a2844d35a00d26749ee 100644 (file)
--- a/src/arch/i386/core/pci_autoboot.c
+++ b/src/arch/i386/core/pci_autoboot.c
@@ -16,9 +16,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/device.h>

diff --git a/src/arch/i386/firmware/pcbios/fakee820.c b/src/arch/i386/firmware/pcbios/fakee820.c
index e5f7137281c2d2588bf13529eb36dab4f1d37ad6..15f4d772f4c8e18ddc1a78d8fc3f169cc80d743f 100644 (file)
--- a/src/arch/i386/firmware/pcbios/fakee820.c
+++ b/src/arch/i386/firmware/pcbios/fakee820.c
@@ -14,9 +14,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <realmode.h>
 #include <biosint.h>

diff --git a/src/arch/i386/include/pxe_api.h b/src/arch/i386/include/pxe_api.h
index e4396efb2307e332999db209e8e5892f41b54160..3110d26dab8479637f478e3b22c85e4faeed3bef 100644 (file)
--- a/src/arch/i386/include/pxe_api.h
+++ b/src/arch/i386/include/pxe_api.h
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ *
  * As an alternative, at your option, you may use this file under the
  * following terms, known as the "MIT license":
  *
@@ -49,7 +53,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include "pxe_types.h"
 

diff --git a/src/arch/i386/interface/pcbios/apm.c b/src/arch/i386/interface/pcbios/apm.c
index 3b13e1cd060ee30465c0c417cacc3885fdfdb8e0..50b19cb81dd53c92700705268218053c1abd2d12 100644 (file)
--- a/src/arch/i386/interface/pcbios/apm.c
+++ b/src/arch/i386/interface/pcbios/apm.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /**
  * @file

diff --git a/src/arch/i386/interface/pxe/pxe_entry.S b/src/arch/i386/interface/pxe/pxe_entry.S
index 6274264ff9d730dffea3c3d81f591f740182ede6..07852cd502a9a0e4d32dace58707f48db8b37a41 100644 (file)
--- a/src/arch/i386/interface/pxe/pxe_entry.S
+++ b/src/arch/i386/interface/pxe/pxe_entry.S
@@ -16,9 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER )
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
        .arch i386
 

diff --git a/src/arch/i386/interface/pxe/pxe_exit_hook.c b/src/arch/i386/interface/pxe/pxe_exit_hook.c
index 9d18965077f3b69faf7776d2ed4aa409f41dcd89..f92dae0d1d107b9cbbe48cfe441669eb06357fd0 100644 (file)
--- a/src/arch/i386/interface/pxe/pxe_exit_hook.c
+++ b/src/arch/i386/interface/pxe/pxe_exit_hook.c
@@ -21,9 +21,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <realmode.h>

diff --git a/src/arch/i386/interface/pxe/pxe_file.c b/src/arch/i386/interface/pxe/pxe_file.c
index 6e9610294aa96810def1f88455ce7bc27bba11bd..456ffb5fd738040c0252b84c3898ec081849b435 100644 (file)
--- a/src/arch/i386/interface/pxe/pxe_file.c
+++ b/src/arch/i386/interface/pxe/pxe_file.c
@@ -31,9 +31,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 FEATURE ( FEATURE_MISC, "PXEXT", DHCP_EB_FEATURE_PXE_EXT, 2 );
 

diff --git a/src/config/dhcp.h b/src/config/dhcp.h
index 21e863b4fdfc133391769e2e447816a8f997d6ac..49fe16b924d316f01cd3c1bd662e0a96326e6995 100644 (file)
--- a/src/config/dhcp.h
+++ b/src/config/dhcp.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 

diff --git a/src/core/exec.c b/src/core/exec.c
index 1c85705aec61dc11802a77c4b353af0f75457a5a..2c2ade0a55a11994850b8a1394558993369784dd 100644 (file)
--- a/src/core/exec.c
+++ b/src/core/exec.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <string.h>

diff --git a/src/core/getopt.c b/src/core/getopt.c
index abc1edd6cbf644ef957ef9ed16fc8dcc55057b61..e6c3948d12f7016d0861e2f347c856bb3865f9bf 100644 (file)
--- a/src/core/getopt.c
+++ b/src/core/getopt.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <string.h>

diff --git a/src/core/null_reboot.c b/src/core/null_reboot.c
index a3d5b2ef85a2e6c2fd23b67df74f55d1a081a884..7be5612a3d31ea9cb29edb4f5263c311c1fc2fc3 100644 (file)
--- a/src/core/null_reboot.c
+++ b/src/core/null_reboot.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /**
  * @file

diff --git a/src/drivers/infiniband/qib7322.c b/src/drivers/infiniband/qib7322.c
index 9979b346e9c97ed6b1fc5d312ead9cdcbf849c0f..e22f2349a343b5374d3dd462c2bd925f90c748b4 100644 (file)
--- a/src/drivers/infiniband/qib7322.c
+++ b/src/drivers/infiniband/qib7322.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index a9e831bf507c1e0aad186b8c211a472885a12f9a..4a7c500a45b2885e96cdda19a3cf54bf97fe5379 100644 (file)
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/src/hci/commands/poweroff_cmd.c b/src/hci/commands/poweroff_cmd.c
index 9d487d330a301a60c5d003f2dbfbf17a9887dc76..afdf12dde55d8dbe535d14a72a9a0e838f6c842f 100644 (file)
--- a/src/hci/commands/poweroff_cmd.c
+++ b/src/hci/commands/poweroff_cmd.c
@@ -15,6 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
 #include <stdio.h>
@@ -24,7 +28,7 @@
 #include <ipxe/parseopt.h>
 #include <ipxe/reboot.h>
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** @file
  *

diff --git a/src/include/ipxe/mount.h b/src/include/ipxe/mount.h
index ca958117a5c0b846b79aa85db2e644164fb1775b..2d42ba0800ac7495df8007a4eec3cda3bc1ed612 100644 (file)
--- a/src/include/ipxe/mount.h
+++ b/src/include/ipxe/mount.h
@@ -9,7 +9,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** NFS MOUNT protocol number */
 #define ONCRPC_MOUNT 100005

diff --git a/src/include/ipxe/nfs.h b/src/include/ipxe/nfs.h
index 498ed5a27b1ae82387aa4be9dea41955e97648c5..69b8b538169e2a7a442bbf01738a4586db60b10c 100644 (file)
--- a/src/include/ipxe/nfs.h
+++ b/src/include/ipxe/nfs.h
@@ -10,7 +10,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** NFS protocol number */
 #define ONCRPC_NFS 100003

diff --git a/src/include/ipxe/nfs_open.h b/src/include/ipxe/nfs_open.h
index caba977f7d4a661f725e67e5b9e1ddb6d5f99d4c..8572c41b388182e5c436fed24350a3e09e6e77a4 100644 (file)
--- a/src/include/ipxe/nfs_open.h
+++ b/src/include/ipxe/nfs_open.h
@@ -7,6 +7,6 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #endif /* _IPXE_NFS_OPEN_H */

diff --git a/src/include/ipxe/nfs_uri.h b/src/include/ipxe/nfs_uri.h
index d88bd6f658463221f7ea39f467fee8ef92b23e37..aaa6d374910f6f8815a1f1ac5a7b36bb9bf7c44b 100644 (file)
--- a/src/include/ipxe/nfs_uri.h
+++ b/src/include/ipxe/nfs_uri.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/uri.h>
 

diff --git a/src/include/ipxe/oncrpc.h b/src/include/ipxe/oncrpc.h
index 76c1260f2343f1999f2a0c16513ba578b64239b4..071468711212a0fb20102f188dfdc2772b7ba10f 100644 (file)
--- a/src/include/ipxe/oncrpc.h
+++ b/src/include/ipxe/oncrpc.h
@@ -11,7 +11,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** ONC RCP Version */
 #define ONCRPC_VERS 2

diff --git a/src/include/ipxe/oncrpc_iob.h b/src/include/ipxe/oncrpc_iob.h
index 4858d96b507496fe7be32c3a5181c48c372b96d4..b550437709cb615da99c683c3c144384b95efcb6 100644 (file)
--- a/src/include/ipxe/oncrpc_iob.h
+++ b/src/include/ipxe/oncrpc_iob.h
@@ -13,7 +13,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /**
  * Add a string to the end of an I/O buffer

diff --git a/src/include/ipxe/portmap.h b/src/include/ipxe/portmap.h
index 9b735bbca0f2a0e9d00414d00fd4dfead341c2f6..681ca2ec23dbd9818745ada59f241d9999a213f3 100644 (file)
--- a/src/include/ipxe/portmap.h
+++ b/src/include/ipxe/portmap.h
@@ -10,7 +10,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** PORTMAP default port */
 #define PORTMAP_PORT   111

diff --git a/src/include/ipxe/reboot.h b/src/include/ipxe/reboot.h
index 97e0d5fb6daa955cad98559dbd1f05ba4ff966ff..33606d9d5b29a316d402f08fe64dc68a23684aa1 100644 (file)
--- a/src/include/ipxe/reboot.h
+++ b/src/include/ipxe/reboot.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/api.h>
 #include <config/reboot.h>

diff --git a/src/interface/efi/efi_reboot.c b/src/interface/efi/efi_reboot.c
index 96638c48e7b3036c324a965f48972ba09d6c3b7b..35919221e8cd4e1744355faefe33ca4e5a5acdc0 100644 (file)
--- a/src/interface/efi/efi_reboot.c
+++ b/src/interface/efi/efi_reboot.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /**
  * @file

diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index 8cd19cf808a10116c8567bb5c4625d978167d75d..cdb632b462eeeab5080a5afa43174ffbd61298a3 100644 (file)
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/src/net/infiniband.c b/src/net/infiniband.c
index 12d1d83cee34eed80e49a6c4106a77867097e4ca..fcc8a639680ff8aa553006510ca97ef20e011332 100644 (file)
--- a/src/net/infiniband.c
+++ b/src/net/infiniband.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c
index b3b2e68d8b5441772b17e497e6e75c0712c302a1..677d5a9a65cf5f8b49a191c2434eadfbcd4e124b 100644 (file)
--- a/src/net/netdev_settings.c
+++ b/src/net/netdev_settings.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <string.h>
 #include <errno.h>