diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-09-18 11:56:02 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-09-18 11:56:02 +0000 |
| commit | 0ea32d05abf14f08f56b1507fe7b0ec8e864a960 (patch) | |
| tree | 45f3ec55ca7ee626ccce9fffc8e0b1004bc57973 | |
| parent | 34d541989b46dcb68d5e2356ed4afe31572dc95d (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/oe/packages
2004/09/18 07:55:19-04:00 handhelds.org!kergoth
In dropbear, kill the extranious dependency on ncurses, build it dynamic, not
static, and bump PR.
BKrev: 414c2252HFbwwIW3hE90aLbuBY0URg
| -rw-r--r-- | dropbear/dropbear_0.41.oe | 2 | ||||
| -rw-r--r-- | dropbear/dropbear_0.42.oe | 2 | ||||
| -rw-r--r-- | dropbear/dropbear_0.43+0.44test4.oe | 12 | ||||
| -rw-r--r-- | dropbear/dropbear_0.43.oe | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/dropbear/dropbear_0.41.oe b/dropbear/dropbear_0.41.oe index 7f469f6fd6..dc9c26f707 100644 --- a/dropbear/dropbear_0.41.oe +++ b/dropbear/dropbear_0.41.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Dropbear SSH Implementation" LICENSE = "MIT" -DEPENDS = "zlib ncurses" +DEPENDS = "zlib" PR = "r2" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ diff --git a/dropbear/dropbear_0.42.oe b/dropbear/dropbear_0.42.oe index 959b7b21be..f63dd214fa 100644 --- a/dropbear/dropbear_0.42.oe +++ b/dropbear/dropbear_0.42.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Dropbear SSH Implementation" LICENSE = "MIT" -DEPENDS = "zlib ncurses" +DEPENDS = "zlib" PR = "r4" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ diff --git a/dropbear/dropbear_0.43+0.44test4.oe b/dropbear/dropbear_0.43+0.44test4.oe index 074a3c4b0a..558f137338 100644 --- a/dropbear/dropbear_0.43+0.44test4.oe +++ b/dropbear/dropbear_0.43+0.44test4.oe @@ -1,7 +1,7 @@ DESCRIPTION = "Dropbear SSH Implementation" LICENSE = "MIT" -DEPENDS = "zlib ncurses" -PR = "r0" +DEPENDS = "zlib" +PR = "r1" RV = "0.44test4" SRC_URI = "http://matt.ucc.asn.au/dropbear/testing/dropbear-${RV}.tar.bz2 \ @@ -20,7 +20,7 @@ LD = "${CC}" SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" BINCOMMANDS = "dbclient ssh scp" -EXTRA_OEMAKE = 'STATIC=1 MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' +EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' do_install () { install -d ${D}/${sysconfdir} \ @@ -31,14 +31,14 @@ do_install () { ${D}/${sbindir} \ ${D}/${localstatedir} - install -m 0755 staticdropbearmulti ${D}/${sbindir}/ + install -m 0755 dropbearmulti ${D}/${sbindir}/ for i in ${BINCOMMANDS} do - ln -s ${sbindir}/staticdropbearmulti ${D}/${bindir}/$i + ln -s ${sbindir}/dropbearmulti ${D}/${bindir}/$i done for i in ${SBINCOMMANDS} do - ln -s ./staticdropbearmulti ${D}/${sbindir}/$i + ln -s ./dropbearmulti ${D}/${sbindir}/$i done cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \ -e 's,/usr/sbin,${sbindir},g' \ diff --git a/dropbear/dropbear_0.43.oe b/dropbear/dropbear_0.43.oe index 1c4330c382..658a386199 100644 --- a/dropbear/dropbear_0.43.oe +++ b/dropbear/dropbear_0.43.oe @@ -1,6 +1,6 @@ DESCRIPTION = "Dropbear SSH Implementation" LICENSE = "MIT" -DEPENDS = "zlib ncurses" +DEPENDS = "zlib" PR = "r6" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ |