[legal] Relicense files under GPL2_OR_LATER_OR_UBDL

These files cannot be automatically relicensed by util/relicense.pl
since they either contain unusual but trivial contributions (such as
the addition of __nonnull function attributes), or contain lines
dating back to the initial git revision (and so require manual
knowledge of the code's origin).

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

37 files changed, 41 insertions, 37 deletions

diff --git a/src/include/curses.h b/src/include/curses.h
index f16f9d7d..04060fe2 100644
--- a/src/include/curses.h
+++ b/src/include/curses.h
@@ -11,7 +11,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #undef  ERR
 #define ERR	(-1)
diff --git a/src/include/hci/ifmgmt_cmd.h b/src/include/hci/ifmgmt_cmd.h
index 913b911d..5debf85c 100644
--- a/src/include/hci/ifmgmt_cmd.h
+++ b/src/include/hci/ifmgmt_cmd.h
@@ -15,12 +15,16 @@
  * 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.
  */
 
 #ifndef _IFMGMT_CMD_H
 #define _IFMGMT_CMD_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/parseopt.h>
 
diff --git a/src/include/ipxe/arp.h b/src/include/ipxe/arp.h
index e30ae6b7..93195010 100644
--- a/src/include/ipxe/arp.h
+++ b/src/include/ipxe/arp.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/tables.h>
 #include <ipxe/netdevice.h>
diff --git a/src/include/ipxe/bitmap.h b/src/include/ipxe/bitmap.h
index b18584c1..38aca694 100644
--- a/src/include/ipxe/bitmap.h
+++ b/src/include/ipxe/bitmap.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/include/ipxe/blockdev.h b/src/include/ipxe/blockdev.h
index 9f0a9f78..418c4300 100644
--- a/src/include/ipxe/blockdev.h
+++ b/src/include/ipxe/blockdev.h
@@ -8,7 +8,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/uaccess.h>
diff --git a/src/include/ipxe/crc32.h b/src/include/ipxe/crc32.h
index 38ac1b31..30d2fe66 100644
--- a/src/include/ipxe/crc32.h
+++ b/src/include/ipxe/crc32.h
@@ -1,7 +1,7 @@
 #ifndef _IPXE_CRC32_H
 #define _IPXE_CRC32_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 
diff --git a/src/include/ipxe/crypto.h b/src/include/ipxe/crypto.h
index 3eda5ec6..fc0d8b22 100644
--- a/src/include/ipxe/crypto.h
+++ b/src/include/ipxe/crypto.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/include/ipxe/dhcp.h b/src/include/ipxe/dhcp.h
index a35794bd..a11db349 100644
--- a/src/include/ipxe/dhcp.h
+++ b/src/include/ipxe/dhcp.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/src/include/ipxe/editbox.h b/src/include/ipxe/editbox.h
index 9122dbbf..2c70e0b6 100644
--- a/src/include/ipxe/editbox.h
+++ b/src/include/ipxe/editbox.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <curses.h>
 #include <ipxe/editstring.h>
diff --git a/src/include/ipxe/editstring.h b/src/include/ipxe/editstring.h
index 2ef546a6..a00a8ada 100644
--- a/src/include/ipxe/editstring.h
+++ b/src/include/ipxe/editstring.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** An editable string */
 struct edit_string {
diff --git a/src/include/ipxe/errfile.h b/src/include/ipxe/errfile.h
index 353d8ca3..a71a6035 100644
--- a/src/include/ipxe/errfile.h
+++ b/src/include/ipxe/errfile.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <bits/errfile.h>
 
diff --git a/src/include/ipxe/ethernet.h b/src/include/ipxe/ethernet.h
index d1263d7c..dd04e00c 100644
--- a/src/include/ipxe/ethernet.h
+++ b/src/include/ipxe/ethernet.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/netdevice.h>
diff --git a/src/include/ipxe/features.h b/src/include/ipxe/features.h
index d8b8b218..e86a2d22 100644
--- a/src/include/ipxe/features.h
+++ b/src/include/ipxe/features.h
@@ -11,7 +11,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /**
  * @defgroup featurecat Feature categories
diff --git a/src/include/ipxe/fragment.h b/src/include/ipxe/fragment.h
index e311ad1e..0069e5e0 100644
--- a/src/include/ipxe/fragment.h
+++ b/src/include/ipxe/fragment.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/list.h>
diff --git a/src/include/ipxe/http.h b/src/include/ipxe/http.h
index cf8c0c7f..421598b5 100644
--- a/src/include/ipxe/http.h
+++ b/src/include/ipxe/http.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** HTTP default port */
 #define HTTP_PORT 80
diff --git a/src/include/ipxe/if_ether.h b/src/include/ipxe/if_ether.h
index a7e23734..58d91b97 100644
--- a/src/include/ipxe/if_ether.h
+++ b/src/include/ipxe/if_ether.h
@@ -1,7 +1,7 @@
 #ifndef	_IPXE_IF_ETHER_H
 #define	_IPXE_IF_ETHER_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 
diff --git a/src/include/ipxe/in.h b/src/include/ipxe/in.h
index de96ca22..75f23123 100644
--- a/src/include/ipxe/in.h
+++ b/src/include/ipxe/in.h
@@ -1,7 +1,7 @@
 #ifndef	_IPXE_IN_H
 #define	_IPXE_IN_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/socket.h>
diff --git a/src/include/ipxe/init.h b/src/include/ipxe/init.h
index 19c5925b..e051dc6c 100644
--- a/src/include/ipxe/init.h
+++ b/src/include/ipxe/init.h
@@ -1,7 +1,7 @@
 #ifndef _IPXE_INIT_H
 #define _IPXE_INIT_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/tables.h>
 
diff --git a/src/include/ipxe/io.h b/src/include/ipxe/io.h
index 29ccfd1f..af767915 100644
--- a/src/include/ipxe/io.h
+++ b/src/include/ipxe/io.h
@@ -16,7 +16,7 @@
  * the address parameter.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/api.h>
diff --git a/src/include/ipxe/iobuf.h b/src/include/ipxe/iobuf.h
index d7c10ab4..27d285d4 100644
--- a/src/include/ipxe/iobuf.h
+++ b/src/include/ipxe/iobuf.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <assert.h>
diff --git a/src/include/ipxe/ip.h b/src/include/ipxe/ip.h
index 1a93a552..285be6dc 100644
--- a/src/include/ipxe/ip.h
+++ b/src/include/ipxe/ip.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/in.h>
diff --git a/src/include/ipxe/isa_ids.h b/src/include/ipxe/isa_ids.h
index 1faf1148..d815bda3 100644
--- a/src/include/ipxe/isa_ids.h
+++ b/src/include/ipxe/isa_ids.h
@@ -19,7 +19,7 @@
  * the underlying "meaning" is big-endian.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <byteswap.h>
 
diff --git a/src/include/ipxe/netdevice.h b/src/include/ipxe/netdevice.h
index f471e251..8e615c94 100644
--- a/src/include/ipxe/netdevice.h
+++ b/src/include/ipxe/netdevice.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/list.h>
diff --git a/src/include/ipxe/rarp.h b/src/include/ipxe/rarp.h
index f84301a4..9054db21 100644
--- a/src/include/ipxe/rarp.h
+++ b/src/include/ipxe/rarp.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/netdevice.h>
 
diff --git a/src/include/ipxe/refcnt.h b/src/include/ipxe/refcnt.h
index 0e8b8658..7f489abc 100644
--- a/src/include/ipxe/refcnt.h
+++ b/src/include/ipxe/refcnt.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>
 #include <assert.h>
diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h
index d6929ecd..45d600b2 100644
--- a/src/include/ipxe/settings.h
+++ b/src/include/ipxe/settings.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/smbios.h b/src/include/ipxe/smbios.h
index ef5892a2..24b05ed6 100644
--- a/src/include/ipxe/smbios.h
+++ b/src/include/ipxe/smbios.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/api.h>
diff --git a/src/include/ipxe/tcp.h b/src/include/ipxe/tcp.h
index 9baa6391..f12b4283 100644
--- a/src/include/ipxe/tcp.h
+++ b/src/include/ipxe/tcp.h
@@ -9,7 +9,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/tcpip.h>
 
diff --git a/src/include/ipxe/tcpip.h b/src/include/ipxe/tcpip.h
index 200630d6..73a7bffd 100644
--- a/src/include/ipxe/tcpip.h
+++ b/src/include/ipxe/tcpip.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/socket.h>
diff --git a/src/include/ipxe/udp.h b/src/include/ipxe/udp.h
index 5717ef21..7b0de4dc 100644
--- a/src/include/ipxe/udp.h
+++ b/src/include/ipxe/udp.h
@@ -9,7 +9,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>
 #include <ipxe/iobuf.h>
diff --git a/src/include/ipxe/uri.h b/src/include/ipxe/uri.h
index fb7728aa..00e5a24c 100644
--- a/src/include/ipxe/uri.h
+++ b/src/include/ipxe/uri.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/src/include/ipxe/vlan.h b/src/include/ipxe/vlan.h
index 083c2191..439e0c16 100644
--- a/src/include/ipxe/vlan.h
+++ b/src/include/ipxe/vlan.h
@@ -8,7 +8,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** A VLAN header */
 struct vlan_header {
diff --git a/src/include/readline/readline.h b/src/include/readline/readline.h
index 0449a3f9..afafbbdf 100644
--- a/src/include/readline/readline.h
+++ b/src/include/readline/readline.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** A readline history entry */
 struct readline_history_entry {
diff --git a/src/include/stdint.h b/src/include/stdint.h
index 8cc9b84a..0a239a51 100644
--- a/src/include/stdint.h
+++ b/src/include/stdint.h
@@ -1,7 +1,7 @@
 #ifndef _STDINT_H
 #define _STDINT_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /*
  * This is a standard predefined macro on all gcc's I've seen. It's
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 819b87b3..d7748a07 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -1,7 +1,7 @@
 #ifndef STDLIB_H
 #define STDLIB_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <assert.h>
diff --git a/src/include/usr/autoboot.h b/src/include/usr/autoboot.h
index bc51aae7..c0603a0a 100644
--- a/src/include/usr/autoboot.h
+++ b/src/include/usr/autoboot.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/device.h>
 
diff --git a/src/include/wchar.h b/src/include/wchar.h
index ba349aae..d054b8d5 100644
--- a/src/include/wchar.h
+++ b/src/include/wchar.h
@@ -1,7 +1,7 @@
 #ifndef WCHAR_H
 #define WCHAR_H
 
-FILE_LICENCE ( GPL2_ONLY );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>