[oe-commits] org.oe.dev procps: unify

[Laibsch commit]

procps: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: cf1509616612351c585abcb7745d78bb211e442f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cf1509616612351c585abcb7745d78bb211e442f
Files:
1
packages/procps/procps.inc
packages/procps/procps_3.1.15.bb
packages/procps/procps_3.2.1.bb
packages/procps/procps_3.2.5.bb
packages/procps/procps_3.2.7.bb
Diffs:

#
# mt diff -rba291b1dc9d32b5ea4b03ec52aa5349f0dc41d6a -rcf1509616612351c585abcb7745d78bb211e442f
#
# 
# 
# add_file "packages/procps/procps.inc"
#  content [55ee7b3eaab7ab46429f8145d71f8f8a31d6da80]
# 
# patch "packages/procps/procps_3.1.15.bb"
#  from [ae6954b86af5849144cd072104cdafc59a371af5]
#    to [c373517118ed3b9eb49aaaab1a0000eea36fe100]
# 
# patch "packages/procps/procps_3.2.1.bb"
#  from [58c26a9cc618d16f397d78a5f294b9070dfe6565]
#    to [7f5f6633dff482f6c22ea96c3a146345a4e20010]
# 
# patch "packages/procps/procps_3.2.5.bb"
#  from [2893950b38dd8f3d1a789fdb1b782d72cea24c3e]
#    to [1156596e6e6d4790de434ada1775abd87157c5f6]
# 
# patch "packages/procps/procps_3.2.7.bb"
#  from [2893950b38dd8f3d1a789fdb1b782d72cea24c3e]
#    to [1156596e6e6d4790de434ada1775abd87157c5f6]
# 
============================================================
--- packages/procps/procps.inc	55ee7b3eaab7ab46429f8145d71f8f8a31d6da80
+++ packages/procps/procps.inc	55ee7b3eaab7ab46429f8145d71f8f8a31d6da80
@@ -0,0 +1,14 @@
+DESCRIPTION = "Procps is the package that has a bunch \
+of small useful utilities that give information \
+about processes using the /proc filesystem. The package \
+includes the programs ps, top, vmstat, w, kill, and skill."
+HOMEPAGE = "http://procps.sf.net"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
+           file://install.patch;patch=1"
+
+inherit autotools
============================================================
--- packages/procps/procps_3.1.15.bb	ae6954b86af5849144cd072104cdafc59a371af5
+++ packages/procps/procps_3.1.15.bb	c373517118ed3b9eb49aaaab1a0000eea36fe100
@@ -1,18 +1,7 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://procps_${PV}-2.diff;patch=1 \
-           file://install.patch;patch=1"
+SRC_URI += "file://procps_${PV}-2.diff;patch=1"
 
-inherit autotools
-
 EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
                 LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
                 CURSES=-lncurses \
============================================================
--- packages/procps/procps_3.2.1.bb	58c26a9cc618d16f397d78a5f294b9070dfe6565
+++ packages/procps/procps_3.2.1.bb	7f5f6633dff482f6c22ea96c3a146345a4e20010
@@ -1,19 +1,9 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
+
 PR = "r1"
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://pagesz-not-constant.patch;patch=1"
+SRC_URI += "file://pagesz-not-constant.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
                 LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
                 CURSES=-lncurses \
============================================================
--- packages/procps/procps_3.2.5.bb	2893950b38dd8f3d1a789fdb1b782d72cea24c3e
+++ packages/procps/procps_3.2.5.bb	1156596e6e6d4790de434ada1775abd87157c5f6
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
+
 PR = "r5"
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://procmodule.patch;patch=1 \
-           file://psmodule.patch;patch=1"
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1"
 
-
-
-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 \
============================================================
--- packages/procps/procps_3.2.7.bb	2893950b38dd8f3d1a789fdb1b782d72cea24c3e
+++ packages/procps/procps_3.2.7.bb	1156596e6e6d4790de434ada1775abd87157c5f6
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
+
 PR = "r5"
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://procmodule.patch;patch=1 \
-           file://psmodule.patch;patch=1"
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1"
 
-
-
-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 \