diff options
| author | Michael Brown | 2015-03-02 14:29:46 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-03-02 17:35:29 +0100 |
| commit | 2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4 (patch) | |
| tree | eb6f49f4b9358fe64fdf6fa9b1c1e044e2530bef /src/arch/x86/include | |
| parent | [legal] Relicense files under GPL2_OR_LATER_OR_UBDL (diff) | |
| download | ipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.tar.gz ipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.tar.xz ipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.zip | |
[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/arch/x86/include')
| -rw-r--r-- | src/arch/x86/include/bits/errfile.h | 2 | ||||
| -rw-r--r-- | src/arch/x86/include/bits/string.h | 6 | ||||
| -rw-r--r-- | src/arch/x86/include/linux/ipxe/dhcp_arch.h | 11 | ||||
| -rw-r--r-- | src/arch/x86/include/pic8259.h | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/src/arch/x86/include/bits/errfile.h b/src/arch/x86/include/bits/errfile.h index 5fce86af4..9ca849d52 100644 --- a/src/arch/x86/include/bits/errfile.h +++ b/src/arch/x86/include/bits/errfile.h @@ -1,7 +1,7 @@ #ifndef _BITS_ERRFILE_H #define _BITS_ERRFILE_H -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** * @addtogroup errfile Error file identifiers diff --git a/src/arch/x86/include/bits/string.h b/src/arch/x86/include/bits/string.h index b6a422ec5..c26fe30d5 100644 --- a/src/arch/x86/include/bits/string.h +++ b/src/arch/x86/include/bits/string.h @@ -18,9 +18,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 ); /** @file * diff --git a/src/arch/x86/include/linux/ipxe/dhcp_arch.h b/src/arch/x86/include/linux/ipxe/dhcp_arch.h index e83fd9d87..d60905f22 100644 --- a/src/arch/x86/include/linux/ipxe/dhcp_arch.h +++ b/src/arch/x86/include/linux/ipxe/dhcp_arch.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the - * License, or any later version. + * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,7 +13,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * 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. */ #ifndef _LINUX_DHCP_ARCH_H @@ -24,7 +29,7 @@ * Architecture-specific DHCP options */ -FILE_LICENCE(GPL2_OR_LATER); +FILE_LICENCE(GPL2_OR_LATER_OR_UBDL); #include <ipxe/dhcp.h> diff --git a/src/arch/x86/include/pic8259.h b/src/arch/x86/include/pic8259.h index 0d02266da..f02e62909 100644 --- a/src/arch/x86/include/pic8259.h +++ b/src/arch/x86/include/pic8259.h @@ -4,7 +4,7 @@ * Initially written by Michael Brown (mcb30). */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #ifndef PIC8259_H #define PIC8259_H |