aboutsummaryrefslogtreecommitdiffstats
path: root/testing/cri-o/makefile-fix-install.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/cri-o/makefile-fix-install.patch')
-rw-r--r--testing/cri-o/makefile-fix-install.patch16
1 files changed, 5 insertions, 11 deletions
diff --git a/testing/cri-o/makefile-fix-install.patch b/testing/cri-o/makefile-fix-install.patch
index 3b1558d48c..8b44339677 100644
--- a/testing/cri-o/makefile-fix-install.patch
+++ b/testing/cri-o/makefile-fix-install.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -8,11 +8,11 @@
+@@ -9,11 +9,11 @@
PROJECT := github.com/cri-o/cri-o
CRIO_INSTANCE := crio_dev
@@ -14,16 +14,16 @@
ETCDIR_CRIO ?= ${ETCDIR}/crio
DATAROOTDIR ?= ${PREFIX}/share/containers
BUILDTAGS ?= containers_image_ostree_stub \
-@@ -24,7 +24,7 @@
- $(shell hack/openpgp_tag.sh) \
+@@ -26,7 +26,7 @@
$(shell hack/seccomp_tag.sh) \
- $(shell hack/selinux_tag.sh)
+ $(shell hack/selinux_tag.sh) \
+ $(shell hack/libsubid_tag.sh)
-CRICTL_CONFIG_DIR=${DESTDIR}/etc
+CRICTL_CONFIG_DIR = /etc
CONTAINER_RUNTIME ?= podman
BUILD_PATH := $(shell pwd)/build
BUILD_BIN_PATH := ${BUILD_PATH}/bin
-@@ -436,71 +436,73 @@
+@@ -420,68 +420,70 @@
install: .gopathok install.bin install.man install.completions install.systemd install.config
install.bin-nobuild:
@@ -85,12 +85,8 @@
install.systemd:
- install ${SELINUXOPT} -D -m 644 contrib/systemd/crio.service $(PREFIX)/lib/systemd/system/crio.service
-- ln -sf crio.service $(PREFIX)/lib/systemd/system/cri-o.service
-- install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-shutdown.service $(PREFIX)/lib/systemd/system/crio-shutdown.service
- install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-wipe.service $(PREFIX)/lib/systemd/system/crio-wipe.service
+ install ${SELINUXOPT} -D -m 644 contrib/systemd/crio.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio.service
-+ ln -sf crio.service ${DESTDIR}$(PREFIX)/lib/systemd/system/cri-o.service
-+ install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-shutdown.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio-shutdown.service
+ install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-wipe.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio-wipe.service
uninstall:
@@ -115,7 +111,6 @@
- rm -f ${FISHINSTALLDIR}/crio-status.fish
- rm -f ${ZSHINSTALLDIR}/_crio-status
- rm -f $(PREFIX)/lib/systemd/system/crio-wipe.service
-- rm -f $(PREFIX)/lib/systemd/system/crio-shutdown.service
- rm -f $(PREFIX)/lib/systemd/system/crio.service
- rm -f $(PREFIX)/lib/systemd/system/cri-o.service
- rm -rf $(DATAROOTDIR)/oci/hooks.d
@@ -130,7 +125,6 @@
+ rm -f $(DESTDIR)${FISHINSTALLDIR}/crio-status.fish
+ rm -f $(DESTDIR)${ZSHINSTALLDIR}/_crio-status
+ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio-wipe.service
-+ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio-shutdown.service
+ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio.service
+ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/cri-o.service
+ rm -f $(DESTDIR)$(ETCDIR_CRIO)/crio.conf