summaryrefslogtreecommitdiffstats
path: root/src/image
diff options
context:
space:
mode:
authorMichael Brown2015-03-02 12:54:40 +0100
committerMichael Brown2015-03-02 15:17:31 +0100
commitb6ee89ffb5029d02cb1d8668757fa2b74b11e0a3 (patch)
treee838453dd52bb4767112aaff774e5912514afd2c /src/image
parent[legal] Add UBDL relicensing tool (diff)
downloadipxe-b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3.tar.gz
ipxe-b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3.tar.xz
ipxe-b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3.zip
[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 <mcb30@ipxe.org>
Diffstat (limited to 'src/image')
-rw-r--r--src/image/elf.c6
-rw-r--r--src/image/png.c6
-rw-r--r--src/image/pnm.c6
-rw-r--r--src/image/script.c6
-rw-r--r--src/image/segment.c6
5 files changed, 25 insertions, 5 deletions
diff --git a/src/image/elf.c b/src/image/elf.c
index 51636a8e..533f94c1 100644
--- a/src/image/elf.c
+++ b/src/image/elf.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 );
/**
* @file
diff --git a/src/image/png.c b/src/image/png.c
index c1460855..5c4bcb3a 100644
--- a/src/image/png.c
+++ b/src/image/png.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 <stdint.h>
#include <stdlib.h>
diff --git a/src/image/pnm.c b/src/image/pnm.c
index af9e571a..f24b2884 100644
--- a/src/image/pnm.c
+++ b/src/image/pnm.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 );
/** @file
*
diff --git a/src/image/script.c b/src/image/script.c
index 5328da8b..28050868 100644
--- a/src/image/script.c
+++ b/src/image/script.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 );
/**
* @file
diff --git a/src/image/segment.c b/src/image/segment.c
index 86fe4266..2d0f2f0f 100644
--- a/src/image/segment.c
+++ b/src/image/segment.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 );
/**
* @file