Consolidate Makefiles #254

- Move packaging -> build/ - Modified creating-a-release.md common.mk path - Cancel .gitignore /build Close #254
Mirantis · Oct 13, 2023 · c8ba270 · c8ba270
1 parent 8c694f1
commit c8ba270
Show file tree

Hide file tree

Showing 58 changed files with 6 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 .idea
 cri-dockerd
-build
diff --git a/packaging/common.mk → build/common.mk b/packaging/common.mk → build/common.mk
diff --git a/packaging/.gitignore → build/packaging/.gitignore b/packaging/.gitignore → build/packaging/.gitignore
diff --git a/packaging/Makefile → build/packaging/Makefile b/packaging/Makefile → build/packaging/Makefile
@@ -1,4 +1,4 @@
-include common.mk
+include ../common.mk
 
 APP_DIR:=$(realpath $(CURDIR)/..)
 

diff --git a/packaging/README.md → build/packaging/README.md b/packaging/README.md → build/packaging/README.md
diff --git a/packaging/deb/.gitignore → build/packaging/deb/.gitignore b/packaging/deb/.gitignore → build/packaging/deb/.gitignore
diff --git a/packaging/deb/Makefile → build/packaging/deb/Makefile b/packaging/deb/Makefile → build/packaging/deb/Makefile
@@ -1,4 +1,4 @@
-include ../common.mk
+include ../../common.mk
 
 APP_DIR:=$(realpath $(CURDIR)/../../)
 GITCOMMIT?=$(shell cd $(APP_DIR) && git rev-parse --short HEAD)

diff --git a/packaging/deb/Makefile-ee → build/packaging/deb/Makefile-ee b/packaging/deb/Makefile-ee → build/packaging/deb/Makefile-ee
diff --git a/packaging/deb/README.md → build/packaging/deb/README.md b/packaging/deb/README.md → build/packaging/deb/README.md
diff --git a/packaging/deb/build-deb → build/packaging/deb/build-deb b/packaging/deb/build-deb → build/packaging/deb/build-deb
diff --git a/packaging/deb/common/compat → build/packaging/deb/common/compat b/packaging/deb/common/compat → build/packaging/deb/common/compat
diff --git a/packaging/deb/common/control → build/packaging/deb/common/control b/packaging/deb/common/control → build/packaging/deb/common/control
diff --git a/...ging/deb/common/cri-docker.docker.upstart → ...ging/deb/common/cri-docker.docker.upstart b/...ging/deb/common/cri-docker.docker.upstart → ...ging/deb/common/cri-docker.docker.upstart
diff --git a/packaging/deb/common/rules → build/packaging/deb/common/rules b/packaging/deb/common/rules → build/packaging/deb/common/rules
diff --git a/packaging/deb/debian-bullseye/Dockerfile → .../packaging/deb/debian-bullseye/Dockerfile b/packaging/deb/debian-bullseye/Dockerfile → .../packaging/deb/debian-bullseye/Dockerfile
diff --git a/packaging/deb/debian-buster/Dockerfile → build/packaging/deb/debian-buster/Dockerfile b/packaging/deb/debian-buster/Dockerfile → build/packaging/deb/debian-buster/Dockerfile
diff --git a/packaging/deb/gen-deb-ver → build/packaging/deb/gen-deb-ver b/packaging/deb/gen-deb-ver → build/packaging/deb/gen-deb-ver
diff --git a/packaging/deb/raspbian-bullseye/Dockerfile → ...ackaging/deb/raspbian-bullseye/Dockerfile b/packaging/deb/raspbian-bullseye/Dockerfile → ...ackaging/deb/raspbian-bullseye/Dockerfile
diff --git a/packaging/deb/raspbian-buster/Dockerfile → .../packaging/deb/raspbian-buster/Dockerfile b/packaging/deb/raspbian-buster/Dockerfile → .../packaging/deb/raspbian-buster/Dockerfile
diff --git a/packaging/deb/ubuntu-bionic/Dockerfile → build/packaging/deb/ubuntu-bionic/Dockerfile b/packaging/deb/ubuntu-bionic/Dockerfile → build/packaging/deb/ubuntu-bionic/Dockerfile
diff --git a/packaging/deb/ubuntu-cosmic/Dockerfile → build/packaging/deb/ubuntu-cosmic/Dockerfile b/packaging/deb/ubuntu-cosmic/Dockerfile → build/packaging/deb/ubuntu-cosmic/Dockerfile
diff --git a/packaging/deb/ubuntu-disco/Dockerfile → build/packaging/deb/ubuntu-disco/Dockerfile b/packaging/deb/ubuntu-disco/Dockerfile → build/packaging/deb/ubuntu-disco/Dockerfile
diff --git a/packaging/deb/ubuntu-eoan/Dockerfile → build/packaging/deb/ubuntu-eoan/Dockerfile b/packaging/deb/ubuntu-eoan/Dockerfile → build/packaging/deb/ubuntu-eoan/Dockerfile
diff --git a/packaging/deb/ubuntu-focal/Dockerfile → build/packaging/deb/ubuntu-focal/Dockerfile b/packaging/deb/ubuntu-focal/Dockerfile → build/packaging/deb/ubuntu-focal/Dockerfile
diff --git a/packaging/deb/ubuntu-jammy/Dockerfile → build/packaging/deb/ubuntu-jammy/Dockerfile b/packaging/deb/ubuntu-jammy/Dockerfile → build/packaging/deb/ubuntu-jammy/Dockerfile
diff --git a/packaging/deb/ubuntu-xenial/Dockerfile → build/packaging/deb/ubuntu-xenial/Dockerfile b/packaging/deb/ubuntu-xenial/Dockerfile → build/packaging/deb/ubuntu-xenial/Dockerfile
diff --git a/packaging/rpm/.gitignore → build/packaging/rpm/.gitignore b/packaging/rpm/.gitignore → build/packaging/rpm/.gitignore
diff --git a/packaging/rpm/Makefile → build/packaging/rpm/Makefile b/packaging/rpm/Makefile → build/packaging/rpm/Makefile
@@ -1,4 +1,4 @@
-include ../common.mk
+include ../../common.mk
 
 APP_DIR:=$(realpath $(CURDIR)/../../)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(APP_DIR) $(VERSION))

diff --git a/packaging/rpm/Makefile-ee → build/packaging/rpm/Makefile-ee b/packaging/rpm/Makefile-ee → build/packaging/rpm/Makefile-ee
diff --git a/packaging/rpm/README.md → build/packaging/rpm/README.md b/packaging/rpm/README.md → build/packaging/rpm/README.md
diff --git a/packaging/rpm/SPECS/cri-dockerd.spec → build/packaging/rpm/SPECS/cri-dockerd.spec b/packaging/rpm/SPECS/cri-dockerd.spec → build/packaging/rpm/SPECS/cri-dockerd.spec
diff --git a/packaging/rpm/amazonlinux-2/Dockerfile → build/packaging/rpm/amazonlinux-2/Dockerfile b/packaging/rpm/amazonlinux-2/Dockerfile → build/packaging/rpm/amazonlinux-2/Dockerfile
diff --git a/packaging/rpm/centos-7/Dockerfile → build/packaging/rpm/centos-7/Dockerfile b/packaging/rpm/centos-7/Dockerfile → build/packaging/rpm/centos-7/Dockerfile
diff --git a/packaging/rpm/centos-8/Dockerfile → build/packaging/rpm/centos-8/Dockerfile b/packaging/rpm/centos-8/Dockerfile → build/packaging/rpm/centos-8/Dockerfile
diff --git a/packaging/rpm/centos-stream/Dockerfile → build/packaging/rpm/centos-stream/Dockerfile b/packaging/rpm/centos-stream/Dockerfile → build/packaging/rpm/centos-stream/Dockerfile
diff --git a/packaging/rpm/fedora-33/Dockerfile → build/packaging/rpm/fedora-33/Dockerfile b/packaging/rpm/fedora-33/Dockerfile → build/packaging/rpm/fedora-33/Dockerfile
diff --git a/packaging/rpm/fedora-34/Dockerfile → build/packaging/rpm/fedora-34/Dockerfile b/packaging/rpm/fedora-34/Dockerfile → build/packaging/rpm/fedora-34/Dockerfile
diff --git a/packaging/rpm/fedora-35/Dockerfile → build/packaging/rpm/fedora-35/Dockerfile b/packaging/rpm/fedora-35/Dockerfile → build/packaging/rpm/fedora-35/Dockerfile
diff --git a/packaging/rpm/fedora-36/Dockerfile → build/packaging/rpm/fedora-36/Dockerfile b/packaging/rpm/fedora-36/Dockerfile → build/packaging/rpm/fedora-36/Dockerfile
diff --git a/packaging/rpm/gen-rpm-ver → build/packaging/rpm/gen-rpm-ver b/packaging/rpm/gen-rpm-ver → build/packaging/rpm/gen-rpm-ver
diff --git a/packaging/rpm/oraclelinux-7/Dockerfile → build/packaging/rpm/oraclelinux-7/Dockerfile b/packaging/rpm/oraclelinux-7/Dockerfile → build/packaging/rpm/oraclelinux-7/Dockerfile
diff --git a/packaging/rpm/rhel-7/Dockerfile.ppc64le → ...d/packaging/rpm/rhel-7/Dockerfile.ppc64le b/packaging/rpm/rhel-7/Dockerfile.ppc64le → ...d/packaging/rpm/rhel-7/Dockerfile.ppc64le
diff --git a/packaging/rpm/rhel-7/Dockerfile.s390x → build/packaging/rpm/rhel-7/Dockerfile.s390x b/packaging/rpm/rhel-7/Dockerfile.s390x → build/packaging/rpm/rhel-7/Dockerfile.s390x
diff --git a/packaging/rpm/rhel-7/Dockerfile.x86_64 → build/packaging/rpm/rhel-7/Dockerfile.x86_64 b/packaging/rpm/rhel-7/Dockerfile.x86_64 → build/packaging/rpm/rhel-7/Dockerfile.x86_64
diff --git a/packaging/rpm/rhel-8/Dockerfile.x86_64 → build/packaging/rpm/rhel-8/Dockerfile.x86_64 b/packaging/rpm/rhel-8/Dockerfile.x86_64 → build/packaging/rpm/rhel-8/Dockerfile.x86_64
diff --git a/packaging/rpm/sles-12.3/Dockerfile → build/packaging/rpm/sles-12.3/Dockerfile b/packaging/rpm/sles-12.3/Dockerfile → build/packaging/rpm/sles-12.3/Dockerfile
diff --git a/packaging/rpm/sles-15/Dockerfile → build/packaging/rpm/sles-15/Dockerfile b/packaging/rpm/sles-15/Dockerfile → build/packaging/rpm/sles-15/Dockerfile
diff --git a/packaging/static/Makefile → build/packaging/static/Makefile b/packaging/static/Makefile → build/packaging/static/Makefile
@@ -1,4 +1,4 @@
-include ../common.mk
+include ../../common.mk
 
 APP_DIR:=$(realpath $(CURDIR)/../../)
 CGO_ENABLED ?= 0

diff --git a/packaging/static/Makefile-ee → build/packaging/static/Makefile-ee b/packaging/static/Makefile-ee → build/packaging/static/Makefile-ee
diff --git a/packaging/static/gen-static-ver → build/packaging/static/gen-static-ver b/packaging/static/gen-static-ver → build/packaging/static/gen-static-ver
diff --git a/packaging/static/hash_files → build/packaging/static/hash_files b/packaging/static/hash_files → build/packaging/static/hash_files
diff --git a/packaging/systemd/cri-docker.service → build/packaging/systemd/cri-docker.service b/packaging/systemd/cri-docker.service → build/packaging/systemd/cri-docker.service
diff --git a/packaging/systemd/cri-docker.socket → build/packaging/systemd/cri-docker.socket b/packaging/systemd/cri-docker.socket → build/packaging/systemd/cri-docker.socket
diff --git a/packaging/windows/Dockerfile → build/packaging/windows/Dockerfile b/packaging/windows/Dockerfile → build/packaging/windows/Dockerfile
diff --git a/packaging/windows/Makefile → build/packaging/windows/Makefile b/packaging/windows/Makefile → build/packaging/windows/Makefile
@@ -1,4 +1,4 @@
-include ../common.mk
+include ../../common.mk
 
 APP_DIR:=$(realpath $(CURDIR)/../../)
 GO_BASE_IMAGE=golang

diff --git a/packaging/windows/Makefile-ee → build/packaging/windows/Makefile-ee b/packaging/windows/Makefile-ee → build/packaging/windows/Makefile-ee
diff --git a/packaging/windows/licenses.txt → build/packaging/windows/licenses.txt b/packaging/windows/licenses.txt → build/packaging/windows/licenses.txt
diff --git a/docs/content/development/creating-a-release.md b/docs/content/development/creating-a-release.md
@@ -5,7 +5,7 @@ weight: 3
 These are the steps in order to create a new release for `cri-dockerd`. These steps will need to be done by a project maintainer.
 
 1. Setup the repo for a new release
-    1. Change the version found in `VERSION`, `cmd/version/version.go`, and `packaging/common.mk` to the new version
+    1. Change the version found in `VERSION`, `cmd/version/version.go`, and `/build/packaging/common.mk` to the new version
     2. Create a PR with these changes and merge them to master
     3. Build the release artifacts using `make release`
     4. Verify the artifacts in the `build/release` directory and make sure they look correct