summaryrefslogtreecommitdiffstats
path: root/meta/packages
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 /meta/packages
parentdb7484742371dd74e150b8a62a4fb61d7db0e311 (diff)
downloadpoky-0ff5ca89bfc1ca83bcad9f4ea132eca9bcbc0fc4.tar.gz
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>
Diffstat (limited to 'meta/packages')
-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 a880da6253..0000000000
--- a/meta/packages/portmap/portmap-6.0/no-libwrap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: Makefile
2===================================================================
3--- Makefile.orig 2007-05-15 16:00:17.000000000 +0200
4+++ Makefile 2007-05-15 16:00:55.000000000 +0200
5@@ -19,8 +19,8 @@
6 # USE_DNS to add hostname tests in hosts.allow/deny.
7
8 ifeq ($(NO_TCP_WRAPPER),)
9-CPPFLAGS += -DHOSTS_ACCESS
10-WRAP_LIB = -lwrap
11+#CPPFLAGS += -DHOSTS_ACCESS
12+#WRAP_LIB = -lwrap
13 ifdef USE_DNS
14 CPPFLAGS += -DENABLE_DNS
15 MAN_SED += -e 's/USE_DNS/yes/'
diff --git a/meta/packages/portmap/portmap.inc b/meta/packages/portmap/portmap.inc
index 83d1e6ca1e..cda2fd14eb 100644
--- a/meta/packages/portmap/portmap.inc
+++ b/meta/packages/portmap/portmap.inc
@@ -8,9 +8,8 @@ DEPENDS = "fakeroot-native"
8 8
9SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ 9SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
10 ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ 10 ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
11 file://no-libwrap.patch;patch=1;pnum=0 \
12 file://portmap.init \ 11 file://portmap.init \
13 file://make.patch;patch=1" 12 file://make.patch;apply=yes"
14S = "${WORKDIR}/portmap_5beta" 13S = "${WORKDIR}/portmap_5beta"
15 14
16INITSCRIPT_NAME = "portmap" 15INITSCRIPT_NAME = "portmap"
@@ -20,10 +19,6 @@ inherit update-rc.d
20 19
21sbindir = "/sbin" 20sbindir = "/sbin"
22 21
23do_compile() {
24 oe_runmake
25}
26
27fakeroot do_install() { 22fakeroot do_install() {
28 install -d ${D}${sysconfdir}/init.d 23 install -d ${D}${sysconfdir}/init.d
29 install -d ${D}${base_sbindir} 24 install -d ${D}${base_sbindir}
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index f132295ff5..7f580a7676 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -1,15 +1,16 @@
1require portmap.inc 1require portmap.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \ 5SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
6 file://destdir-no-strip.patch;patch=1 \ 6 file://destdir-no-strip.patch;apply=yes \
7 file://no-tcpd-support.patch;patch=1 \ 7 file://no-tcpd-support.patch;apply=yes \
8 file://no-libwrap.patch;patch=1;pnum=0 \ 8 file://portmap.init"
9 file://portmap.init "
10 9
11S = "${WORKDIR}/${PN}_${PV}/" 10S = "${WORKDIR}/${PN}_${PV}/"
12 11
12EXTRA_OEMAKE_append = " NO_TCP_WRAPPER=1 "
13
13CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS" 14CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
14CFLAGS += "-Wall -Wstrict-prototypes -fPIC" 15CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
15 16