Build: Use templated copyright file for deb distributions

THe deb distribution has a special copyright file instead of
LICENSE.txt, but the distributions were including the template file
instead of the rendered file (which includes the license name and text).
This commit is contained in:
Ryan Ernst 2018-04-23 08:46:35 -07:00
parent 11244cb443
commit ea2a29530c
1 changed files with 6 additions and 4 deletions

View File

@ -123,6 +123,12 @@ Closure commonPackageConfig(String type, boolean oss) {
include oss ? 'APACHE-LICENSE-2.0.txt' : 'ELASTIC-LICENSE.txt' include oss ? 'APACHE-LICENSE-2.0.txt' : 'ELASTIC-LICENSE.txt'
rename { 'LICENSE.txt' } rename { 'LICENSE.txt' }
} }
} else {
assert type == 'deb'
into("/usr/share/doc/${packageName}") {
from "${packagingFiles}/copyright"
fileMode 0644
}
} }
into('modules') { into('modules') {
with copySpec { with copySpec {
@ -262,10 +268,6 @@ Closure commonDebConfig(boolean oss) {
into('/usr/share/lintian/overrides') { into('/usr/share/lintian/overrides') {
from('src/deb/lintian/elasticsearch') from('src/deb/lintian/elasticsearch')
} }
into('/usr/share/doc/elasticsearch') {
from 'src/deb/copyright'
fileMode 0644
}
} }
} }