diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
| commit | 4f857db335de6935077d4866c51dd9d6851fed1d (patch) | |
| tree | 1c923be071d1a56bd79f467fd75ac77959a493a3 /packages/portmap | |
| parent | b32403d57d7e0473dd336e76f95c7b26f113cf26 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.
2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting.
2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.
2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded
2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references. As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.
2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.
BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg
Diffstat (limited to 'packages/portmap')
| -rw-r--r-- | packages/portmap/portmap_5-7.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/portmap/portmap_5-7.bb b/packages/portmap/portmap_5-7.bb index 4234f1c823..4acb379673 100644 --- a/packages/portmap/portmap_5-7.bb +++ b/packages/portmap/portmap_5-7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -PR = "r1" +PR = "r2" 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 \ @@ -12,6 +12,7 @@ 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 . start 18 2 3 4 5 . stop 81 1 ." @@ -25,8 +26,8 @@ do_compile() { } do_install() { - install -d ${D}/etc/init.d - install -m 0755 ${WORKDIR}/portmap.init ${D}/etc/init.d/portmap - oe_runmake 'docdir=${datadir}/doc/portmap' \ + 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 } |