aboutsummaryrefslogtreecommitdiffstats
path: root/src/include/ipxe
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2015-03-02 13:29:46 +0000
committerMichael Brown <mcb30@ipxe.org>2015-03-02 16:35:29 +0000
commit2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4 (patch)
treeeb6f49f4b9358fe64fdf6fa9b1c1e044e2530bef /src/include/ipxe
parent626ccf76eafeaf22144e36bb3822766b08b5443e (diff)
downloadipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.tar.gz
[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>
Diffstat (limited to 'src/include/ipxe')
-rw-r--r--src/include/ipxe/arp.h2
-rw-r--r--src/include/ipxe/bitmap.h2
-rw-r--r--src/include/ipxe/blockdev.h2
-rw-r--r--src/include/ipxe/crc32.h2
-rw-r--r--src/include/ipxe/crypto.h2
-rw-r--r--src/include/ipxe/dhcp.h2
-rw-r--r--src/include/ipxe/editbox.h2
-rw-r--r--src/include/ipxe/editstring.h2
-rw-r--r--src/include/ipxe/errfile.h2
-rw-r--r--src/include/ipxe/ethernet.h2
-rw-r--r--src/include/ipxe/features.h2
-rw-r--r--src/include/ipxe/fragment.h2
-rw-r--r--src/include/ipxe/http.h2
-rw-r--r--src/include/ipxe/if_ether.h2
-rw-r--r--src/include/ipxe/in.h2
-rw-r--r--src/include/ipxe/init.h2
-rw-r--r--src/include/ipxe/io.h2
-rw-r--r--src/include/ipxe/iobuf.h2
-rw-r--r--src/include/ipxe/ip.h2
-rw-r--r--src/include/ipxe/isa_ids.h2
-rw-r--r--src/include/ipxe/netdevice.h2
-rw-r--r--src/include/ipxe/rarp.h2
-rw-r--r--src/include/ipxe/refcnt.h2
-rw-r--r--src/include/ipxe/settings.h2
-rw-r--r--src/include/ipxe/smbios.h2
-rw-r--r--src/include/ipxe/tcp.h2
-rw-r--r--src/include/ipxe/tcpip.h2
-rw-r--r--src/include/ipxe/udp.h2
-rw-r--r--src/include/ipxe/uri.h2
-rw-r--r--src/include/ipxe/vlan.h2
30 files changed, 30 insertions, 30 deletions
diff --git a/src/include/ipxe/arp.h b/src/include/ipxe/arp.h
index e30ae6b76..93195010a 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 b18584c1f..38aca694b 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 9f0a9f787..418c43004 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 38ac1b31f..30d2fe66c 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 3eda5ec6e..fc0d8b22b 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 a35794bdd..a11db3497 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 9122dbbf3..2c70e0b6b 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 2ef546a63..a00a8adaa 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 353d8ca3a..a71a60354 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 d1263d7c3..dd04e00ce 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 d8b8b2184..e86a2d226 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 e311ad1e4..0069e5e08 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 cf8c0c7fa..421598b54 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 a7e237349..58d91b976 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 de96ca22a..75f23123d 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 19c5925bf..e051dc6cd 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 29ccfd1fa..af767915d 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 d7c10ab44..27d285d44 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 1a93a552e..285be6dcd 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 1faf1148d..d815bda34 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 f471e2519..8e615c941 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 f84301a43..9054db21a 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 0e8b8658c..7f489abc9 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 d6929ecd0..45d600b20 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 ef5892a21..24b05ed62 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 9baa6391c..f12b4283f 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 200630d6b..73a7bffd3 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 5717ef213..7b0de4dc0 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 fb7728aa0..00e5a24c4 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 083c21916..439e0c16d 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 {