summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-06-12 16:51:39 +0800
committerJoshua Lock <josh@linux.intel.com>2010-06-17 23:16:41 +0100
commit0ff5ca89bfc1ca83bcad9f4ea132eca9bcbc0fc4 (patch)
tree1449c94b5a08c4d5bd565706789e8f857c66f251
parentdb7484742371dd74e150b8a62a4fb61d7db0e311 (diff)
downloadopenembedded-core-0ff5ca89bfc1ca83bcad9f4ea132eca9bcbc0fc4.tar.gz
openembedded-core-0ff5ca89bfc1ca83bcad9f4ea132eca9bcbc0fc4.tar.bz2
openembedded-core-0ff5ca89bfc1ca83bcad9f4ea132eca9bcbc0fc4.tar.xz
openembedded-core-0ff5ca89bfc1ca83bcad9f4ea132eca9bcbc0fc4.zip
portmap: use NO_TCP_WRAPPER instead of local patch
use NO_TCP_WRAPPER=1 in EXTRA_OEMAKE to disable -lwrap also remove the redundent oe_compile() Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Kevin Tian <kevin.tian@intel.com>
-rw-r--r--meta/packages/portmap/portmap-6.0/no-libwrap.patch15
-rw-r--r--meta/packages/portmap/portmap.inc7
-rw-r--r--meta/packages/portmap/portmap_6.0.bb11
3 files changed, 7 insertions, 26 deletions
diff --git a/meta/packages/portmap/portmap-6.0/no-libwrap.patch b/meta/packages/portmap/portmap-6.0/no-libwrap.patch
deleted file mode 100644
index a880da625..000000000
--- a/meta/packages/portmap/portmap-6.0/no-libwrap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig 2007-05-15 16:00:17.000000000 +0200
-+++ Makefile 2007-05-15 16:00:55.000000000 +0200
-@@ -19,8 +19,8 @@
- # USE_DNS to add hostname tests in hosts.allow/deny.
-
- ifeq ($(NO_TCP_WRAPPER),)
--CPPFLAGS += -DHOSTS_ACCESS
--WRAP_LIB = -lwrap
-+#CPPFLAGS += -DHOSTS_ACCESS
-+#WRAP_LIB = -lwrap
- ifdef USE_DNS
- CPPFLAGS += -DENABLE_DNS
- MAN_SED += -e 's/USE_DNS/yes/'
diff --git a/meta/packages/portmap/portmap.inc b/meta/packages/portmap/portmap.inc
index 83d1e6ca1..cda2fd14e 100644
--- a/meta/packages/portmap/portmap.inc
+++ b/meta/packages/portmap/portmap.inc
@@ -8,9 +8,8 @@ DEPENDS = "fakeroot-native"
SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
- file://no-libwrap.patch;patch=1;pnum=0 \
file://portmap.init \
- file://make.patch;patch=1"
+ file://make.patch;apply=yes"
S = "${WORKDIR}/portmap_5beta"
INITSCRIPT_NAME = "portmap"
@@ -20,10 +19,6 @@ inherit update-rc.d
sbindir = "/sbin"
-do_compile() {
- oe_runmake
-}
-
fakeroot do_install() {
install -d ${D}${sysconfdir}/init.d
install -d ${D}${base_sbindir}
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index f132295ff..7f580a767 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -1,15 +1,16 @@
require portmap.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
- file://destdir-no-strip.patch;patch=1 \
- file://no-tcpd-support.patch;patch=1 \
- file://no-libwrap.patch;patch=1;pnum=0 \
- file://portmap.init "
+ file://destdir-no-strip.patch;apply=yes \
+ file://no-tcpd-support.patch;apply=yes \
+ file://portmap.init"
S = "${WORKDIR}/${PN}_${PV}/"
+EXTRA_OEMAKE_append = " NO_TCP_WRAPPER=1 "
+
CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
CFLAGS += "-Wall -Wstrict-prototypes -fPIC"