Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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>
  • Loading branch information
mcb30 committed Mar 2, 2015
1 parent 626ccf7 commit 2f020a8
Show file tree
Hide file tree
Showing 106 changed files with 302 additions and 114 deletions.
6 changes: 5 additions & 1 deletion src/arch/i386/core/patch_cf.S
Expand Up @@ -14,9 +14,13 @@
* 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 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 )

.text
.arch i386
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/core/relocate.c
Expand Up @@ -8,7 +8,7 @@
*
*/

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

/*
* The linker passes in the symbol _max_align, which is the alignment
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/firmware/pcbios/bios_console.c
Expand Up @@ -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 <assert.h>
#include <realmode.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/firmware/pcbios/e820mangler.S
Expand Up @@ -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 )

.text
.arch i386
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/firmware/pcbios/memmap.c
Expand Up @@ -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 <errno.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/image/multiboot.c
Expand Up @@ -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 );

/**
* @file
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/bits/byteswap.h
Expand Up @@ -9,7 +9,7 @@

#include <stdint.h>

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

static inline __attribute__ (( always_inline, const )) uint16_t
__bswap_variable_16 ( uint16_t x ) {
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/bits/stdint.h
@@ -1,7 +1,7 @@
#ifndef _BITS_STDINT_H
#define _BITS_STDINT_H

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

typedef __SIZE_TYPE__ size_t;
typedef signed long ssize_t;
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/bzimage.h
@@ -1,7 +1,7 @@
#ifndef _BZIMAGE_H
#define _BZIMAGE_H

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <stdint.h>

Expand Down
11 changes: 8 additions & 3 deletions src/arch/i386/include/efi/ipxe/dhcp_arch.h
Expand Up @@ -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
Expand All @@ -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 _DHCP_ARCH_H
Expand All @@ -24,7 +29,7 @@
* Architecture-specific DHCP options
*/

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <ipxe/dhcp.h>

Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/librm.h
@@ -1,7 +1,7 @@
#ifndef LIBRM_H
#define LIBRM_H

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

/* Segment selectors as used in our protected-mode GDTs.
*
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/limits.h
@@ -1,7 +1,7 @@
#ifndef LIMITS_H
#define LIMITS_H 1

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

/* Number of bits in a `char' */
#define CHAR_BIT 8
Expand Down
11 changes: 8 additions & 3 deletions src/arch/i386/include/pcbios/ipxe/dhcp_arch.h
Expand Up @@ -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
Expand All @@ -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 _DHCP_ARCH_H
Expand All @@ -24,7 +29,7 @@
* Architecture-specific DHCP options
*/

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <ipxe/dhcp.h>

Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/pxe.h
@@ -1,7 +1,7 @@
#ifndef PXE_H
#define PXE_H

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include "pxe_types.h"
#include "pxe_error.h"
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/pxe_call.h
Expand Up @@ -6,7 +6,7 @@
* PXE API entry point
*/

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <pxe_api.h>
#include <realmode.h>
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/include/registers.h
Expand Up @@ -10,7 +10,7 @@
*
*/

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <stdint.h>

Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/interface/pcbios/bios_timer.c
Expand Up @@ -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 );

/** @file
*
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/interface/pxe/pxe_call.c
Expand Up @@ -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 <ipxe/uaccess.h>
#include <ipxe/init.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/interface/pxe/pxe_preboot.c
Expand Up @@ -22,9 +22,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 <string.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/interface/pxe/pxe_tftp.c
Expand Up @@ -21,9 +21,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 <stdlib.h>
#include <stdio.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/interface/pxe/pxe_undi.c
Expand Up @@ -21,9 +21,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 <stdio.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/i386/prefix/libprefix.S
Expand Up @@ -16,9 +16,13 @@
* 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 )

.arch i386

Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/prefix/romprefix.S
Expand Up @@ -6,7 +6,7 @@
* table so using a noticeable amount of stack space is a no-no.
*/

FILE_LICENCE ( GPL2_OR_LATER )
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )

#include <config/general.h>
#include <config/branding.h>
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/prefix/undiloader.S
@@ -1,4 +1,4 @@
FILE_LICENCE ( GPL2_OR_LATER )
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )

.text
.code16
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/transitions/librm.S
Expand Up @@ -5,7 +5,7 @@
*
*/

FILE_LICENCE ( GPL2_OR_LATER )
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )

/* Drag in local definitions */
#include "librm.h"
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/transitions/librm_mgmt.c
Expand Up @@ -5,7 +5,7 @@
*
*/

FILE_LICENCE ( GPL2_OR_LATER );
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <stdint.h>
#include <ipxe/profile.h>
Expand Down
6 changes: 5 additions & 1 deletion src/arch/x86/core/x86_tcpip.c
Expand Up @@ -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 );

/** @file
*
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
6 changes: 5 additions & 1 deletion src/arch/x86/include/bits/string.h
Expand Up @@ -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
*
Expand Down

0 comments on commit 2f020a8

Please sign in to comment.