aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2018-10-20 09:59:58 -0500
committerRob Landley <rob@landley.net>2018-10-20 09:59:58 -0500
commit8014d31278411e22655aeae47338e95f209e2907 (patch)
treeb5d11664e90b70984ab35c29af0dd5a70a5f809d
parentb123b11608260218df29acdff8016908e7d213f2 (diff)
downloadtoybox-8014d31278411e22655aeae47338e95f209e2907.tar.gz
Add SPDX identifier, update copyright year, move kconfig note into kconfig/
directory.
-rw-r--r--LICENSE8
-rw-r--r--kconfig/README3
2 files changed, 6 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 861a0a83..8bb7e5f5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,6 @@
-Copyright (C) 2006, 2013 by Rob Landley <rob@landley.net>
+Toybox is released under the Zero Clause BSD license (SPDX: 0BSD)
+
+Copyright (C) 2006, 2018 by Rob Landley <rob@landley.net>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
@@ -10,7 +12,3 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-(Note: some build infrastructure in the kconfig directory is still GPLv2,
-cleaning that out is a TODO item, but it doesn't affect the resulting
-binary.)
diff --git a/kconfig/README b/kconfig/README
index 8809bbff..4a27eb7b 100644
--- a/kconfig/README
+++ b/kconfig/README
@@ -1,6 +1,9 @@
This is a snapshot of linux 2.6.12 kconfig as washed through busybox and
further modified by Rob Landley.
+Note: The build infrastructure in this directory is still GPLv2. Cleaning
+that out is a TODO item, but it doesn't affect the resulting binary.
+
Way back when I tried to push my local changes to kconfig upstream
in 2005 https://lwn.net/Articles/161086/
and 2006 http://lkml.iu.edu/hypermail/linux/kernel/0607.0/1805.html