From 1a4e94a8286d5080330053ee2ce1273f4393b124 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 5 Mar 2015 11:36:30 +0000 Subject: [legal] Relicense files under GPL2_OR_LATER_OR_UBDL Relicense files with kind permission from Stefan Hajnoczi alongside the contributors who have already granted such relicensing permission. Signed-off-by: Michael Brown --- src/arch/i386/core/gdbmach.c | 6 +++++- src/arch/i386/drivers/net/undiload.c | 6 +++++- src/arch/i386/prefix/kkpxeprefix.S | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/arch') 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 #include 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 #include 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 -- cgit v1.2.3-55-g7522