瀏覽代碼

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).
Ryan Ernst 7 年之前
父節點
當前提交
ea2a29530c
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6 4
      distribution/packages/build.gradle

+ 6 - 4
distribution/packages/build.gradle

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