Browse Source

conmon: update to version 2.1.0

This release contains Bug fixes
patch refreshed

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
lilik-openwrt-22.03
Oskari Rauta 3 years ago
committed by Rosen Penev
parent
commit
1d55ac917f
2 changed files with 13 additions and 6 deletions
  1. +2
    -2
      utils/conmon/Makefile
  2. +11
    -4
      utils/conmon/patches/010-remove-libdl-dep.patch

+ 2
- 2
utils/conmon/Makefile View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=conmon PKG_NAME:=conmon
PKG_VERSION:=2.0.32
PKG_VERSION:=2.1.0
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION)
PKG_HASH:=0ffd17a185322779d14d9a64c39120900f1e0cc3297b18679a933f5f6ba06a75
PKG_HASH:=874909d831feac75e452562087f6ea0eb39848ef144397bdd8f0daf579c5ee85
PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com> PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0


+ 11
- 4
utils/conmon/patches/010-remove-libdl-dep.patch View File

@ -1,14 +1,21 @@
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -34,7 +34,6 @@ add_project_arguments('-Os', '-Wall', '-
language : 'c')
@@ -35,14 +35,6 @@ add_project_arguments('-Os', '-Wall', '-
glib = dependency('glib-2.0') glib = dependency('glib-2.0')
-libdl = cc.find_library('dl')
-cc = meson.get_compiler('c')
-null_dep = dependency('', required : false)
-if cc.has_function('dlopen')
- libdl = null_dep
-else
- libdl = cc.find_library('dl')
-endif
-
executable('conmon', executable('conmon',
['src/conmon.c', ['src/conmon.c',
@@ -71,7 +70,7 @@ executable('conmon',
'src/config.h',
@@ -78,7 +70,7 @@ executable('conmon',
'src/utils.h', 'src/utils.h',
'src/seccomp_notify.c', 'src/seccomp_notify.c',
'src/seccomp_notify.h'], 'src/seccomp_notify.h'],


Loading…
Cancel
Save