aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/netkit-telnet
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-27 12:44:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-27 12:44:07 +0200
commit293b05335ab540c4c8402e0a5caf2886b786a318 (patch)
tree11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/netkit-telnet
parent1ee2156592ba17f64f3c9b8970285a259730b871 (diff)
parente9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff)
downloadopenembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts: recipes/linux/linux-openmoko-devel_git.bb recipes/openmoko-3rdparty/pisi_0.5.2.bb recipes/openmoko-3rdparty/pisi_0.5.3.bb recipes/openmoko-3rdparty/pisi_0.5.bb recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/netkit-telnet')
-rw-r--r--recipes/netkit-telnet/netkit-telnet_0.17.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/netkit-telnet/netkit-telnet_0.17.bb b/recipes/netkit-telnet/netkit-telnet_0.17.bb
index 74ba102533..8aceb2e23d 100644
--- a/recipes/netkit-telnet/netkit-telnet_0.17.bb
+++ b/recipes/netkit-telnet/netkit-telnet_0.17.bb
@@ -5,8 +5,8 @@ LICENSE = "BSD"
PR = "r1"
SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz \
- file://netkit-telnet-debian_0.17-36.diff;patch=1 \
- file://cross-compile.patch;patch=1 "
+ file://netkit-telnet-debian_0.17-36.diff \
+ file://cross-compile.patch "
do_configure () {
./configure --prefix=${prefix}