summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2004-10-01 22:29:35 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2004-10-01 22:29:35 +0000
commitec1e22dab4b1eecc8e28b0eb73b7a1e9e35748e3 (patch)
tree881ef7841198b14126b13aeaa02bceb414cc26b5
parent6fa0c6325a5b9a41b9507e4d5f7e5dfaf06820de (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/10/02 00:13:11+02:00 dyndns.org!reenoo task-bootstrap: remove resolvconf from (R)DEPENDS to avoid pulling in full bash as requested by pb 2004/10/02 00:02:35+02:00 dyndns.org!reenoo Merge bk://openembedded@openembedded.bkbits.net/packages into sugarcube.dyndns.org:/home2/oe/oe/packages 2004/10/02 00:02:16+02:00 dyndns.org!reenoo dropbear: search for xauth in PATH rather than using a hardcoded path to it BKrev: 415dda4fKEsl1OO5SRF0Nfx53CZVPQ
-rw-r--r--dropbear/dropbear-0.43+0.44test4/xauth-path.patch0
-rw-r--r--dropbear/dropbear_0.43+0.44test4.oe3
-rw-r--r--meta/task-bootstrap.oe4
3 files changed, 4 insertions, 3 deletions
diff --git a/dropbear/dropbear-0.43+0.44test4/xauth-path.patch b/dropbear/dropbear-0.43+0.44test4/xauth-path.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/dropbear/dropbear-0.43+0.44test4/xauth-path.patch
diff --git a/dropbear/dropbear_0.43+0.44test4.oe b/dropbear/dropbear_0.43+0.44test4.oe
index 9bb5564f27..c40cfa0503 100644
--- a/dropbear/dropbear_0.43+0.44test4.oe
+++ b/dropbear/dropbear_0.43+0.44test4.oe
@@ -1,12 +1,13 @@
DESCRIPTION = "Dropbear SSH Implementation"
LICENSE = "MIT"
DEPENDS = "zlib"
-PR = "r3"
+PR = "r4"
RV = "0.44test4"
SRC_URI = "http://matt.ucc.asn.au/dropbear/testing/dropbear-${RV}.tar.bz2 \
file://configure.patch;patch=1 \
file://allow-nopw.patch;patch=1 \
+ file://xauth-path.patch;patch=1 \
file://init"
S = "${WORKDIR}/dropbear-${RV}"
diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
index 88a59dc9b5..0e96d26bc9 100644
--- a/meta/task-bootstrap.oe
+++ b/meta/task-bootstrap.oe
@@ -7,13 +7,13 @@ PACKAGES = "${PN}"
DEPENDS = 'base-files base-passwd-3.5.7 \
busybox dropbear hotplug initscripts modutils netbase \
- resolvconf sysvinit tinylogin lrzsz portmap \
+ sysvinit tinylogin lrzsz portmap \
modutils-initscripts timezones \
${BOOTSTRAP_EXTRA_DEPENDS}'
RDEPENDS = 'base-files base-passwd busybox \
hotplug initscripts modutils-depmod modutils-modinfo \
- netbase resolvconf sysvinit tinylogin \
+ netbase sysvinit tinylogin \
modutils-initscripts timezones \
${BOOTSTRAP_EXTRA_RDEPENDS}'