diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2020-02-15 07:11:14 +0100 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2020-02-15 07:11:14 +0100 |
| commit | 0535b3aa45b043a4b577e40313ed8ce6e61c6f85 (patch) | |
| tree | 40c382d1a03a5f583b26c31afb8258a7b04cc5d5 | |
| parent | e2b66f0db58cfa012c2cb64959565f3082439061 (diff) | |
move cacert.pem to system/certs
This avoids rebuilding depends if cacert.pem gets updated
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | cmake/installdata/common/certificates.txt | 2 | ||||
| -rw-r--r-- | system/certs/cacert.pem (renamed from tools/depends/target/openssl/cacert.pem) | 0 | ||||
| -rw-r--r-- | tools/android/packaging/Makefile.in | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index d369a425bc..63eb7712f1 100644 --- a/.gitignore +++ b/.gitignore @@ -322,9 +322,6 @@ cmake_install.cmake /docs/html exclude_dll.txt -#certificates -/system/certs/ - # VS git tools doesn't work for true out of tree builds and it's # useful to be able to work on multiple configs /build*/ diff --git a/cmake/installdata/common/certificates.txt b/cmake/installdata/common/certificates.txt index 14e74a7536..e802c04b1b 100644 --- a/cmake/installdata/common/certificates.txt +++ b/cmake/installdata/common/certificates.txt @@ -1 +1 @@ -tools/depends/target/openssl/cacert.pem system/certs
\ No newline at end of file +system/certs/* diff --git a/tools/depends/target/openssl/cacert.pem b/system/certs/cacert.pem index aa6d05b352..aa6d05b352 100644 --- a/tools/depends/target/openssl/cacert.pem +++ b/system/certs/cacert.pem diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index bf2cdd8d1a..b610f6f490 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -75,8 +75,6 @@ shared: find `pwd`/assets/ -name "*.so" -exec rm {} \; find `pwd`/assets/addons/skin.*/media/* -depth -not -iname "Textures.xbt" -exec rm -rf {} \; cd `pwd`/assets/addons; rm -rf $(EXCLUDED_ADDONS) - mkdir -p assets/system/certs - cp $(CMAKE_SOURCE_DIR)/tools/depends/target/openssl/cacert.pem assets/system/certs cp $(CMAKE_SOURCE_DIR)/privacy-policy.txt assets sharedapk: shared | xbmc/assets |