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>
This commit is contained in:
parent
8d8e035daa
commit
ca6cb22715
|
@ -4,14 +4,6 @@ SECTION = "console/network"
|
||||||
LICENSE = "BSD"
|
LICENSE = "BSD"
|
||||||
LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \
|
LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \
|
||||||
file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1"
|
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_NAME = "portmap"
|
||||||
INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
|
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"
|
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"
|
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}"
|
FILES_${PN}-doc += "${docdir}"
|
||||||
|
|
|
@ -20,7 +20,7 @@ CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS"
|
||||||
CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
|
CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
|
||||||
EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'"
|
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 -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
|
||||||
install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
|
install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
|
||||||
oe_runmake install DESTDIR=${D}
|
oe_runmake install DESTDIR=${D}
|
||||||
|
|
Loading…
Reference in New Issue