portmap: remove obsolete lines

* The SRC_URI and S in portmap.inc was for portmap 5, but we don't have
  it any more.
* Remove DEPENDS = "virtual/fakeroot-native" and fakeroot before
  do_install.
* Remove sbindir = "/sbin" and use "${base_sbindir}" in FILES.
* Move patches from dir portmap-6.0 to portmap.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/recipes-connectivity/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc
index f5f7fde8be31894991631f61b5c7888535ad3901..338af33a3875eff23932752825284d0885c75297 100644 (file)
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
@@ -4,14 +4,6 @@ SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \
                     file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1"
-DEPENDS = "virtual/fakeroot-native"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
-       ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz \
-       file://portmap.init \
-       file://make.patch;apply=yes"
-
-S = "${WORKDIR}/portmap_5beta"
 
 INITSCRIPT_NAME = "portmap"
 INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
@@ -20,15 +12,6 @@ inherit update-rc.d systemd
 
 SYSTEMD_SERVICE_${PN} = "portmap.service"
 
-sbindir = "/sbin"
-
-fakeroot do_install() {
-       install -d ${D}${sysconfdir}/init.d
-       install -d ${D}${base_sbindir}
-       install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-       oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
-}
-
 PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
+FILES_portmap-utils = "${base_sbindir}/pmap_set ${base_sbindir}/pmap_dump"
 FILES_${PN}-doc += "${docdir}"

diff --git a/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch b/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch
similarity index 100%
rename from meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch
rename to meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch

diff --git a/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch b/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch
similarity index 100%
rename from meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch
rename to meta/recipes-connectivity/portmap/portmap/tcpd-config.patch

diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index 8b65a03346f9cbf6222b8681a1449a392e924a93..e727fe3cb92430f7d69dc8c5d5f8f34f08d48394 100644 (file)
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
@@ -20,7 +20,7 @@ CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS"
 CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
 EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'"
 
-fakeroot do_install() {
+do_install() {
     install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
     oe_runmake install DESTDIR=${D}