Revert "76093 restructure LICENSES file generation"

This reverts commit d39ac98cc5.
This commit is contained in:
Jordan Liggitt
2019-11-13 10:24:32 -05:00
parent c5d71b09e8
commit cd4474ae4f
11 changed files with 41 additions and 76 deletions

View File

@@ -187,8 +187,7 @@ function kube::release::package_node_tarballs() {
cp "${client_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
"${release_stage}/node/bin/"
cp -R "${KUBE_ROOT}/vendor/ALL_LICENSES" "${release_stage}/"
cp "${KUBE_ROOT}/LICENSE" "${release_stage}/LICENSES"
cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
cp "${RELEASE_TARS}/kubernetes-src.tar.gz" "${release_stage}/"
@@ -253,8 +252,7 @@ function kube::release::package_server_tarballs() {
cp "${client_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
"${release_stage}/server/bin/"
cp -R "${KUBE_ROOT}/vendor/ALL_LICENSES" "${release_stage}/"
cp "${KUBE_ROOT}/LICENSE" "${release_stage}/LICENSES"
cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
cp "${RELEASE_TARS}/kubernetes-src.tar.gz" "${release_stage}/"
@@ -567,8 +565,7 @@ EOF
cp -R "${KUBE_ROOT}/docs" "${release_stage}/"
cp "${KUBE_ROOT}/README.md" "${release_stage}/"
cp -R "${KUBE_ROOT}/vendor/ALL_LICENSES" "${release_stage}/"
cp "${KUBE_ROOT}/LICENSE" "${release_stage}/LICENSES"
cp "${KUBE_ROOT}/Godeps/LICENSES" "${release_stage}/"
echo "${KUBE_GIT_VERSION}" > "${release_stage}/version"