diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-support/nmon | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/nmon')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch | 46 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb | 31 |
2 files changed, 77 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch new file mode 100644 index 000000000..e8debe56a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch @@ -0,0 +1,46 @@ +From d977b5170027926eb97ab9742ddc51d2a5555a34 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Jul 2017 10:06:49 -0700 +Subject: [PATCH] lmon16g.c: Adjust system headers + +fstab.h is unused +errno.h is in /usr/include +defines from sys/cdefs.h is used + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lmon16g.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lmon16g.c b/lmon16g.c +index cb27e09..d2a11c5 100644 +--- a/lmon16g.c ++++ b/lmon16g.c +@@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION; + #include <fcntl.h> + #include <math.h> + #include <time.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> +@@ -71,6 +71,7 @@ static char *SccsId = "nmon " VERSION; + #include <sys/time.h> + #include <sys/socket.h> + #include <sys/wait.h> ++#include <sys/cdefs.h> + + /* Windows moved here so they can be cleared when the screen mode changes */ + WINDOW *padwelcome = NULL; +@@ -576,7 +577,6 @@ struct procsinfo { + int isroot = 0; + + #include <mntent.h> +-#include <fstab.h> + #include <sys/stat.h> + #include <sys/statfs.h> + #include <net/if.h> +-- +2.13.3 + diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb new file mode 100644 index 000000000..e77faa30a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb @@ -0,0 +1,31 @@ +SUMMARY = "nmon performance monitor" +HOMEPAGE = "http://nmon.sf.net" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" +DEPENDS = "ncurses" +DEPENDS_append_libc-musl = " bsd-headers" + +SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ + ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \ + file://0001-lmon16g.c-Adjust-system-headers.patch \ +" +SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72" +SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688" +SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a" +SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" + +CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" +LDFLAGS += "-ltinfo -lncursesw -lm" +ASNEEDED_pn-nmon = "" + +S = "${WORKDIR}" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 nmon ${D}${bindir} +} |