File tree Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change 1
- 9f064a680dc69e212c42e23af3e7d025fe21d9ef
1
+ 689b33f2ec2fe303ad3f11ec18b65311070acaa6
Original file line number Diff line number Diff line change @@ -101,10 +101,16 @@ update-common:
101
101
@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH ) https://github.com/$(BUILD_TOOLS_ORG ) /common-files $(TMP ) /common-files
102
102
@cd $(TMP ) /common-files ; git rev-parse HEAD > files/common/.commonfiles.sha
103
103
@rm -fr common
104
+ # istio/community has its own CONTRIBUTING.md file.
104
105
@CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md)
105
106
@if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\
106
107
rm $(TMP)/common-files/files/CONTRIBUTING.md;\
107
108
fi
109
+ # istio/istio.io uses the Creative Commons Attribution 4.0 license. Don't update LICENSE with the common Apache license.
110
+ @LICENSE_OVERRIDE=$(shell grep -l "Creative Commons Attribution 4.0 International Public License" LICENSE)
111
+ @if [ "$(LICENSE_OVERRIDE)" != "LICENSE" ]; then\
112
+ rm $(TMP)/common-files/files/LICENSE;\
113
+ fi
108
114
@cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.devcontainer $(TMP)/common-files/files/.gitattributes $(shell pwd)
109
115
@rm -fr $(TMP)/common-files
110
116
@$(or $(COMMONFILES_POSTPROCESS), true)
You can’t perform that action at this time.
0 commit comments