[legal] Relicense files under GPL2_OR_LATER_OR_UBDL

Relicense files with kind permission from

    Stefan Hajnoczi <stefanha@redhat.com>

alongside the contributors who have already granted such relicensing
permission.

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

diff --git a/src/arch/i386/core/gdbmach.c b/src/arch/i386/core/gdbmach.c
index 4d6897f7d3d79abea70b09064c68c6f80e154efd..d92a4ac08a9feccc579bb28ac18ccfaac913995a 100644 (file)
--- a/src/arch/i386/core/gdbmach.c
+++ b/src/arch/i386/core/gdbmach.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 <stddef.h>
 #include <stdio.h>

diff --git a/src/arch/i386/drivers/net/undiload.c b/src/arch/i386/drivers/net/undiload.c
index 77134dcb8aae7af90fee2fc4e84c56bc26ae19cc..7160ee3840b578f3e04a02f8f54ebfdd9f477063 100644 (file)
--- a/src/arch/i386/drivers/net/undiload.c
+++ b/src/arch/i386/drivers/net/undiload.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/arch/i386/prefix/kkpxeprefix.S b/src/arch/i386/prefix/kkpxeprefix.S
index d7dd31573d7322003495e305f303a9451cc87fd1..3c17dbdb18ba5ebd404f95e365ff3ae787eb2f33 100644 (file)
--- a/src/arch/i386/prefix/kkpxeprefix.S
+++ b/src/arch/i386/prefix/kkpxeprefix.S
@@ -3,7 +3,7 @@
  *****************************************************************************
  */
 
-FILE_LICENCE ( GPL2_OR_LATER )
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
 #define PXELOADER_KEEP_UNDI
 #define PXELOADER_KEEP_PXE

diff --git a/src/core/fnrec.c b/src/core/fnrec.c
index 3453c8b6af307828ddc2738f96532e06fed9c8da..0430817f876bb751d56c32d7b12fa3ff29cf1e10 100644 (file)
--- a/src/core/fnrec.c
+++ b/src/core/fnrec.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 <stdlib.h>
 #include <stdio.h>

diff --git a/src/core/gdbserial.c b/src/core/gdbserial.c
index 6f78c88bfa88a167e220a08dd481f51bba6c8f5a..255acea718e8a5554245217deb12091327132b01 100644 (file)
--- a/src/core/gdbserial.c
+++ b/src/core/gdbserial.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 <assert.h>
 #include <ipxe/serial.h>

diff --git a/src/core/gdbstub.c b/src/core/gdbstub.c
index af06118b2efa51af2f7acabc44ec70f3638756d1..6ad52d1a65d97aa484b6ba3faaa27ee26dba20d4 100644 (file)
--- a/src/core/gdbstub.c
+++ b/src/core/gdbstub.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/core/gdbudp.c b/src/core/gdbudp.c
index 5977547c8f5eed52c7c5684850ab6dab818ecd21..e4613d13786fe50e3140808afdb1b8178bda6ffc 100644 (file)
--- a/src/core/gdbudp.c
+++ b/src/core/gdbudp.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 <stdio.h>
 #include <string.h>

diff --git a/src/drivers/net/virtio-net.c b/src/drivers/net/virtio-net.c
index d5fd8197975da869a6b401413f21e252aee73786..8b67d9dd9b0818ee3c5e2bc273aed3e74d9fc83b 100644 (file)
--- a/src/drivers/net/virtio-net.c
+++ b/src/drivers/net/virtio-net.c
@@ -20,7 +20,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <errno.h>
 #include <stdlib.h>

diff --git a/src/drivers/net/vxge/vxge.c b/src/drivers/net/vxge/vxge.c
index 9c587722bc5545511196aa413942b464fac0e757..d50ac05b546d98eadb193e8b392a2a965a3f4466 100644 (file)
--- a/src/drivers/net/vxge/vxge.c
+++ b/src/drivers/net/vxge/vxge.c
@@ -5,7 +5,7 @@
  * as "vxge" even though the code is in vxge_* named files.
  */
 
-FILE_LICENCE(GPL2_OR_LATER);
+FILE_LICENCE(GPL2_OR_LATER_OR_UBDL);
 
 #include <ipxe/pci.h>
 

diff --git a/src/hci/commands/gdbstub_cmd.c b/src/hci/commands/gdbstub_cmd.c
index 33890aebc9fb3073badc850cc9b08b0e93b2ee9e..c4a831e7ae1b7734167aefddb9aff7f12ff09cc0 100644 (file)
--- a/src/hci/commands/gdbstub_cmd.c
+++ b/src/hci/commands/gdbstub_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 <stdio.h>
 #include <errno.h>

diff --git a/src/include/ipxe/gdbserial.h b/src/include/ipxe/gdbserial.h
index a3b56173cbf3b1b166055eaf5f3ec99b135d1f29..d02fb8d1b6023da9f50a1a53af923699848d3a8a 100644 (file)
--- a/src/include/ipxe/gdbserial.h
+++ b/src/include/ipxe/gdbserial.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 struct gdb_transport;
 

diff --git a/src/include/ipxe/gdbstub.h b/src/include/ipxe/gdbstub.h
index 31960674731542f5f118cbd4386e672bd500641c..13ca33ddb28211c8dcadaf009f63092a8225ff57 100644 (file)
--- a/src/include/ipxe/gdbstub.h
+++ b/src/include/ipxe/gdbstub.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/tables.h>

diff --git a/src/include/ipxe/gdbudp.h b/src/include/ipxe/gdbudp.h
index db7a451c908c850ccb69592bea2fa6d9fdeb4a3c..a1c09152253915b8c8b68256d11230560d86612f 100644 (file)
--- a/src/include/ipxe/gdbudp.h
+++ b/src/include/ipxe/gdbudp.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 struct sockaddr_in;
 struct gdb_transport;

diff --git a/src/include/ipxe/serial.h b/src/include/ipxe/serial.h
index b47b1d1252b78aa779409076ee8e44d32fa84fc6..86d05370d40df59de9166b7ecd432256e0d22b46 100644 (file)
--- a/src/include/ipxe/serial.h
+++ b/src/include/ipxe/serial.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 extern void serial_putc ( int ch );
 extern int serial_getc ( void );

diff --git a/src/net/vlan.c b/src/net/vlan.c
index b4ddde42d419e8aef5c09bb249314080fdd64db6..49e3257a020ece587e4799a13efef31dc6ea5af2 100644 (file)
--- a/src/net/vlan.c
+++ b/src/net/vlan.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>