From be44dc84f2d4c6a46f34da6163d3bb7bb359ed1c Mon Sep 17 00:00:00 2001 From: Don Porter Date: Mon, 13 Aug 2018 10:24:39 -0400 Subject: [PATCH] More notes on license --- LICENSE.addendum.txt | 19 +++++++++++++++++-- LibOS/shim/test/apps/apache/.gitignore | 7 +++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/LICENSE.addendum.txt b/LICENSE.addendum.txt index 423358ae..10067e91 100644 --- a/LICENSE.addendum.txt +++ b/LICENSE.addendum.txt @@ -15,9 +15,24 @@ MIT JOS (mix of MIT and BSD licenses: * Pal/lib/stdlib/printfmt.c A number of files taken from other C libraries: -* glibc - LGPL * musl - MIT +* glibc - LGPL + ** clone, sysdeps.h (and variants) used in code + ** Pal/src/host/Linux/clone-x86_64.S + ** LibOS/shim/include/elf.h + ** LibOS/shim/src/elf/ - basically the whole directory, and most code related to linking and loading (e.g., Pal/src/db_rtld.c) + ** Pal/include/elf/elf.h + ** Pal/include/sysdeps/generic/ldsodefs.h + ** Pal/include/sysdeps/generic/memcopy.h + ** Pal/include/sysdeps/generic/sysdep.h + ** Pal/lib/network/hton.c + ** Pal/lib/string/ - the whole directory + ** Pal/src/dynamic_link.h, do-rel.h , dl-machine-x86_64.h + ** Pal/src/host/Linux/gettimeofday-x86_64.S + ** Pal/src/host/Linux/include/ - whole directory - for signal API definitions + ** We also build a patched glibc, but this could be moved into a separate repo + +Some app and benchmark sources are redistributed under LibOS/shim/test/apps. These should probably be moved to subrepositories. -[incomplete: more to come] diff --git a/LibOS/shim/test/apps/apache/.gitignore b/LibOS/shim/test/apps/apache/.gitignore index 32dd83e0..46deaf35 100644 --- a/LibOS/shim/test/apps/apache/.gitignore +++ b/LibOS/shim/test/apps/apache/.gitignore @@ -1 +1,8 @@ httpd-2.4.3/* +result-* +obj/* +OUTPUT +.libs/* +apr-1.4.6/* +apr-util-1.5.1/* +php-5.6.6/*