From cba3788c7574f799ca162e2a2e579a0286557d0a Mon Sep 17 00:00:00 2001 From: Eric Van Norman Date: Thu, 6 Apr 2023 13:39:25 -0500 Subject: [PATCH] Manual update of common-files (#13023) --- common/.commonfiles.sha | 2 +- common/Makefile.common.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 2f321b3dd5..97527904aa 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -591260c501031c31225bde5b08f1b07d55649bec +9d68fc5a210b4d2fc232be70470092c38df6fda8 diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk index be56a163ec..74aa1eb29d 100644 --- a/common/Makefile.common.mk +++ b/common/Makefile.common.mk @@ -102,7 +102,7 @@ update-common: @if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\ rm $(TMP)/common-files/files/CONTRIBUTING.md;\ fi - @cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.* $(shell pwd) + @cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.devcontainer $(TMP)/common-files/files/.gitattributes $(shell pwd) @rm -fr $(TMP)/common-files @$(or $(COMMONFILES_POSTPROCESS), true)