Bladeren bron

[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>
tags/v1.20.1
Michael Brown 9 jaren geleden
bovenliggende
commit
2f020a8df3
100 gewijzigde bestanden met toevoegingen van 275 en 107 verwijderingen
  1. 5
    1
      src/arch/i386/core/patch_cf.S
  2. 1
    1
      src/arch/i386/core/relocate.c
  3. 5
    1
      src/arch/i386/firmware/pcbios/bios_console.c
  4. 5
    1
      src/arch/i386/firmware/pcbios/e820mangler.S
  5. 5
    1
      src/arch/i386/firmware/pcbios/memmap.c
  6. 5
    1
      src/arch/i386/image/multiboot.c
  7. 1
    1
      src/arch/i386/include/bits/byteswap.h
  8. 1
    1
      src/arch/i386/include/bits/stdint.h
  9. 1
    1
      src/arch/i386/include/bzimage.h
  10. 8
    3
      src/arch/i386/include/efi/ipxe/dhcp_arch.h
  11. 1
    1
      src/arch/i386/include/librm.h
  12. 1
    1
      src/arch/i386/include/limits.h
  13. 8
    3
      src/arch/i386/include/pcbios/ipxe/dhcp_arch.h
  14. 1
    1
      src/arch/i386/include/pxe.h
  15. 1
    1
      src/arch/i386/include/pxe_call.h
  16. 1
    1
      src/arch/i386/include/registers.h
  17. 5
    1
      src/arch/i386/interface/pcbios/bios_timer.c
  18. 5
    1
      src/arch/i386/interface/pxe/pxe_call.c
  19. 5
    1
      src/arch/i386/interface/pxe/pxe_preboot.c
  20. 5
    1
      src/arch/i386/interface/pxe/pxe_tftp.c
  21. 5
    1
      src/arch/i386/interface/pxe/pxe_undi.c
  22. 5
    1
      src/arch/i386/prefix/libprefix.S
  23. 1
    1
      src/arch/i386/prefix/romprefix.S
  24. 1
    1
      src/arch/i386/prefix/undiloader.S
  25. 1
    1
      src/arch/i386/transitions/librm.S
  26. 1
    1
      src/arch/i386/transitions/librm_mgmt.c
  27. 5
    1
      src/arch/x86/core/x86_tcpip.c
  28. 1
    1
      src/arch/x86/include/bits/errfile.h
  29. 5
    1
      src/arch/x86/include/bits/string.h
  30. 8
    3
      src/arch/x86/include/linux/ipxe/dhcp_arch.h
  31. 1
    1
      src/arch/x86/include/pic8259.h
  32. 8
    3
      src/arch/x86_64/include/efi/ipxe/dhcp_arch.h
  33. 1
    1
      src/config/colour.h
  34. 5
    1
      src/config/config.c
  35. 5
    1
      src/config/config_romprefix.c
  36. 1
    1
      src/config/defaults/pcbios.h
  37. 1
    1
      src/config/general.h
  38. 5
    1
      src/core/bitmap.c
  39. 5
    1
      src/core/cwuri.c
  40. 5
    1
      src/core/downloader.c
  41. 5
    1
      src/core/image.c
  42. 1
    1
      src/core/main.c
  43. 5
    1
      src/core/posix_io.c
  44. 5
    1
      src/core/refcnt.c
  45. 5
    1
      src/core/resolv.c
  46. 5
    1
      src/core/timer.c
  47. 5
    1
      src/core/uri.c
  48. 5
    1
      src/core/vsprintf.c
  49. 5
    1
      src/drivers/bus/pci.c
  50. 1
    1
      src/drivers/bus/pciextra.c
  51. 5
    1
      src/hci/editstring.c
  52. 5
    1
      src/hci/tui/menu_ui.c
  53. 1
    1
      src/image/embedded.c
  54. 1
    1
      src/include/curses.h
  55. 5
    1
      src/include/hci/ifmgmt_cmd.h
  56. 1
    1
      src/include/ipxe/arp.h
  57. 1
    1
      src/include/ipxe/bitmap.h
  58. 1
    1
      src/include/ipxe/blockdev.h
  59. 1
    1
      src/include/ipxe/crc32.h
  60. 1
    1
      src/include/ipxe/crypto.h
  61. 1
    1
      src/include/ipxe/dhcp.h
  62. 1
    1
      src/include/ipxe/editbox.h
  63. 1
    1
      src/include/ipxe/editstring.h
  64. 1
    1
      src/include/ipxe/errfile.h
  65. 1
    1
      src/include/ipxe/ethernet.h
  66. 1
    1
      src/include/ipxe/features.h
  67. 1
    1
      src/include/ipxe/fragment.h
  68. 1
    1
      src/include/ipxe/http.h
  69. 1
    1
      src/include/ipxe/if_ether.h
  70. 1
    1
      src/include/ipxe/in.h
  71. 1
    1
      src/include/ipxe/init.h
  72. 1
    1
      src/include/ipxe/io.h
  73. 1
    1
      src/include/ipxe/iobuf.h
  74. 1
    1
      src/include/ipxe/ip.h
  75. 1
    1
      src/include/ipxe/isa_ids.h
  76. 1
    1
      src/include/ipxe/netdevice.h
  77. 1
    1
      src/include/ipxe/rarp.h
  78. 1
    1
      src/include/ipxe/refcnt.h
  79. 1
    1
      src/include/ipxe/settings.h
  80. 1
    1
      src/include/ipxe/smbios.h
  81. 1
    1
      src/include/ipxe/tcp.h
  82. 1
    1
      src/include/ipxe/tcpip.h
  83. 1
    1
      src/include/ipxe/udp.h
  84. 1
    1
      src/include/ipxe/uri.h
  85. 1
    1
      src/include/ipxe/vlan.h
  86. 1
    1
      src/include/readline/readline.h
  87. 1
    1
      src/include/stdint.h
  88. 1
    1
      src/include/stdlib.h
  89. 1
    1
      src/include/usr/autoboot.h
  90. 1
    1
      src/include/wchar.h
  91. 5
    1
      src/interface/smbios/smbios_settings.c
  92. 5
    1
      src/net/aoe.c
  93. 5
    1
      src/net/arp.c
  94. 5
    1
      src/net/eth_slow.c
  95. 5
    1
      src/net/ethernet.c
  96. 5
    1
      src/net/ipv4.c
  97. 5
    1
      src/net/netdevice.c
  98. 1
    1
      src/net/tcp.c
  99. 5
    1
      src/net/tcp/httpcore.c
  100. 0
    0
      src/net/tcpip.c

+ 5
- 1
src/arch/i386/core/patch_cf.S Bestand weergeven

@@ -14,9 +14,13 @@
14 14
  * You should have received a copy of the GNU General Public License
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
17
+ *
18
+ * You can also choose to distribute this program under the terms of
19
+ * the Unmodified Binary Distribution Licence (as given in the file
20
+ * COPYING.UBDL), provided that you have satisfied its requirements.
17 21
  */
18 22
 
19
-FILE_LICENCE ( GPL2_OR_LATER )
23
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
20 24
 
21 25
 	.text
22 26
 	.arch i386

+ 1
- 1
src/arch/i386/core/relocate.c Bestand weergeven

@@ -8,7 +8,7 @@
8 8
  *
9 9
  */
10 10
 
11
-FILE_LICENCE ( GPL2_OR_LATER );
11
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
12 12
 
13 13
 /*
14 14
  * The linker passes in the symbol _max_align, which is the alignment

+ 5
- 1
src/arch/i386/firmware/pcbios/bios_console.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <assert.h>
23 27
 #include <realmode.h>

+ 5
- 1
src/arch/i386/firmware/pcbios/e820mangler.S Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER )
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
21 25
 
22 26
 	.text
23 27
 	.arch i386

+ 5
- 1
src/arch/i386/firmware/pcbios/memmap.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdint.h>
23 27
 #include <errno.h>

+ 5
- 1
src/arch/i386/image/multiboot.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 /**
23 27
  * @file

+ 1
- 1
src/arch/i386/include/bits/byteswap.h Bestand weergeven

@@ -9,7 +9,7 @@
9 9
 
10 10
 #include <stdint.h>
11 11
 
12
-FILE_LICENCE ( GPL2_OR_LATER );
12
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
13 13
 
14 14
 static inline __attribute__ (( always_inline, const )) uint16_t
15 15
 __bswap_variable_16 ( uint16_t x ) {

+ 1
- 1
src/arch/i386/include/bits/stdint.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef _BITS_STDINT_H
2 2
 #define _BITS_STDINT_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 typedef __SIZE_TYPE__		size_t;
7 7
 typedef signed long		ssize_t;

+ 1
- 1
src/arch/i386/include/bzimage.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef _BZIMAGE_H
2 2
 #define _BZIMAGE_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <stdint.h>
7 7
 

+ 8
- 3
src/arch/i386/include/efi/ipxe/dhcp_arch.h Bestand weergeven

@@ -4,7 +4,7 @@
4 4
  * This program is free software; you can redistribute it and/or
5 5
  * modify it under the terms of the GNU General Public License as
6 6
  * published by the Free Software Foundation; either version 2 of the
7
- * License, or any later version.
7
+ * License, or (at your option) any later version.
8 8
  *
9 9
  * This program is distributed in the hope that it will be useful, but
10 10
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +13,12 @@
13 13
  *
14 14
  * You should have received a copy of the GNU General Public License
15 15
  * along with this program; if not, write to the Free Software
16
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
16
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17
+ * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
17 22
  */
18 23
 
19 24
 #ifndef _DHCP_ARCH_H
@@ -24,7 +29,7 @@
24 29
  * Architecture-specific DHCP options
25 30
  */
26 31
 
27
-FILE_LICENCE ( GPL2_OR_LATER );
32
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
28 33
 
29 34
 #include <ipxe/dhcp.h>
30 35
 

+ 1
- 1
src/arch/i386/include/librm.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef LIBRM_H
2 2
 #define LIBRM_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 /* Segment selectors as used in our protected-mode GDTs.
7 7
  *

+ 1
- 1
src/arch/i386/include/limits.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef LIMITS_H
2 2
 #define LIMITS_H	1
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 /* Number of bits in a `char' */
7 7
 #define CHAR_BIT	8

+ 8
- 3
src/arch/i386/include/pcbios/ipxe/dhcp_arch.h Bestand weergeven

@@ -4,7 +4,7 @@
4 4
  * This program is free software; you can redistribute it and/or
5 5
  * modify it under the terms of the GNU General Public License as
6 6
  * published by the Free Software Foundation; either version 2 of the
7
- * License, or any later version.
7
+ * License, or (at your option) any later version.
8 8
  *
9 9
  * This program is distributed in the hope that it will be useful, but
10 10
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +13,12 @@
13 13
  *
14 14
  * You should have received a copy of the GNU General Public License
15 15
  * along with this program; if not, write to the Free Software
16
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
16
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17
+ * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
17 22
  */
18 23
 
19 24
 #ifndef _DHCP_ARCH_H
@@ -24,7 +29,7 @@
24 29
  * Architecture-specific DHCP options
25 30
  */
26 31
 
27
-FILE_LICENCE ( GPL2_OR_LATER );
32
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
28 33
 
29 34
 #include <ipxe/dhcp.h>
30 35
 

+ 1
- 1
src/arch/i386/include/pxe.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef PXE_H
2 2
 #define PXE_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include "pxe_types.h"
7 7
 #include "pxe_error.h"

+ 1
- 1
src/arch/i386/include/pxe_call.h Bestand weergeven

@@ -6,7 +6,7 @@
6 6
  * PXE API entry point
7 7
  */
8 8
 
9
-FILE_LICENCE ( GPL2_OR_LATER );
9
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
10 10
 
11 11
 #include <pxe_api.h>
12 12
 #include <realmode.h>

+ 1
- 1
src/arch/i386/include/registers.h Bestand weergeven

@@ -10,7 +10,7 @@
10 10
  *
11 11
  */
12 12
 
13
-FILE_LICENCE ( GPL2_OR_LATER );
13
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
14 14
 
15 15
 #include <stdint.h>
16 16
 

+ 5
- 1
src/arch/i386/interface/pcbios/bios_timer.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 /** @file
23 27
  *

+ 5
- 1
src/arch/i386/interface/pxe/pxe_call.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <ipxe/uaccess.h>
23 27
 #include <ipxe/init.h>

+ 5
- 1
src/arch/i386/interface/pxe/pxe_preboot.c Bestand weergeven

@@ -22,9 +22,13 @@
22 22
  * along with this program; if not, write to the Free Software
23 23
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
24 24
  * 02110-1301, USA.
25
+ *
26
+ * You can also choose to distribute this program under the terms of
27
+ * the Unmodified Binary Distribution Licence (as given in the file
28
+ * COPYING.UBDL), provided that you have satisfied its requirements.
25 29
  */
26 30
 
27
-FILE_LICENCE ( GPL2_OR_LATER );
31
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
28 32
 
29 33
 #include <stdint.h>
30 34
 #include <string.h>

+ 5
- 1
src/arch/i386/interface/pxe/pxe_tftp.c Bestand weergeven

@@ -21,9 +21,13 @@
21 21
  * along with this program; if not, write to the Free Software
22 22
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
23 23
  * 02110-1301, USA.
24
+ *
25
+ * You can also choose to distribute this program under the terms of
26
+ * the Unmodified Binary Distribution Licence (as given in the file
27
+ * COPYING.UBDL), provided that you have satisfied its requirements.
24 28
  */
25 29
 
26
-FILE_LICENCE ( GPL2_OR_LATER );
30
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
27 31
 
28 32
 #include <stdlib.h>
29 33
 #include <stdio.h>

+ 5
- 1
src/arch/i386/interface/pxe/pxe_undi.c Bestand weergeven

@@ -21,9 +21,13 @@
21 21
  * along with this program; if not, write to the Free Software
22 22
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
23 23
  * 02110-1301, USA.
24
+ *
25
+ * You can also choose to distribute this program under the terms of
26
+ * the Unmodified Binary Distribution Licence (as given in the file
27
+ * COPYING.UBDL), provided that you have satisfied its requirements.
24 28
  */
25 29
 
26
-FILE_LICENCE ( GPL2_OR_LATER );
30
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
27 31
 
28 32
 #include <stdint.h>
29 33
 #include <stdio.h>

+ 5
- 1
src/arch/i386/prefix/libprefix.S Bestand weergeven

@@ -16,9 +16,13 @@
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18 18
  *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
22
+ *
19 23
  */
20 24
 
21
-FILE_LICENCE ( GPL2_OR_LATER )
25
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
22 26
 
23 27
 	.arch i386
24 28
 

+ 1
- 1
src/arch/i386/prefix/romprefix.S Bestand weergeven

@@ -6,7 +6,7 @@
6 6
  * table so using a noticeable amount of stack space is a no-no.
7 7
  */
8 8
 
9
-FILE_LICENCE ( GPL2_OR_LATER )
9
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
10 10
 
11 11
 #include <config/general.h>
12 12
 #include <config/branding.h>

+ 1
- 1
src/arch/i386/prefix/undiloader.S Bestand weergeven

@@ -1,4 +1,4 @@
1
-FILE_LICENCE ( GPL2_OR_LATER )
1
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
2 2
 
3 3
 	.text
4 4
 	.code16

+ 1
- 1
src/arch/i386/transitions/librm.S Bestand weergeven

@@ -5,7 +5,7 @@
5 5
  *
6 6
  */
7 7
 
8
-FILE_LICENCE ( GPL2_OR_LATER )
8
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
9 9
 
10 10
 /* Drag in local definitions */
11 11
 #include "librm.h"

+ 1
- 1
src/arch/i386/transitions/librm_mgmt.c Bestand weergeven

@@ -5,7 +5,7 @@
5 5
  *
6 6
  */
7 7
 
8
-FILE_LICENCE ( GPL2_OR_LATER );
8
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
9 9
 
10 10
 #include <stdint.h>
11 11
 #include <ipxe/profile.h>

+ 5
- 1
src/arch/x86/core/x86_tcpip.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 /** @file
23 27
  *

+ 1
- 1
src/arch/x86/include/bits/errfile.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef _BITS_ERRFILE_H
2 2
 #define _BITS_ERRFILE_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 /**
7 7
  * @addtogroup errfile Error file identifiers

+ 5
- 1
src/arch/x86/include/bits/string.h Bestand weergeven

@@ -18,9 +18,13 @@
18 18
  * along with this program; if not, write to the Free Software
19 19
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
20 20
  * 02110-1301, USA.
21
+ *
22
+ * You can also choose to distribute this program under the terms of
23
+ * the Unmodified Binary Distribution Licence (as given in the file
24
+ * COPYING.UBDL), provided that you have satisfied its requirements.
21 25
  */
22 26
 
23
-FILE_LICENCE ( GPL2_OR_LATER );
27
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
24 28
 
25 29
 /** @file
26 30
  *

+ 8
- 3
src/arch/x86/include/linux/ipxe/dhcp_arch.h Bestand weergeven

@@ -4,7 +4,7 @@
4 4
  * This program is free software; you can redistribute it and/or
5 5
  * modify it under the terms of the GNU General Public License as
6 6
  * published by the Free Software Foundation; either version 2 of the
7
- * License, or any later version.
7
+ * License, or (at your option) any later version.
8 8
  *
9 9
  * This program is distributed in the hope that it will be useful, but
10 10
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +13,12 @@
13 13
  *
14 14
  * You should have received a copy of the GNU General Public License
15 15
  * along with this program; if not, write to the Free Software
16
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
16
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17
+ * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
17 22
  */
18 23
 
19 24
 #ifndef _LINUX_DHCP_ARCH_H
@@ -24,7 +29,7 @@
24 29
  * Architecture-specific DHCP options
25 30
  */
26 31
 
27
-FILE_LICENCE(GPL2_OR_LATER);
32
+FILE_LICENCE(GPL2_OR_LATER_OR_UBDL);
28 33
 
29 34
 #include <ipxe/dhcp.h>
30 35
 

+ 1
- 1
src/arch/x86/include/pic8259.h Bestand weergeven

@@ -4,7 +4,7 @@
4 4
  * Initially written by Michael Brown (mcb30).
5 5
  */
6 6
 
7
-FILE_LICENCE ( GPL2_OR_LATER );
7
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
8 8
 
9 9
 #ifndef PIC8259_H
10 10
 #define PIC8259_H

+ 8
- 3
src/arch/x86_64/include/efi/ipxe/dhcp_arch.h Bestand weergeven

@@ -4,7 +4,7 @@
4 4
  * This program is free software; you can redistribute it and/or
5 5
  * modify it under the terms of the GNU General Public License as
6 6
  * published by the Free Software Foundation; either version 2 of the
7
- * License, or any later version.
7
+ * License, or (at your option) any later version.
8 8
  *
9 9
  * This program is distributed in the hope that it will be useful, but
10 10
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +13,12 @@
13 13
  *
14 14
  * You should have received a copy of the GNU General Public License
15 15
  * along with this program; if not, write to the Free Software
16
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
16
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17
+ * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
17 22
  */
18 23
 
19 24
 #ifndef _DHCP_ARCH_H
@@ -24,7 +29,7 @@
24 29
  * Architecture-specific DHCP options
25 30
  */
26 31
 
27
-FILE_LICENCE ( GPL2_OR_LATER );
32
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
28 33
 
29 34
 #include <ipxe/dhcp.h>
30 35
 

+ 1
- 1
src/config/colour.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #define COLOR_NORMAL_FG		COLOR_WHITE
13 13
 #define COLOR_NORMAL_BG		COLOR_BLUE

+ 5
- 1
src/config/config.c Bestand weergeven

@@ -13,9 +13,13 @@
13 13
  * along with this program; if not, write to the Free Software
14 14
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
15 15
  * 02110-1301, USA.
16
+ *
17
+ * You can also choose to distribute this program under the terms of
18
+ * the Unmodified Binary Distribution Licence (as given in the file
19
+ * COPYING.UBDL), provided that you have satisfied its requirements.
16 20
  */
17 21
 
18
-FILE_LICENCE ( GPL2_OR_LATER );
22
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
19 23
 
20 24
 #include <config/general.h>
21 25
 #include <config/console.h>

+ 5
- 1
src/config/config_romprefix.c Bestand weergeven

@@ -13,9 +13,13 @@
13 13
  * along with this program; if not, write to the Free Software
14 14
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
15 15
  * 02110-1301, USA.
16
+ *
17
+ * You can also choose to distribute this program under the terms of
18
+ * the Unmodified Binary Distribution Licence (as given in the file
19
+ * COPYING.UBDL), provided that you have satisfied its requirements.
16 20
  */
17 21
 
18
-FILE_LICENCE ( GPL2_OR_LATER );
22
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
19 23
 
20 24
 #include <config/general.h>
21 25
 

+ 1
- 1
src/config/defaults/pcbios.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #define UACCESS_LIBRM
13 13
 #define IOAPI_X86

+ 1
- 1
src/config/general.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <config/defaults.h>
13 13
 

+ 5
- 1
src/core/bitmap.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <errno.h>
23 27
 #include <ipxe/bitmap.h>

+ 5
- 1
src/core/cwuri.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stddef.h>
23 27
 #include <ipxe/uri.h>

+ 5
- 1
src/core/downloader.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdlib.h>
23 27
 #include <errno.h>

+ 5
- 1
src/core/image.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stddef.h>
23 27
 #include <string.h>

+ 1
- 1
src/core/main.c Bestand weergeven

@@ -12,7 +12,7 @@ Literature dealing with the network protocols:
12 12
 
13 13
 **************************************************************************/
14 14
 
15
-FILE_LICENCE ( GPL2_OR_LATER );
15
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
16 16
 
17 17
 #include <stddef.h>
18 18
 #include <stdio.h>

+ 5
- 1
src/core/posix_io.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdlib.h>
23 27
 #include <string.h>

+ 5
- 1
src/core/refcnt.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdlib.h>
23 27
 #include <ipxe/refcnt.h>

+ 5
- 1
src/core/resolv.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdint.h>
23 27
 #include <stdlib.h>

+ 5
- 1
src/core/timer.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <unistd.h>
23 27
 

+ 5
- 1
src/core/uri.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 /** @file
23 27
  *

+ 5
- 1
src/core/vsprintf.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stddef.h>
23 27
 #include <stdarg.h>

+ 5
- 1
src/drivers/bus/pci.c Bestand weergeven

@@ -18,9 +18,13 @@
18 18
  * along with this program; if not, write to the Free Software
19 19
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
20 20
  * 02110-1301, USA.
21
+ *
22
+ * You can also choose to distribute this program under the terms of
23
+ * the Unmodified Binary Distribution Licence (as given in the file
24
+ * COPYING.UBDL), provided that you have satisfied its requirements.
21 25
  */
22 26
 
23
-FILE_LICENCE ( GPL2_OR_LATER );
27
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
24 28
 
25 29
 #include <stdint.h>
26 30
 #include <stdlib.h>

+ 1
- 1
src/drivers/bus/pciextra.c Bestand weergeven

@@ -1,4 +1,4 @@
1
-FILE_LICENCE ( GPL2_OR_LATER );
1
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
2 2
 
3 3
 #include <stdint.h>
4 4
 #include <ipxe/pci.h>

+ 5
- 1
src/hci/editstring.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <assert.h>
23 27
 #include <string.h>

+ 5
- 1
src/hci/tui/menu_ui.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 /** @file
23 27
  *

+ 1
- 1
src/image/embedded.c Bestand weergeven

@@ -6,7 +6,7 @@
6 6
  * fetching over the network.
7 7
  */
8 8
 
9
-FILE_LICENCE ( GPL2_OR_LATER );
9
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
10 10
 
11 11
 #include <string.h>
12 12
 #include <ipxe/image.h>

+ 1
- 1
src/include/curses.h Bestand weergeven

@@ -11,7 +11,7 @@
11 11
  *
12 12
  */
13 13
 
14
-FILE_LICENCE ( GPL2_OR_LATER );
14
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
15 15
 
16 16
 #undef  ERR
17 17
 #define ERR	(-1)

+ 5
- 1
src/include/hci/ifmgmt_cmd.h Bestand weergeven

@@ -15,12 +15,16 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20 24
 #ifndef _IFMGMT_CMD_H
21 25
 #define _IFMGMT_CMD_H
22 26
 
23
-FILE_LICENCE ( GPL2_OR_LATER );
27
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
24 28
 
25 29
 #include <ipxe/parseopt.h>
26 30
 

+ 1
- 1
src/include/ipxe/arp.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <ipxe/tables.h>
13 13
 #include <ipxe/netdevice.h>

+ 1
- 1
src/include/ipxe/bitmap.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <stddef.h>

+ 1
- 1
src/include/ipxe/blockdev.h Bestand weergeven

@@ -8,7 +8,7 @@
8 8
  *
9 9
  */
10 10
 
11
-FILE_LICENCE ( GPL2_OR_LATER );
11
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
12 12
 
13 13
 #include <stdint.h>
14 14
 #include <ipxe/uaccess.h>

+ 1
- 1
src/include/ipxe/crc32.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef _IPXE_CRC32_H
2 2
 #define _IPXE_CRC32_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <stdint.h>
7 7
 

+ 1
- 1
src/include/ipxe/crypto.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <stddef.h>

+ 1
- 1
src/include/ipxe/dhcp.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <stdarg.h>

+ 1
- 1
src/include/ipxe/editbox.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <curses.h>
13 13
 #include <ipxe/editstring.h>

+ 1
- 1
src/include/ipxe/editstring.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 /** An editable string */
13 13
 struct edit_string {

+ 1
- 1
src/include/ipxe/errfile.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <bits/errfile.h>
13 13
 

+ 1
- 1
src/include/ipxe/ethernet.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/netdevice.h>

+ 1
- 1
src/include/ipxe/features.h Bestand weergeven

@@ -11,7 +11,7 @@
11 11
  *
12 12
  */
13 13
 
14
-FILE_LICENCE ( GPL2_OR_LATER );
14
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
15 15
 
16 16
 /**
17 17
  * @defgroup featurecat Feature categories

+ 1
- 1
src/include/ipxe/fragment.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/list.h>

+ 1
- 1
src/include/ipxe/http.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 /** HTTP default port */
13 13
 #define HTTP_PORT 80

+ 1
- 1
src/include/ipxe/if_ether.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef	_IPXE_IF_ETHER_H
2 2
 #define	_IPXE_IF_ETHER_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <stdint.h>
7 7
 

+ 1
- 1
src/include/ipxe/in.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef	_IPXE_IN_H
2 2
 #define	_IPXE_IN_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <stdint.h>
7 7
 #include <ipxe/socket.h>

+ 1
- 1
src/include/ipxe/init.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef _IPXE_INIT_H
2 2
 #define _IPXE_INIT_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <ipxe/tables.h>
7 7
 

+ 1
- 1
src/include/ipxe/io.h Bestand weergeven

@@ -16,7 +16,7 @@
16 16
  * the address parameter.
17 17
  */
18 18
 
19
-FILE_LICENCE ( GPL2_OR_LATER );
19
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
20 20
 
21 21
 #include <stdint.h>
22 22
 #include <ipxe/api.h>

+ 1
- 1
src/include/ipxe/iobuf.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <assert.h>

+ 1
- 1
src/include/ipxe/ip.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/in.h>

+ 1
- 1
src/include/ipxe/isa_ids.h Bestand weergeven

@@ -19,7 +19,7 @@
19 19
  * the underlying "meaning" is big-endian.
20 20
  */
21 21
 
22
-FILE_LICENCE ( GPL2_OR_LATER );
22
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
23 23
 
24 24
 #include <byteswap.h>
25 25
 

+ 1
- 1
src/include/ipxe/netdevice.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/list.h>

+ 1
- 1
src/include/ipxe/rarp.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <ipxe/netdevice.h>
13 13
 

+ 1
- 1
src/include/ipxe/refcnt.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stddef.h>
13 13
 #include <assert.h>

+ 1
- 1
src/include/ipxe/settings.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/tables.h>

+ 1
- 1
src/include/ipxe/smbios.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/api.h>

+ 1
- 1
src/include/ipxe/tcp.h Bestand weergeven

@@ -9,7 +9,7 @@
9 9
  *
10 10
  */
11 11
 
12
-FILE_LICENCE ( GPL2_OR_LATER );
12
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
13 13
 
14 14
 #include <ipxe/tcpip.h>
15 15
 

+ 1
- 1
src/include/ipxe/tcpip.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stdint.h>
13 13
 #include <ipxe/socket.h>

+ 1
- 1
src/include/ipxe/udp.h Bestand weergeven

@@ -9,7 +9,7 @@
9 9
  *
10 10
  */
11 11
 
12
-FILE_LICENCE ( GPL2_OR_LATER );
12
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
13 13
 
14 14
 #include <stddef.h>
15 15
 #include <ipxe/iobuf.h>

+ 1
- 1
src/include/ipxe/uri.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <stddef.h>
13 13
 #include <stdlib.h>

+ 1
- 1
src/include/ipxe/vlan.h Bestand weergeven

@@ -8,7 +8,7 @@
8 8
  *
9 9
  */
10 10
 
11
-FILE_LICENCE ( GPL2_OR_LATER );
11
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
12 12
 
13 13
 /** A VLAN header */
14 14
 struct vlan_header {

+ 1
- 1
src/include/readline/readline.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 /** A readline history entry */
13 13
 struct readline_history_entry {

+ 1
- 1
src/include/stdint.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef _STDINT_H
2 2
 #define _STDINT_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 /*
7 7
  * This is a standard predefined macro on all gcc's I've seen. It's

+ 1
- 1
src/include/stdlib.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef STDLIB_H
2 2
 #define STDLIB_H
3 3
 
4
-FILE_LICENCE ( GPL2_OR_LATER );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <stdint.h>
7 7
 #include <assert.h>

+ 1
- 1
src/include/usr/autoboot.h Bestand weergeven

@@ -7,7 +7,7 @@
7 7
  *
8 8
  */
9 9
 
10
-FILE_LICENCE ( GPL2_OR_LATER );
10
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
11 11
 
12 12
 #include <ipxe/device.h>
13 13
 

+ 1
- 1
src/include/wchar.h Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 #ifndef WCHAR_H
2 2
 #define WCHAR_H
3 3
 
4
-FILE_LICENCE ( GPL2_ONLY );
4
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
5 5
 
6 6
 #include <stddef.h>
7 7
 

+ 5
- 1
src/interface/smbios/smbios_settings.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdint.h>
23 27
 #include <string.h>

+ 5
- 1
src/net/aoe.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stddef.h>
23 27
 #include <string.h>

+ 5
- 1
src/net/arp.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdint.h>
23 27
 #include <stdlib.h>

+ 5
- 1
src/net/eth_slow.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdlib.h>
23 27
 #include <string.h>

+ 5
- 1
src/net/ethernet.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdint.h>
23 27
 #include <stdlib.h>

+ 5
- 1
src/net/ipv4.c Bestand weergeven

@@ -16,6 +16,10 @@
16 16
  * along with this program; if not, write to the Free Software
17 17
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
18 18
  * 02110-1301, USA.
19
+ *
20
+ * You can also choose to distribute this program under the terms of
21
+ * the Unmodified Binary Distribution Licence (as given in the file
22
+ * COPYING.UBDL), provided that you have satisfied its requirements.
19 23
  */
20 24
 
21 25
 #include <string.h>
@@ -44,7 +48,7 @@
44 48
  *
45 49
  */
46 50
 
47
-FILE_LICENCE ( GPL2_OR_LATER );
51
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
48 52
 
49 53
 /* Unique IP datagram identification number (high byte) */
50 54
 static uint8_t next_ident_high = 0;

+ 5
- 1
src/net/netdevice.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 #include <stdint.h>
23 27
 #include <stdlib.h>

+ 1
- 1
src/net/tcp.c Bestand weergeven

@@ -26,7 +26,7 @@
26 26
  *
27 27
  */
28 28
 
29
-FILE_LICENCE ( GPL2_OR_LATER );
29
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
30 30
 
31 31
 /** A TCP connection */
32 32
 struct tcp_connection {

+ 5
- 1
src/net/tcp/httpcore.c Bestand weergeven

@@ -15,9 +15,13 @@
15 15
  * along with this program; if not, write to the Free Software
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17 17
  * 02110-1301, USA.
18
+ *
19
+ * You can also choose to distribute this program under the terms of
20
+ * the Unmodified Binary Distribution Licence (as given in the file
21
+ * COPYING.UBDL), provided that you have satisfied its requirements.
18 22
  */
19 23
 
20
-FILE_LICENCE ( GPL2_OR_LATER );
24
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
21 25
 
22 26
 /**
23 27
  * @file

+ 0
- 0
src/net/tcpip.c Bestand weergeven


Some files were not shown because too many files changed in this diff

Laden…
Annuleren
Opslaan