diff options
| author | Michael Brown <mcb30@ipxe.org> | 2015-03-02 13:29:46 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2015-03-02 16:35:29 +0000 |
| commit | 2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4 (patch) | |
| tree | eb6f49f4b9358fe64fdf6fa9b1c1e044e2530bef /src/config | |
| parent | 626ccf76eafeaf22144e36bb3822766b08b5443e (diff) | |
| download | ipxe-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/config')
| -rw-r--r-- | src/config/colour.h | 2 | ||||
| -rw-r--r-- | src/config/config.c | 6 | ||||
| -rw-r--r-- | src/config/config_romprefix.c | 6 | ||||
| -rw-r--r-- | src/config/defaults/pcbios.h | 2 | ||||
| -rw-r--r-- | src/config/general.h | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/src/config/colour.h b/src/config/colour.h index 57d20c1d..98198f12 100644 --- a/src/config/colour.h +++ b/src/config/colour.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define COLOR_NORMAL_FG COLOR_WHITE #define COLOR_NORMAL_BG COLOR_BLUE diff --git a/src/config/config.c b/src/config/config.c index a84f78ac..346f79bf 100644 --- a/src/config/config.c +++ b/src/config/config.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 <config/general.h> #include <config/console.h> diff --git a/src/config/config_romprefix.c b/src/config/config_romprefix.c index 7a133641..ad6f31f8 100644 --- a/src/config/config_romprefix.c +++ b/src/config/config_romprefix.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 <config/general.h> diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h index ef20c360..425e4a0d 100644 --- a/src/config/defaults/pcbios.h +++ b/src/config/defaults/pcbios.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define UACCESS_LIBRM #define IOAPI_X86 diff --git a/src/config/general.h b/src/config/general.h index 8ea10c4b..65c1f855 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <config/defaults.h> |