From 1c65dc535fea287e4ed3f39bf452a9a6df16838f Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sat, 1 Oct 2022 14:15:10 -0700 Subject: [PATCH] Remove refs to .make --- .gitignore | 3 --- build/build-image/rsyncd.sh | 2 +- build/common.sh | 1 - build/root/Makefile | 20 +------------------- hack/verify-flags-underscore.py | 2 -- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 63ce72ea78a..889e9c8481e 100644 --- a/.gitignore +++ b/.gitignore @@ -109,9 +109,6 @@ kubernetes.tar.gz # Phony test files used as part of coverage generation zz_generated_*_test.go -# make-related metadata -/.make/ - # Just in time generated data in the source, should never be committed /test/e2e/generated/bindata.go diff --git a/build/build-image/rsyncd.sh b/build/build-image/rsyncd.sh index 8c00838be10..2801fa6a387 100755 --- a/build/build-image/rsyncd.sh +++ b/build/build-image/rsyncd.sh @@ -77,7 +77,7 @@ port = 8730 secrets file = ${SECRETS} read only = false path = ${VOLUME} - filter = - /.make/ - /_tmp/ + filter = - /_tmp/ EOF exec /usr/bin/rsync --no-detach --daemon --config="${CONFFILE}" "$@" diff --git a/build/common.sh b/build/common.sh index fb65b8d7fa2..444001eb9cc 100755 --- a/build/common.sh +++ b/build/common.sh @@ -663,7 +663,6 @@ function kube::build::sync_to_container() { kube::build::rsync \ --delete \ --filter='H /.git' \ - --filter='- /.make/' \ --filter='- /_tmp/' \ --filter='- /_output/' \ --filter='- /' \ diff --git a/build/root/Makefile b/build/root/Makefile index 6cf8713c4aa..ead4c496731 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -46,9 +46,6 @@ OUT_DIR ?= _output BIN_DIR := $(OUT_DIR)/bin PRJ_SRC_PATH := k8s.io/kubernetes -# Metadata for driving the build lives here. -META_DIR := .make - ifdef KUBE_GOFLAGS $(info KUBE_GOFLAGS is now deprecated. Please use GOFLAGS instead.) ifndef GOFLAGS @@ -305,26 +302,11 @@ ifeq ($(PRINT_HELP),y) clean: echo "$$CLEAN_HELP_INFO" else -clean: clean_meta +clean: build/make-clean.sh hack/make-rules/clean.sh endif -define CLEAN_META_HELP_INFO -# Remove make-related metadata files. -# -# Example: -# make clean_meta -endef -.PHONY: clean_meta -ifeq ($(PRINT_HELP),y) -clean_meta: - echo "$$CLEAN_META_HELP_INFO" -else -clean_meta: - rm -rf $(META_DIR) -endif - # TODO(thockin): Remove this in v1.29. .PHONY: generated_files generated_files: diff --git a/hack/verify-flags-underscore.py b/hack/verify-flags-underscore.py index e6de9483ae2..fbf16b70984 100755 --- a/hack/verify-flags-underscore.py +++ b/hack/verify-flags-underscore.py @@ -62,8 +62,6 @@ def get_all_files(rootdir): dirs.remove('third_party') if '.git' in dirs: dirs.remove('.git') - if '.make' in dirs: - dirs.remove('.make') if 'BUILD' in files: files.remove('BUILD')