honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for license check path for debian packaging. (#97) 

This currently unblocks the gradle check and subsequently will be removed by the meta issue https://github.com/opendistro-for-elasticsearch/search/issues/50

Signed-off-by: Peter Nied <petern@amazon.com>
This commit is contained in:
Rabi Panda 2021-02-15 10:58:03 -08:00 committed by Peter Nied
parent 97ed035c1c
commit a048a9d48a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/build.gradle
View File

@ -615,7 +615,7 @@ subprojects {
], ],
'license.name': [ 'license.name': [
'deb': oss ? 'ASL-2.0' : 'Elastic-License' 'deb': 'ASL-2.0'
], ],
'license.text': [ 'license.text': [

7
distribution/packages/build.gradle
View File

@ -494,7 +494,14 @@ subprojects {
Path copyrightPath Path copyrightPath
String expectedLicense String expectedLicense
String licenseFilename String licenseFilename
if (project.name.contains('oss-')) {
copyrightPath = packageExtractionDir.toPath().resolve("usr/share/doc/elasticsearch-oss/copyright") copyrightPath = packageExtractionDir.toPath().resolve("usr/share/doc/elasticsearch-oss/copyright")
}
// TODO - remove this block and only check for the OSS distribution
// https://github.com/opendistro-for-elasticsearch/search/issues/50
else {
copyrightPath = packageExtractionDir.toPath().resolve("usr/share/doc/elasticsearch/copyright")
}
expectedLicense = "ASL-2.0" expectedLicense = "ASL-2.0"
licenseFilename = "APACHE-LICENSE-2.0.txt" licenseFilename = "APACHE-LICENSE-2.0.txt"
final List<String> header = Arrays.asList("Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/", final List<String> header = Arrays.asList("Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/",