From 42d0699c19b935ce1553d5b88577e1231315d5cc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Dec 2015 16:18:42 +0200 Subject: procps: update to 3.3.11 fix-configure.patch was fixing lines that have been removed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../procps/procps/fix-configure.patch | 19 ------ meta/recipes-extended/procps/procps_3.3.10.bb | 67 ---------------------- meta/recipes-extended/procps/procps_3.3.11.bb | 66 +++++++++++++++++++++ 3 files changed, 66 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps/fix-configure.patch delete mode 100644 meta/recipes-extended/procps/procps_3.3.10.bb create mode 100644 meta/recipes-extended/procps/procps_3.3.11.bb (limited to 'meta/recipes-extended/procps') diff --git a/meta/recipes-extended/procps/procps/fix-configure.patch b/meta/recipes-extended/procps/procps/fix-configure.patch deleted file mode 100644 index 934ae80954..0000000000 --- a/meta/recipes-extended/procps/procps/fix-configure.patch +++ /dev/null @@ -1,19 +0,0 @@ - -exec_prefix is /usr default in OE-Core - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Saul Wold -Index: procps-ng-3.3.10/configure.ac -=================================================================== ---- procps-ng-3.3.10.orig/configure.ac -+++ procps-ng-3.3.10/configure.ac -@@ -70,7 +70,7 @@ AC_FUNC_MMAP - AC_FUNC_REALLOC - AC_FUNC_STRTOD - --usrbin_execdir='${exec_prefix}/usr/bin' -+usrbin_execdir='${exec_prefix}/bin' - AC_SUBST([usrbin_execdir]) - - AM_GNU_GETTEXT_VERSION([0.14.1]) diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/meta/recipes-extended/procps/procps_3.3.10.bb deleted file mode 100644 index e474f5b5b4..0000000000 --- a/meta/recipes-extended/procps/procps_3.3.10.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "System and process monitoring utilities" -DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \ -the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." -HOMEPAGE = "https://gitorious.org/procps" -SECTION = "base" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \ - " - -DEPENDS = "ncurses" - -inherit autotools gettext pkgconfig update-alternatives - -SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ - file://fix-configure.patch \ - file://sysctl.conf \ - " - -SRC_URI[md5sum] = "1fb7f3f6bf92ce6c5c9ed9949ae858fe" -SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f267f04" - -S = "${WORKDIR}/procps-ng-${PV}" - -EXTRA_OECONF = "--enable-skill --disable-modern-top" - -CPPFLAGS += "-I${S}" - -do_install_append () { - install -d ${D}${base_bindir} - [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done - install -d ${D}${base_sbindir} - [ "${sbindir}" != "${base_sbindir}" ] && for i in ${base_sbindir_progs}; do mv ${D}${sbindir}/$i ${D}${base_sbindir}/$i; done - if [ "${base_sbindir}" != "${sbindir}" ]; then - rmdir ${D}${sbindir} - fi - - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/sysctl.d - ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" - -bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" -base_bindir_progs += "kill pidof ps watch" -base_sbindir_progs += "sysctl" - -ALTERNATIVE_PRIORITY = "200" - -ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" - -ALTERNATIVE_${PN}-doc = "kill.1 uptime.1" -ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" -ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" - -python __anonymous() { - for prog in d.getVar('base_bindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) - - for prog in d.getVar('base_sbindir_progs', True).split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) -} - diff --git a/meta/recipes-extended/procps/procps_3.3.11.bb b/meta/recipes-extended/procps/procps_3.3.11.bb new file mode 100644 index 0000000000..c6dccc6774 --- /dev/null +++ b/meta/recipes-extended/procps/procps_3.3.11.bb @@ -0,0 +1,66 @@ +SUMMARY = "System and process monitoring utilities" +DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \ +the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." +HOMEPAGE = "https://gitorious.org/procps" +SECTION = "base" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \ + " + +DEPENDS = "ncurses" + +inherit autotools gettext pkgconfig update-alternatives + +SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ + file://sysctl.conf \ + " + +SRC_URI[md5sum] = "6cc5b94c1c5b8cbc89ad345a7b522f74" +SRC_URI[sha256sum] = "e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed" + +S = "${WORKDIR}/procps-ng-${PV}" + +EXTRA_OECONF = "--enable-skill --disable-modern-top" + +CPPFLAGS += "-I${S}" + +do_install_append () { + install -d ${D}${base_bindir} + [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done + install -d ${D}${base_sbindir} + [ "${sbindir}" != "${base_sbindir}" ] && for i in ${base_sbindir_progs}; do mv ${D}${sbindir}/$i ${D}${base_sbindir}/$i; done + if [ "${base_sbindir}" != "${sbindir}" ]; then + rmdir ${D}${sbindir} + fi + + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/sysctl.d + ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" + +bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" +base_bindir_progs += "kill pidof ps watch" +base_sbindir_progs += "sysctl" + +ALTERNATIVE_PRIORITY = "200" + +ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" + +ALTERNATIVE_${PN}-doc = "kill.1 uptime.1" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" +ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" + +python __anonymous() { + for prog in d.getVar('base_bindir_progs', True).split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) + + for prog in d.getVar('base_sbindir_progs', True).split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) +} + -- cgit 1.2.3-korg