mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

portmap: use NO_TCP_WRAPPER instead of local patch

Browse Source 
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>
This commit is contained in:
Qing He
2010-06-12 16:51:39 +08:00
committed by Joshua Lock
parent db74847423
commit 0ff5ca89bf
3 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/portmap/portmap-6.0/no-libwrap.patch
Vendored
-15
View File
@@ -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/'
meta/packages/portmap/portmap.inc
+1 -6
View File
@@ -8,9 +8,8 @@ DEPENDS = "fakeroot-native"
SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
file://no-libwrap.patch;patch=1;pnum=0 \
file://portmap.init \ file://portmap.init \
file://make.patch;patch=1" file://make.patch;apply=yes"
S = "${WORKDIR}/portmap_5beta" S = "${WORKDIR}/portmap_5beta"
INITSCRIPT_NAME = "portmap" INITSCRIPT_NAME = "portmap"
@@ -20,10 +19,6 @@ inherit update-rc.d
sbindir = "/sbin" sbindir = "/sbin"
do_compile() {
oe_runmake
}
fakeroot do_install() { fakeroot do_install() {
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -d ${D}${base_sbindir} install -d ${D}${base_sbindir}
meta/packages/portmap/portmap_6.0.bb
+6 -5
View File
@@ -1,15 +1,16 @@
require portmap.inc require portmap.inc
PR = "r5" PR = "r6"
SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
file://destdir-no-strip.patch;patch=1 \ file://destdir-no-strip.patch;apply=yes \
file://no-tcpd-support.patch;patch=1 \ file://no-tcpd-support.patch;apply=yes \
file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init"
file://portmap.init "
S = "${WORKDIR}/${PN}_${PV}/" S = "${WORKDIR}/${PN}_${PV}/"
EXTRA_OEMAKE_append = " NO_TCP_WRAPPER=1 "
CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS" CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
CFLAGS += "-Wall -Wstrict-prototypes -fPIC" CFLAGS += "-Wall -Wstrict-prototypes -fPIC"