From b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 2 Mar 2015 11:54:40 +0000 Subject: [legal] Relicense files under GPL2_OR_LATER_OR_UBDL Relicense files for which I am the sole author (as identified by util/relicense.pl). Signed-off-by: Michael Brown --- src/config/branding.h | 2 +- src/config/config_ethernet.c | 6 +++++- src/config/config_fc.c | 6 +++++- src/config/config_infiniband.c | 6 +++++- src/config/config_isaromprefix.c | 6 +++++- src/config/config_mromprefix.c | 6 +++++- src/config/config_pciromprefix.c | 6 +++++- src/config/config_route.c | 6 +++++- src/config/config_usb.c | 6 +++++- src/config/console.h | 2 +- src/config/crypto.h | 2 +- src/config/defaults.h | 2 +- src/config/entropy.h | 2 +- src/config/ioapi.h | 2 +- src/config/named.h | 2 +- src/config/nap.h | 2 +- src/config/reboot.h | 2 +- src/config/sanboot.h | 2 +- src/config/settings.h | 2 +- src/config/sideband.h | 2 +- src/config/time.h | 2 +- src/config/timer.h | 2 +- src/config/umalloc.h | 2 +- 23 files changed, 55 insertions(+), 23 deletions(-) (limited to 'src/config') diff --git a/src/config/branding.h b/src/config/branding.h index cca68b6e3..73f00af95 100644 --- a/src/config/branding.h +++ b/src/config/branding.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/config_ethernet.c b/src/config/config_ethernet.c index efb912020..e92399551 100644 --- a/src/config/config_ethernet.c +++ b/src/config/config_ethernet.c @@ -13,9 +13,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 diff --git a/src/config/config_fc.c b/src/config/config_fc.c index 7da3c38cf..2b3179354 100644 --- a/src/config/config_fc.c +++ b/src/config/config_fc.c @@ -13,9 +13,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 diff --git a/src/config/config_infiniband.c b/src/config/config_infiniband.c index 9126c1ffb..13ed25a8f 100644 --- a/src/config/config_infiniband.c +++ b/src/config/config_infiniband.c @@ -13,9 +13,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 diff --git a/src/config/config_isaromprefix.c b/src/config/config_isaromprefix.c index 7e7d2dc7c..d5a2b03ed 100644 --- a/src/config/config_isaromprefix.c +++ b/src/config/config_isaromprefix.c @@ -13,8 +13,12 @@ * 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 "config_romprefix.c" diff --git a/src/config/config_mromprefix.c b/src/config/config_mromprefix.c index 7e7d2dc7c..d5a2b03ed 100644 --- a/src/config/config_mromprefix.c +++ b/src/config/config_mromprefix.c @@ -13,8 +13,12 @@ * 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 "config_romprefix.c" diff --git a/src/config/config_pciromprefix.c b/src/config/config_pciromprefix.c index 7e7d2dc7c..d5a2b03ed 100644 --- a/src/config/config_pciromprefix.c +++ b/src/config/config_pciromprefix.c @@ -13,8 +13,12 @@ * 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 "config_romprefix.c" diff --git a/src/config/config_route.c b/src/config/config_route.c index 656d30ce1..38812ebb4 100644 --- a/src/config/config_route.c +++ b/src/config/config_route.c @@ -13,9 +13,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 diff --git a/src/config/config_usb.c b/src/config/config_usb.c index faed7fad9..557302355 100644 --- a/src/config/config_usb.c +++ b/src/config/config_usb.c @@ -13,9 +13,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 diff --git a/src/config/console.h b/src/config/console.h index 908ec5a0b..d71ef481d 100644 --- a/src/config/console.h +++ b/src/config/console.h @@ -10,7 +10,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/crypto.h b/src/config/crypto.h index 1e021b0fb..9e1f8b2f7 100644 --- a/src/config/crypto.h +++ b/src/config/crypto.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** Margin of error (in seconds) allowed in signed timestamps * diff --git a/src/config/defaults.h b/src/config/defaults.h index 389c0b07b..32d6dbcce 100644 --- a/src/config/defaults.h +++ b/src/config/defaults.h @@ -1,7 +1,7 @@ #ifndef CONFIG_DEFAULTS_H #define CONFIG_DEFAULTS_H -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define CONFIG_DEFAULTS(_platform) diff --git a/src/config/entropy.h b/src/config/entropy.h index 7de2f6737..c79060fd5 100644 --- a/src/config/entropy.h +++ b/src/config/entropy.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/ioapi.h b/src/config/ioapi.h index ce19c6d71..abe5a50ce 100644 --- a/src/config/ioapi.h +++ b/src/config/ioapi.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/named.h b/src/config/named.h index 36efdabdd..ddde6f0a6 100644 --- a/src/config/named.h +++ b/src/config/named.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /* config//
.h */ #ifdef CONFIG diff --git a/src/config/nap.h b/src/config/nap.h index 187af4289..e4fe97964 100644 --- a/src/config/nap.h +++ b/src/config/nap.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/reboot.h b/src/config/reboot.h index 240ef87be..2d1648e7b 100644 --- a/src/config/reboot.h +++ b/src/config/reboot.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/sanboot.h b/src/config/sanboot.h index 1d7f5f177..ccc4bda1f 100644 --- a/src/config/sanboot.h +++ b/src/config/sanboot.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/settings.h b/src/config/settings.h index 42fe9cc81..b3aabbe55 100644 --- a/src/config/settings.h +++ b/src/config/settings.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define PCI_SETTINGS /* PCI device settings */ //#define CPUID_SETTINGS /* CPUID settings */ diff --git a/src/config/sideband.h b/src/config/sideband.h index 039bb5d09..dd704f9bb 100644 --- a/src/config/sideband.h +++ b/src/config/sideband.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define CONFIG_BOFM /* IBM's BladeCenter Open Fabric Manager */ diff --git a/src/config/time.h b/src/config/time.h index 0576211fd..678f6f864 100644 --- a/src/config/time.h +++ b/src/config/time.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/timer.h b/src/config/timer.h index abd669851..5a54d398c 100644 --- a/src/config/timer.h +++ b/src/config/timer.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include diff --git a/src/config/umalloc.h b/src/config/umalloc.h index 245c6b4aa..832dd21d1 100644 --- a/src/config/umalloc.h +++ b/src/config/umalloc.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include -- cgit v1.2.3-55-g7522