From d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Sep 2010 19:09:11 +0100 Subject: packages: Separate out most of the remaining packages into recipes Signed-off-by: Richard Purdie --- .../portmap/portmap-6.0/destdir-no-strip.patch | 44 ---------------- .../packages/portmap/portmap-6.0/tcpd-config.patch | 28 ---------- meta/packages/portmap/portmap.inc | 31 ------------ meta/packages/portmap/portmap/portmap.init | 59 ---------------------- meta/packages/portmap/portmap_6.0.bb | 20 -------- 5 files changed, 182 deletions(-) delete mode 100644 meta/packages/portmap/portmap-6.0/destdir-no-strip.patch delete mode 100644 meta/packages/portmap/portmap-6.0/tcpd-config.patch delete mode 100644 meta/packages/portmap/portmap.inc delete mode 100755 meta/packages/portmap/portmap/portmap.init delete mode 100644 meta/packages/portmap/portmap_6.0.bb (limited to 'meta/packages/portmap') diff --git a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch b/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch deleted file mode 100644 index a1563c714..000000000 --- a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Mike Frysinger -Date: Sun, 13 May 2007 21:15:12 +0000 (-0400) -Subject: respect DESTDIR and dont use -s with install -X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=603c59b978c04df2354f68d4a2dc676a758ff46d - -respect DESTDIR and dont use -s with install - -$(DESTDIR) is the standard for installing into other trees, not $(BASEDIR) ... -so I've converted the Makefile to use that. I've also left in $(BASEDIR) as a -default to support old installs; not sure if you'd just cut it. - -Stripping should be left to the person to handle, not automatically done by -the install step. Also, `install -s` always calls `strip` which is -wrong/undesired in cross-compiling scenarios. - -Signed-off-by: Mike Frysinger -Signed-off-by: Neil Brown ---- - -diff --git a/Makefile b/Makefile -index 9e9a4b4..5343428 100644 ---- a/Makefile -+++ b/Makefile -@@ -135,13 +135,14 @@ from_local: CPPFLAGS += -DTEST - portmap.man : portmap.8 - sed $(MAN_SED) < portmap.8 > portmap.man - -+DESTDIR = $(BASEDIR) - install: all -- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin -- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin -- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin -- install -o root -g root -m 0644 portmap.man ${BASEDIR}/usr/share/man/man8/portmap.8 -- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 -- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 -+ install -o root -g root -m 0755 portmap $(DESTDIR)/sbin -+ install -o root -g root -m 0755 pmap_dump $(DESTDIR)/sbin -+ install -o root -g root -m 0755 pmap_set $(DESTDIR)/sbin -+ install -o root -g root -m 0644 portmap.man $(DESTDIR)/usr/share/man/man8/portmap.8 -+ install -o root -g root -m 0644 pmap_dump.8 $(DESTDIR)/usr/share/man/man8 -+ install -o root -g root -m 0644 pmap_set.8 $(DESTDIR)/usr/share/man/man8 - - clean: - rm -f *.o portmap pmap_dump pmap_set from_local \ diff --git a/meta/packages/portmap/portmap-6.0/tcpd-config.patch b/meta/packages/portmap/portmap-6.0/tcpd-config.patch deleted file mode 100644 index da55f3799..000000000 --- a/meta/packages/portmap/portmap-6.0/tcpd-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Mike Frysinger -Date: Sun, 13 May 2007 21:17:32 +0000 (-0400) -Subject: fix building with tcpd support disabled -X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5 - -fix building with tcpd support disabled - -Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined. - -Signed-off-by: Timothy Redaelli -Signed-off-by: Mike Frysinger -Signed-off-by: Neil Brown ---- - -diff --git a/pmap_check.c b/pmap_check.c -index 84f2c12..443a822 100644 ---- a/pmap_check.c -+++ b/pmap_check.c -@@ -44,7 +44,9 @@ - #include - #include - #endif -+#ifdef HOSTS_ACCESS - #include -+#endif - #include - #include - diff --git a/meta/packages/portmap/portmap.inc b/meta/packages/portmap/portmap.inc deleted file mode 100644 index d563ad5b5..000000000 --- a/meta/packages/portmap/portmap.inc +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "RPC program number mapper." -HOMEPAGE = "http://neil.brown.name/portmap/" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \ - 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;patch=1 \ - file://portmap.init \ - file://make.patch;apply=yes" -S = "${WORKDIR}/portmap_5beta" - -INITSCRIPT_NAME = "portmap" -INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." - -inherit update-rc.d - -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" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" diff --git a/meta/packages/portmap/portmap/portmap.init b/meta/packages/portmap/portmap/portmap.init deleted file mode 100755 index e46513e11..000000000 --- a/meta/packages/portmap/portmap/portmap.init +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: portmap -# Required-Start: $network -# Required-Stop: $network -# Default-Start: S 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: The RPC portmapper -# Description: Portmap is a server that converts RPC (Remote -# Procedure Call) program numbers into DARPA -# protocol port numbers. It must be running in -# order to make RPC calls. Services that use -# RPC include NFS and NIS. -### END INIT INFO - -test -f /sbin/portmap || exit 0 - -case "$1" in - start) - echo "Starting portmap daemon..." - start-stop-daemon --start --quiet --exec /sbin/portmap - - if [ -f /var/run/portmap.upgrade-state ]; then - echo "Restoring old RPC service information..." - sleep 1 # needs a short pause or pmap_set won't work. :( - pmap_set /var/run/portmap.state - $0 stop - $0 start - if [ ! -f /var/run/portmap.upgrade-state ]; then - sleep 1 - pmap_set