Browse Source

Finish the list of third party sources and licenses. Clean up gitignore for apache.

Don Porter 6 years ago
parent
commit
70b5bf8191
2 changed files with 26 additions and 6 deletions
  1. 19 6
      LICENSE.addendum.txt
  2. 7 0
      LibOS/shim/test/apps/apache/.gitignore

+ 19 - 6
LICENSE.addendum.txt

@@ -1,12 +1,11 @@
 Graphene also includes the following third party sources (and licenses):
-mbedtls - Apache 2.0
-wolfssl - GPL v2
+
+mbedtls crypto libraries - Apache 2.0
 
 RSA's MD5 algorithm (LibOS/shim/src/utils/md5.c) - RSA custom attribution license
 
 Linux kernel - GPL v2
  - dcache implementation
- - linked list implementation
  - atomic_add, cmpxchg and friends implementation
 
 Internet Software Consortium (permissive license): Pal/lib/network/inet_pton.c
@@ -15,9 +14,23 @@ 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
-
-[incomplete: more to come]
+* 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.
 
 

+ 7 - 0
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/*