From 0439167943f0e4d3d4bd4802ed12aeb8cd2060c6 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 17 Jun 2025 18:35:28 +0200 Subject: [PATCH] remove hack/install_catatonit.sh This was not updated to the latest versions and CI and basically any user should get in from their distro repos. Signed-off-by: Paul Holzinger --- Makefile | 6 +----- hack/install_catatonit.sh | 26 -------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100755 hack/install_catatonit.sh diff --git a/Makefile b/Makefile index 5287000483..ebf56db214 100644 --- a/Makefile +++ b/Makefile @@ -756,7 +756,7 @@ system.test-binary: .install.ginkgo $(GO) test -c ./test/system .PHONY: test-binaries -test-binaries: test/checkseccomp/checkseccomp test/goecho/goecho install.catatonit test/version/version +test-binaries: test/checkseccomp/checkseccomp test/goecho/goecho test/version/version @echo "Canonical source version: $(call err_if_empty,RELEASE_VERSION)" .PHONY: tests-included @@ -877,10 +877,6 @@ rpm-install: package ## Install rpm packages .PHONY: install install: install.bin install.remote install.man install.systemd ## Install binaries to system locations -.PHONY: install.catatonit -install.catatonit: - ./hack/install_catatonit.sh - .PHONY: install.remote install.remote: install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh deleted file mode 100755 index a35e349f51..0000000000 --- a/hack/install_catatonit.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -BASE_PATH="/usr/libexec/podman" -CATATONIT_PATH="${BASE_PATH}/catatonit" -CATATONIT_VERSION="v0.1.7" -set -e - -if [ -f $CATATONIT_PATH ] && [ -z "$1" ]; then - echo "skipping ... catatonit is already installed" - exit 0 -fi - -echo "installing catatonit to $CATATONIT_PATH" -buildDir=$(mktemp -d) -git clone https://github.com/openSUSE/catatonit.git $buildDir - -pushd $buildDir -echo `pwd` -git reset --hard ${CATATONIT_VERSION} -autoreconf -fi -./configure -make -install ${SELINUXOPT} -d -m 755 $BASE_PATH -install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH -popd - -rm -rf $buildDir