mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 19:42:15 +02:00
app-containers/conmon: Sync with Gentoo
It's from Gentoo commit a2419626939b5804a3b7744efbe26f828e2288b5. Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Flatcar Buildbot
Mathieu Tortuyaux
parent
871602d5bb
commit
015e6d2a8a
@ -1,5 +1,3 @@
|
||||
DIST conmon-2.1.10.tar.gz 121047 BLAKE2B 14b4c2d541607eac0af6b335f35bd506c9a6c3d2b4e4e3ad79f32550385e90b6f7533f505565f90fb4bb1f42d528c41e9ddc7ec275c16ee982a6d0afe1c65bff SHA512 ecf1a961f431b005b54faa68b5c1bcf31d448f994ca66a56f13002216074dba79b53b52a377d4f8dab08141d6c6cf44467352fbff37175135d3da84081b27a18
|
||||
DIST conmon-2.1.11-make-docs-target-not-depend-on-install.tools.patch 985 BLAKE2B f2f34ca9a6f067f88f39726b52c5d476946413e84a93bfff2b9d4e9a0b9b117bf25a903455c3a762895746c5bca6eb93bf2ac7c2c6123d7b9bca9c345aba6230 SHA512 a9716057b0127d2b5aaca303e6d26484a5dbe91b9114259b2fded2a0c803568749b725e816004c80cb8b47ddff7a2fbcc231edd2df1d78a56ecaf6d3020c7fd7
|
||||
DIST conmon-2.1.11.tar.gz 121573 BLAKE2B 600a3e13eee5f71ef5f7aa21d9cf0184dd01c8e5e68d31aa35efcb08c3cf4305313fcfcf0aba3eedb243fe36f0e1e27f68a71627e2050c8ed4a73de273b98131 SHA512 47952f6cbbb810591d78c67856100be0edbf96d30328a10f22c3ec927bc6d1187540824c388d1fc7f3bb16fb7414339f3f20311d1baffb1fae1e38c4d5e7249c
|
||||
DIST conmon-2.1.13.tar.gz 116624 BLAKE2B b6e707521a1d4f1f843b07af7e861f7e2ef29f5f7f52a2cd73add16718b8d9c71659c620d236ce9287cf75048d0427139bfcc798c5eeb6a91e8c20bb9448a826 SHA512 cb98b26b3c5f5e5f0b09f5373bd58dc958b66ac4edcac2aa509f48be8b7e9a33001428016290944c4002ddbf63e11fb4657aaad879c89c5776f8c8031f4d1d08
|
||||
DIST conmon-2.1.8.tar.gz 120541 BLAKE2B 8ae12e674edf49f233f7423f2566a1ddea793bd4fc888618a8903a84309cb4aacea9d200bb0f8e0895c96796dca9bc2e6e73c9c8a7dcc5f2c540b05f7a73a21e SHA512 a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="An OCI container runtime monitor"
|
||||
HOMEPAGE="https://github.com/containers/conmon"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/containers/conmon.git"
|
||||
else
|
||||
SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="+seccomp systemd"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="dev-libs/glib:=
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
systemd? ( sys-apps/systemd:= )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="dev-go/go-md2man"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/conmon-2.1.8-Makefile.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s|shell.*--exists libsystemd.* && echo \"0\"|shell echo $(usex systemd 0 1)|g;" Makefile || die
|
||||
echo -e "#!/usr/bin/env bash\necho $(usex seccomp 0 1)" > hack/seccomp-notify.sh || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC PKG_CONFIG
|
||||
export PREFIX="${EPREFIX}/usr" GOMD2MAN=go-md2man
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodir /usr/libexec/podman
|
||||
dosym ../../bin/"${PN}" /usr/libexec/podman/"${PN}"
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="An OCI container runtime monitor"
|
||||
HOMEPAGE="https://github.com/containers/conmon"
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/containers/conmon.git"
|
||||
else
|
||||
SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
|
||||
GIT_COMMIT="00e08f4a9ca5420de733bf542b930ad58e1a7e7d"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="+seccomp systemd"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="dev-libs/glib:=
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
systemd? ( sys-apps/systemd:= )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="dev-go/go-md2man"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/conmon-2.1.8-Makefile.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
if use systemd; then
|
||||
sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "0"|g;' Makefile || die
|
||||
else
|
||||
sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "1"|g;' Makefile || die
|
||||
fi
|
||||
|
||||
if use seccomp; then
|
||||
echo -e '#!/usr/bin/env bash\necho "0"' > hack/seccomp-notify.sh || die
|
||||
else
|
||||
echo -e '#!/usr/bin/env bash\necho "1"' > hack/seccomp-notify.sh || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC PKG_CONFIG
|
||||
export PREFIX=${EPREFIX}/usr GOMD2MAN=go-md2man
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
default
|
||||
else
|
||||
emake GIT_COMMIT="${GIT_COMMIT}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodir /usr/libexec/podman
|
||||
dosym ../../bin/"${PN}" /usr/libexec/podman/conmon
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
# https://github.com/containers/conmon/pull/482
|
||||
# https://github.com/containers/conmon/pull/456
|
||||
From 26f8263a2e5c7bff1e2d5985a8a3d5f07ab3b0b0 Mon Sep 17 00:00:00 2001
|
||||
From: Rahil Bhimjiani <me@rahil.rocks>
|
||||
Date: Tue, 26 Sep 2023 03:21:49 +0530
|
||||
Subject: [PATCH] Remove checks for (long)deprecated libsystemd-journal in
|
||||
favor of libsystemd
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1350301#c2
|
||||
|
||||
Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
|
||||
---
|
||||
Makefile | 5 +----
|
||||
meson.build | 5 +----
|
||||
2 files changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5e6c0d39..40df8e3d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -38,10 +38,7 @@ override CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) -DVERSION=\"$(VERSIO
|
||||
# "pkg-config --exists" will error if the package doesn't exist. Make can only compare
|
||||
# output of commands, so the echo commands are to allow pkg-config to error out, make to catch it,
|
||||
# and allow the compilation to complete.
|
||||
-ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0)
|
||||
- override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal)
|
||||
- override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal) -D USE_JOURNALD=1
|
||||
-else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
|
||||
+ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
|
||||
override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd)
|
||||
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D USE_JOURNALD=1
|
||||
endif
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 336e48f3..b454e349 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -47,10 +47,7 @@ else
|
||||
libdl = cc.find_library('dl')
|
||||
endif
|
||||
|
||||
-sd_journal = dependency('libsystemd-journal', required : false)
|
||||
-if not sd_journal.found()
|
||||
- sd_journal = dependency('libsystemd', required : false)
|
||||
-endif
|
||||
+sd_journal = dependency('libsystemd', required : false)
|
||||
if sd_journal.found()
|
||||
add_project_arguments('-DUSE_JOURNALD=1', language : 'c')
|
||||
endif
|
||||
diff --git a/docs/Makefile b/docs/Makefile
|
||||
index af20d2b8..25987664 100644
|
||||
--- a/docs/Makefile
|
||||
+++ b/docs/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
PREFIX ?= /usr/local
|
||||
DATADIR := ${PREFIX}/share
|
||||
MANDIR := $(DATADIR)/man
|
||||
-GOMD2MAN = ../tools/build/go-md2man
|
||||
+GOMD2MAN ?= ../tools/build/go-md2man
|
||||
|
||||
docs: $(patsubst %.md,%,$(wildcard *.8.md))
|
||||
Loading…
x
Reference in New Issue
Block a user