[oe-commits] org.oe.dev portmap: use DEBIAN_MIRROR instead of hardcoding one

[mickeyl commit]

portmap: use DEBIAN_MIRROR instead of hardcoding one

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 864030c30acdb89f49bcfbd4707a4a16dcfb2b53
ViewMTN: http://monotone.openembedded.org/revision.psp?id=864030c30acdb89f49bcfbd4707a4a16dcfb2b53
Files:
1
packages/portmap/portmap-unslung_5-9.bb
packages/portmap/portmap.inc
Diffs:

#
# mt diff -r17ce0a15a8bf58dbe4b4b3d92ba51d210f2b7407 -r864030c30acdb89f49bcfbd4707a4a16dcfb2b53
#
# 
# 
# patch "packages/portmap/portmap-unslung_5-9.bb"
#  from [ccabd4940cfe449e998a5f2a186d3ed1ceeb708f]
#    to [24a49a6ecc4c1f8caef6f8b5513c33c5fa67635c]
# 
# patch "packages/portmap/portmap.inc"
#  from [a7e64848247573974a5d6f1c3561a42c89357639]
#    to [b481178191e08818bc9a6fb7591b456ebec38770]
# 
============================================================
--- packages/portmap/portmap-unslung_5-9.bb	ccabd4940cfe449e998a5f2a186d3ed1ceeb708f
+++ packages/portmap/portmap-unslung_5-9.bb	24a49a6ecc4c1f8caef6f8b5513c33c5fa67635c
@@ -1,11 +1,11 @@ COMPATIBLE_MACHINE = "nslu2"
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
 PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+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"
@@ -18,6 +18,5 @@ do_install() {
 }
 
 do_install() {
-	oe_runmake 'docdir=${datadir}/doc/portmap' \
-		   'DESTDIR=${D}' install
+	oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install
 }
============================================================
--- packages/portmap/portmap.inc	a7e64848247573974a5d6f1c3561a42c89357639
+++ packages/portmap/portmap.inc	b481178191e08818bc9a6fb7591b456ebec38770
@@ -1,18 +1,14 @@ LICENSE = "GPL"
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+	http://${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"
 S = "${WORKDIR}/portmap_5beta"
 
-PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
-FILES_${PN}-doc += "${docdir}"
-
 INITSCRIPT_NAME = "portmap"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
@@ -27,6 +23,9 @@ do_install() {
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-	oe_runmake 'docdir=${docdir}/portmap' \
-		   'DESTDIR=${D}' install
+	oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
 }
+
+PACKAGES =+ "portmap-utils"
+FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
+FILES_${PN}-doc += "${docdir}"