diff options
Diffstat (limited to 'meta-oe/recipes-extended/libstatgrab')
| -rw-r--r-- | meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb (renamed from meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb) | 22 |
2 files changed, 10 insertions, 45 deletions
diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch b/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch deleted file mode 100644 index 46493bb9e7..0000000000 --- a/meta-oe/recipes-extended/libstatgrab/libstatgrab/0001-configure.ac-Do-not-use-single-line-comment.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a8502c5a7e336f1e5068f9dd3bdb359d787f9bdc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 5 Feb 2021 18:35:12 -0800 -Subject: [PATCH] configure.ac: Do not use single line comment - -autoconf 2.70+ does not like it and regenerating configure script fails - -| ../libstatgrab-0.92/configure: line 7818: syntax error near unexpected token `ac_fn_check_decl' -| ../libstatgrab-0.92/configure: line 7818: `fi ac_fn_check_decl "$LINENO" "__sun" "ac_cv_have_decl___sun" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"' - -Upstream-Status: Submitted [https://github.com/libstatgrab/libstatgrab/pull/128] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99518f8..74e7f0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,7 +100,8 @@ AC_TYPE_UNSIGNED_LONG_LONG_INT - - dnl Check for extra flags to enable some kind of behavior - AC_CHECK_DECL([_AIX],[ac_cv_need_minus_d_linux_source_compat="yes"; ac_cv_need_minus_d_all_source="yes"]) --AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) dnl probably required by kfreebsd, too? -+dnl probably required by kfreebsd, too? -+AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) - AC_CHECK_DECL([__sun],[ac_cv_need_minus_d_extensions="yes"; ac_cv_need_minus_d_posix_pthread_semantics="yes"]) - AC_CHECK_DECL([__hpux],[ac_cv_need_minus_d_hpux_source="yes"]) - --- -2.30.0 - diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb index a47d3bf000..7498a57049 100644 --- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb @@ -1,19 +1,17 @@ DESCRIPTION = "Utilities to collect and visualise system statistics" HOMEPAGE = "http://www.i-scream.org/libstatgrab/" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses" -PACKAGES_prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " +PACKAGES:prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " # don't use the git tag unless docbooc2x is available to build the manpages -SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ - file://0001-configure.ac-Do-not-use-single-line-comment.patch \ +SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92_1/libstatgrab-${PV}.tar.gz \ " -SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" -SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" +SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" @@ -27,9 +25,9 @@ PACKAGECONFIG[logging] = "--enable-logging,--disable-logging," inherit autotools pkgconfig -FILES_statgrab = "${bindir}/statgrab" -FILES_statgrab-dbg = "${bindir}/.debug/statgrab" -FILES_saidar = "${bindir}/saidar" -FILES_saidar-dbg = "${bindir}/.debug/saidar" -FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" -RDEPENDS_${PN}-mrtg_append = " perl statgrab" +FILES:statgrab = "${bindir}/statgrab" +FILES:statgrab-dbg = "${bindir}/.debug/statgrab" +FILES:saidar = "${bindir}/saidar" +FILES:saidar-dbg = "${bindir}/.debug/saidar" +FILES:${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" +RDEPENDS:${PN}-mrtg:append = " perl statgrab" |