diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-09 21:41:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-09 21:41:46 +0000 |
| commit | bf74c6866a479a57b4c6c558bc7da42a58ea8d28 (patch) | |
| tree | a0d8344d01cc321de418907a86dd2602ce37dc4c | |
| parent | 8d23f63a1b479a5a90f9f18add690807d2a5a96b (diff) | |
Update procps to use u-a. Fixup watchdog package a bit
| -rw-r--r-- | packages/procps/procps_3.2.5.bb | 32 | ||||
| -rw-r--r-- | packages/watchdog/watchdog_5.2.bb | 8 |
2 files changed, 36 insertions, 4 deletions
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb index 21b2783e55..e73f04c0d7 100644 --- a/packages/procps/procps_3.2.5.bb +++ b/packages/procps/procps_3.2.5.bb @@ -7,7 +7,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DEPENDS = "ncurses" -PR = "r2" +PR = "r4" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch;patch=1 \ @@ -16,7 +16,11 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ -inherit autotools +inherit autotools +FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ + ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ + ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ + ${base_sbindir}/sysctl" EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ CPPFLAGS=-I${STAGING_INCDIR} \ @@ -24,3 +28,27 @@ EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ CURSES=-lncurses \ install='install -D' \ ldconfig=echo" + +do_install_append () { + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + mv ${D}${bindir}/top ${D}${bindir}/top.${PN} + mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} + mv ${D}${bindir}/free ${D}${bindir}/free.${PN} +} + +pkg_postinst() { + update-alternatives --install ${bindir}/top top top.${PN} 90 + update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 + update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 + update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 + update-alternatives --install ${bindir}/free free free.${PN} 90 +} + +pkg_postrm() { + update-alternatives --remove top top.${PN} + update-alternatives --remove ps ps.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove kill kill.${PN} + update-alternatives --remove free free.${PN} +} diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb index 1858e52bf5..09a065339f 100644 --- a/packages/watchdog/watchdog_5.2.bb +++ b/packages/watchdog/watchdog_5.2.bb @@ -1,6 +1,10 @@ -SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" -PR = "r0" +DESCRIPTION = "Software watchdog" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +PR = "r1" + +SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" +FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog" +CONFFILES = "${sysconfdir}/watchdog.conf" inherit autotools |