From f64acded7afdb9bdf7128cf5b9b87d3d0bef8f8d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 28 May 2026 04:19:15 +0100 Subject: [PATCH] conmon: update to 2.2.1 Release notes: https://github.com/containers/conmon/releases/tag/v2.2.1 Upstream moved the install target from libexecdir/podman to bindir; update Package/conmon/install accordingly and refresh 010-remove-libdl-dep.patch for the new context. Signed-off-by: Daniel Golle --- utils/conmon/Makefile | 6 +++--- utils/conmon/patches/010-remove-libdl-dep.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile index 56467aef49..caa83d18bb 100644 --- a/utils/conmon/Makefile +++ b/utils/conmon/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=conmon -PKG_VERSION:=2.1.12 +PKG_VERSION:=2.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/conmon/archive/v$(PKG_VERSION) -PKG_HASH:=842f0b5614281f7e35eec2a4e35f9f7b9834819aa58ecdad8d0ff6a84f6796a6 +PKG_HASH:=814fb5979a3a4b8576b1f901e606b482bebb41cb7e57926e6d5765ee786b96d3 PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=Apache-2.0 @@ -36,7 +36,7 @@ endef define Package/conmon/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/podman/conmon $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conmon $(1)/usr/bin endef $(eval $(call BuildPackage,conmon)) diff --git a/utils/conmon/patches/010-remove-libdl-dep.patch b/utils/conmon/patches/010-remove-libdl-dep.patch index 53ebe1b856..8cd4ac06aa 100644 --- a/utils/conmon/patches/010-remove-libdl-dep.patch +++ b/utils/conmon/patches/010-remove-libdl-dep.patch @@ -7,5 +7,5 @@ - dependencies : [glib, libdl, sd_journal, seccomp], + dependencies : [glib, sd_journal, seccomp], install : true, - install_dir : join_paths(get_option('libexecdir'), 'podman'), + install_dir : get_option('bindir'), )