summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-11 22:04:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:23 +0000
commitca6cb22715113c1ba8b88a652cd8aa343305b3bf (patch)
tree58e4feee5961dd909ef1c64ee98fb4909063237b
parent8d8e035daa1d420f8aa8525b81bed4dd5719d290 (diff)
downloadpoky-ca6cb22715113c1ba8b88a652cd8aa343305b3bf.tar.gz
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. (From OE-Core rev: b341066d625d5ff7980a4bdffb338fc83940502b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/portmap/portmap.inc19
-rw-r--r--meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch (renamed from meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch)0
-rw-r--r--meta/recipes-connectivity/portmap/portmap/tcpd-config.patch (renamed from meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch)0
-rw-r--r--meta/recipes-connectivity/portmap/portmap_6.0.bb2
4 files changed, 2 insertions, 19 deletions
diff --git a/meta/recipes-connectivity/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc
index f5f7fde8be..338af33a38 100644
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
@@ -4,14 +4,6 @@ SECTION = "console/network"
4LICENSE = "BSD" 4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \ 5LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \
6 file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1" 6 file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1"
7DEPENDS = "virtual/fakeroot-native"
8
9SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
10 ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz \
11 file://portmap.init \
12 file://make.patch;apply=yes"
13
14S = "${WORKDIR}/portmap_5beta"
15 7
16INITSCRIPT_NAME = "portmap" 8INITSCRIPT_NAME = "portmap"
17INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ." 9INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
@@ -20,15 +12,6 @@ inherit update-rc.d systemd
20 12
21SYSTEMD_SERVICE_${PN} = "portmap.service" 13SYSTEMD_SERVICE_${PN} = "portmap.service"
22 14
23sbindir = "/sbin"
24
25fakeroot do_install() {
26 install -d ${D}${sysconfdir}/init.d
27 install -d ${D}${base_sbindir}
28 install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
29 oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
30}
31
32PACKAGES =+ "portmap-utils" 15PACKAGES =+ "portmap-utils"
33FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" 16FILES_portmap-utils = "${base_sbindir}/pmap_set ${base_sbindir}/pmap_dump"
34FILES_${PN}-doc += "${docdir}" 17FILES_${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
index 2fbf784b73..2fbf784b73 100644
--- a/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch
+++ b/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
index 2f25058095..2f25058095 100644
--- a/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch
+++ b/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 8b65a03346..e727fe3cb9 100644
--- 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"
20CFLAGS += "-Wall -Wstrict-prototypes -fPIC" 20CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
21EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'" 21EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'"
22 22
23fakeroot do_install() { 23do_install() {
24 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d 24 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
25 install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap 25 install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
26 oe_runmake install DESTDIR=${D} 26 oe_runmake install DESTDIR=${D}