diff options
| -rw-r--r-- | conf/distro/openslug-packages.conf | 1 | ||||
| -rw-r--r-- | packages/iperf/.mtn2git_empty (renamed from packages/nonworking/iperf/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/iperf/iperf-1.7.0/.mtn2git_empty (renamed from packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff (renamed from packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff) | 4 | ||||
| -rw-r--r-- | packages/iperf/iperf_1.7.0.bb (renamed from packages/nonworking/iperf/iperf_1.7.0.bb) | 4 | ||||
| -rw-r--r-- | packages/meta/openslug-native.bb | 3 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 1 |
7 files changed, 8 insertions, 5 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 8719894e6a..25ea543f29 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -53,6 +53,7 @@ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hotplug-ng/*.bb \ ${PKGDIR}/packages/initscripts/*.bb \ ${PKGDIR}/packages/install/*.bb \ +${PKGDIR}/packages/iperf/*.bb \ ${PKGDIR}/packages/ipkg-utils/*.bb \ ${PKGDIR}/packages/ipkg/*.bb \ ${PKGDIR}/packages/ircp/*.bb \ diff --git a/packages/nonworking/iperf/.mtn2git_empty b/packages/iperf/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/iperf/.mtn2git_empty +++ b/packages/iperf/.mtn2git_empty diff --git a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty b/packages/iperf/iperf-1.7.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty +++ b/packages/iperf/iperf-1.7.0/.mtn2git_empty diff --git a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff index 15b1bc2928..4f32e7498f 100644 --- a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff +++ b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff @@ -1,5 +1,5 @@ ---- lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 -+++ lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 +--- ./../lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 ++++ ./../lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 @@ -65,7 +65,7 @@ diff --git a/packages/nonworking/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb index ef075e8c8a..cca0d78fec 100644 --- a/packages/nonworking/iperf/iperf_1.7.0.bb +++ b/packages/iperf/iperf_1.7.0.bb @@ -3,14 +3,14 @@ DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tu HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" +PR = "r1" SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ - file://socketaddr-h-errno.diff;patch=1;pnum=0" + file://socketaddr-h-errno.diff;patch=1" inherit autotools S="${WORKDIR}/iperf-${PV}/cfg" -PATCHES_DIR="${WORKDIR}/iperf-${PV}" do_configure() { oe_runconf diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index 8530111b0f..b52d2ef6eb 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r9" +PR = "r10" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_NATIVE = "\ + autoconf \ automake \ bash \ binutils binutils-dev binutils-symlinks \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 1e53d342d2..61b16917a5 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -63,6 +63,7 @@ OPENSLUG_PACKAGES = "\ glib-2.0 \ gphoto2 \ gtk-doc \ + iperf \ less \ libpam \ libusb \ |