diff options
| author | Michael Brown | 2015-03-05 12:36:30 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-03-05 12:40:13 +0100 |
| commit | 1a4e94a8286d5080330053ee2ce1273f4393b124 (patch) | |
| tree | 3135686919bee0431c9480ef3b0adba93c1241a8 /src/arch/i386 | |
| parent | [retry] Colourise debug output (diff) | |
| download | ipxe-1a4e94a8286d5080330053ee2ce1273f4393b124.tar.gz ipxe-1a4e94a8286d5080330053ee2ce1273f4393b124.tar.xz ipxe-1a4e94a8286d5080330053ee2ce1273f4393b124.zip | |
[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>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/core/gdbmach.c | 6 | ||||
| -rw-r--r-- | src/arch/i386/drivers/net/undiload.c | 6 | ||||
| -rw-r--r-- | src/arch/i386/prefix/kkpxeprefix.S | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/arch/i386/core/gdbmach.c b/src/arch/i386/core/gdbmach.c index 4d6897f7d..d92a4ac08 100644 --- 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 77134dcb8..7160ee384 100644 --- 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 d7dd31573..3c17dbdb1 100644 --- 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 |