Skip to content

Commit bb0f650

Browse files
zhangwt-cnzhangwt
zhangwt-cn
authored and
zhangwt
committed
Consolidate Makefiles #254
- Move packaging -> build/ - Modified creating-a-release.md common.mk path - Cancel .gitignore /build Close #254
1 parent 8c694f1 commit bb0f650

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+6
-7
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
.idea
22
cri-dockerd
3-
build

‎packaging/common.mk ‎build/common.mk

File renamed without changes.

‎packaging/.gitignore ‎build/packaging/.gitignore

File renamed without changes.

‎packaging/Makefile ‎build/packaging/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include common.mk
1+
include ../common.mk
22

33
APP_DIR:=$(realpath $(CURDIR)/..)
44

‎packaging/README.md ‎build/packaging/README.md

‎packaging/deb/.gitignore ‎build/packaging/deb/.gitignore

File renamed without changes.

‎packaging/deb/Makefile ‎build/packaging/deb/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../common.mk
1+
include ../../common.mk
22

33
APP_DIR:=$(realpath $(CURDIR)/../../)
44
GITCOMMIT?=$(shell cd $(APP_DIR) && git rev-parse --short HEAD)

‎packaging/deb/Makefile-ee ‎build/packaging/deb/Makefile-ee

File renamed without changes.

‎packaging/deb/README.md ‎build/packaging/deb/README.md

‎packaging/deb/build-deb ‎build/packaging/deb/build-deb

File renamed without changes.

‎packaging/deb/common/compat ‎build/packaging/deb/common/compat

File renamed without changes.

‎packaging/deb/common/control ‎build/packaging/deb/common/control

File renamed without changes.

‎packaging/deb/common/cri-docker.docker.upstart ‎build/packaging/deb/common/cri-docker.docker.upstart

File renamed without changes.

‎packaging/deb/common/rules ‎build/packaging/deb/common/rules

File renamed without changes.

‎packaging/deb/debian-bullseye/Dockerfile ‎build/packaging/deb/debian-bullseye/Dockerfile

File renamed without changes.

‎packaging/deb/debian-buster/Dockerfile ‎build/packaging/deb/debian-buster/Dockerfile

File renamed without changes.

‎packaging/deb/gen-deb-ver ‎build/packaging/deb/gen-deb-ver

File renamed without changes.

‎packaging/deb/raspbian-bullseye/Dockerfile ‎build/packaging/deb/raspbian-bullseye/Dockerfile

File renamed without changes.

‎packaging/deb/raspbian-buster/Dockerfile ‎build/packaging/deb/raspbian-buster/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-bionic/Dockerfile ‎build/packaging/deb/ubuntu-bionic/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-cosmic/Dockerfile ‎build/packaging/deb/ubuntu-cosmic/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-disco/Dockerfile ‎build/packaging/deb/ubuntu-disco/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-eoan/Dockerfile ‎build/packaging/deb/ubuntu-eoan/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-focal/Dockerfile ‎build/packaging/deb/ubuntu-focal/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-jammy/Dockerfile ‎build/packaging/deb/ubuntu-jammy/Dockerfile

File renamed without changes.

‎packaging/deb/ubuntu-xenial/Dockerfile ‎build/packaging/deb/ubuntu-xenial/Dockerfile

File renamed without changes.

‎packaging/rpm/.gitignore ‎build/packaging/rpm/.gitignore

File renamed without changes.

‎packaging/rpm/Makefile ‎build/packaging/rpm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../common.mk
1+
include ../../common.mk
22

33
APP_DIR:=$(realpath $(CURDIR)/../../)
44
STATIC_VERSION:=$(shell ../static/gen-static-ver $(APP_DIR) $(VERSION))

‎packaging/rpm/Makefile-ee ‎build/packaging/rpm/Makefile-ee

File renamed without changes.

‎packaging/rpm/README.md ‎build/packaging/rpm/README.md

‎packaging/rpm/SPECS/cri-dockerd.spec ‎build/packaging/rpm/SPECS/cri-dockerd.spec

File renamed without changes.

‎packaging/rpm/amazonlinux-2/Dockerfile ‎build/packaging/rpm/amazonlinux-2/Dockerfile

File renamed without changes.

‎packaging/rpm/centos-7/Dockerfile ‎build/packaging/rpm/centos-7/Dockerfile

File renamed without changes.

‎packaging/rpm/centos-8/Dockerfile ‎build/packaging/rpm/centos-8/Dockerfile

File renamed without changes.

‎packaging/rpm/centos-stream/Dockerfile ‎build/packaging/rpm/centos-stream/Dockerfile

File renamed without changes.

‎packaging/rpm/fedora-33/Dockerfile ‎build/packaging/rpm/fedora-33/Dockerfile

File renamed without changes.

‎packaging/rpm/fedora-34/Dockerfile ‎build/packaging/rpm/fedora-34/Dockerfile

File renamed without changes.

‎packaging/rpm/fedora-35/Dockerfile ‎build/packaging/rpm/fedora-35/Dockerfile

File renamed without changes.

‎packaging/rpm/fedora-36/Dockerfile ‎build/packaging/rpm/fedora-36/Dockerfile

File renamed without changes.

‎packaging/rpm/gen-rpm-ver ‎build/packaging/rpm/gen-rpm-ver

File renamed without changes.

‎packaging/rpm/oraclelinux-7/Dockerfile ‎build/packaging/rpm/oraclelinux-7/Dockerfile

File renamed without changes.

‎packaging/rpm/rhel-7/Dockerfile.ppc64le ‎build/packaging/rpm/rhel-7/Dockerfile.ppc64le

File renamed without changes.

‎packaging/rpm/rhel-7/Dockerfile.s390x ‎build/packaging/rpm/rhel-7/Dockerfile.s390x

File renamed without changes.

‎packaging/rpm/rhel-7/Dockerfile.x86_64 ‎build/packaging/rpm/rhel-7/Dockerfile.x86_64

File renamed without changes.

‎packaging/rpm/rhel-8/Dockerfile.x86_64 ‎build/packaging/rpm/rhel-8/Dockerfile.x86_64

File renamed without changes.

‎packaging/rpm/sles-12.3/Dockerfile ‎build/packaging/rpm/sles-12.3/Dockerfile

File renamed without changes.

‎packaging/rpm/sles-15/Dockerfile ‎build/packaging/rpm/sles-15/Dockerfile

File renamed without changes.

‎packaging/static/Makefile ‎build/packaging/static/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../common.mk
1+
include ../../common.mk
22

33
APP_DIR:=$(realpath $(CURDIR)/../../)
44
CGO_ENABLED ?= 0

‎packaging/static/Makefile-ee ‎build/packaging/static/Makefile-ee

File renamed without changes.

‎packaging/static/gen-static-ver ‎build/packaging/static/gen-static-ver

File renamed without changes.

‎packaging/static/hash_files ‎build/packaging/static/hash_files

File renamed without changes.

‎packaging/systemd/cri-docker.service ‎build/packaging/systemd/cri-docker.service

File renamed without changes.

‎packaging/systemd/cri-docker.socket ‎build/packaging/systemd/cri-docker.socket

File renamed without changes.

‎packaging/windows/Dockerfile ‎build/packaging/windows/Dockerfile

File renamed without changes.

‎packaging/windows/Makefile ‎build/packaging/windows/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../common.mk
1+
include ../../common.mk
22

33
APP_DIR:=$(realpath $(CURDIR)/../../)
44
GO_BASE_IMAGE=golang

‎packaging/windows/Makefile-ee ‎build/packaging/windows/Makefile-ee

File renamed without changes.

‎packaging/windows/licenses.txt ‎build/packaging/windows/licenses.txt

File renamed without changes.

‎docs/content/development/creating-a-release.md

+1-1

0 commit comments

Comments
 (0)