summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb5
-rw-r--r--meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb3
-rw-r--r--meta/recipes-tbd/meta/meta-ide-support.bb2
-rwxr-xr-xscripts/poky-export-rootfs2
-rwxr-xr-xscripts/poky-find-native-sysroot2
-rwxr-xr-xscripts/poky-qemu-ifdown2
-rwxr-xr-xscripts/poky-qemu-ifup2
7 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
index 473411db92..791465694b 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
@@ -1,19 +1,19 @@
1DESCRIPTION = "Qemu helper scripts from Poky" 1DESCRIPTION = "Qemu helper scripts from Poky"
2LICENSE = "GPL" 2LICENSE = "GPL"
3RDEPENDS = "qemu-nativesdk" 3RDEPENDS = "qemu-nativesdk"
4PR = "r7" 4PR = "r8"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-helper" 6FILESPATH = "${FILE_DIRNAME}/qemu-helper"
7 7
8SRC_URI = "file://${POKYBASE}/scripts/poky-qemu \ 8SRC_URI = "file://${POKYBASE}/scripts/poky-qemu \
9 file://${POKYBASE}/scripts/poky-qemu-internal \ 9 file://${POKYBASE}/scripts/poky-qemu-internal \
10 file://${POKYBASE}/scripts/poky-addptable2image \ 10 file://${POKYBASE}/scripts/poky-addptable2image \
11 file://${POKYBASE}/scripts/poky-gen-tapdevs \
11 file://${POKYBASE}/scripts/poky-qemu-ifup \ 12 file://${POKYBASE}/scripts/poky-qemu-ifup \
12 file://${POKYBASE}/scripts/poky-qemu-ifdown \ 13 file://${POKYBASE}/scripts/poky-qemu-ifdown \
13 file://${POKYBASE}/scripts/poky-find-native-sysroot \ 14 file://${POKYBASE}/scripts/poky-find-native-sysroot \
14 file://${POKYBASE}/scripts/poky-extract-sdk \ 15 file://${POKYBASE}/scripts/poky-extract-sdk \
15 file://${POKYBASE}/scripts/poky-export-rootfs \ 16 file://${POKYBASE}/scripts/poky-export-rootfs \
16 file://${POKYBASE}/scripts/runqemu-nfs \
17 file://tunctl.c \ 17 file://tunctl.c \
18 file://raw2flash.c \ 18 file://raw2flash.c \
19 " 19 "
@@ -31,7 +31,6 @@ do_compile() {
31do_install() { 31do_install() {
32 install -d ${D}${bindir} 32 install -d ${D}${bindir}
33 install -m 0755 ${WORKDIR}${POKYBASE}/scripts/poky-* ${D}${bindir}/ 33 install -m 0755 ${WORKDIR}${POKYBASE}/scripts/poky-* ${D}${bindir}/
34 install -m 0755 ${WORKDIR}${POKYBASE}/scripts/runqemu-nfs ${D}${bindir}/
35 install tunctl ${D}${bindir}/ 34 install tunctl ${D}${bindir}/
36 install raw2flash.spitz ${D}${bindir}/ 35 install raw2flash.spitz ${D}${bindir}/
37 install flash2raw.spitz ${D}${bindir}/ 36 install flash2raw.spitz ${D}${bindir}/
diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
index ecba4525a2..66012189dc 100644
--- a/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
+++ b/meta/recipes-devtools/unfs-server/unfs-server_2.2beta47.bb
@@ -3,7 +3,8 @@ SECTION = "console/network"
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" 4LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
5 5
6PR = "r0" 6RDEPENDS = "pseudo"
7PR = "r1"
7 8
8SRC_URI = "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/oldstuff/people/okir/nfs-server-${PV}.tar.gz \ 9SRC_URI = "ftp://linux.mathematik.tu-darmstadt.de/pub/linux/oldstuff/people/okir/nfs-server-${PV}.tar.gz \
9 file://001-2.2b47-2.2b51.patch \ 10 file://001-2.2b47-2.2b51.patch \
diff --git a/meta/recipes-tbd/meta/meta-ide-support.bb b/meta/recipes-tbd/meta/meta-ide-support.bb
index 70a0c64aba..8fe9a23036 100644
--- a/meta/recipes-tbd/meta/meta-ide-support.bb
+++ b/meta/recipes-tbd/meta/meta-ide-support.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE" 1DESCRIPTION = "Meta package for ensuring the build directory contains all appropriate toolchain packages for using an IDE"
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "virtual/libc gdb-cross" 3DEPENDS = "virtual/libc gdb-cross qemu-helper-native unfs-server-native"
4PR = "r1" 4PR = "r1"
5 5
6inherit meta toolchain-scripts 6inherit meta toolchain-scripts
diff --git a/scripts/poky-export-rootfs b/scripts/poky-export-rootfs
index f3552516ad..3ab0597c9a 100755
--- a/scripts/poky-export-rootfs
+++ b/scripts/poky-export-rootfs
@@ -50,7 +50,7 @@ if [ ! -e "$POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
50 echo "Error: Unable to find rpc.mountd binary in $POKY_NATIVE_SYSROOT/usr/sbin/" 50 echo "Error: Unable to find rpc.mountd binary in $POKY_NATIVE_SYSROOT/usr/sbin/"
51 51
52 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then 52 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
53 echo "Have you run 'bitbake unfs-server-native'?" 53 echo "Have you run 'bitbake meta-ide-support'?"
54 else 54 else
55 echo "This shouldn't happen - something is missing from your toolchain installation" 55 echo "This shouldn't happen - something is missing from your toolchain installation"
56 fi 56 fi
diff --git a/scripts/poky-find-native-sysroot b/scripts/poky-find-native-sysroot
index 9182f9d170..d8002f963e 100755
--- a/scripts/poky-find-native-sysroot
+++ b/scripts/poky-find-native-sysroot
@@ -60,7 +60,7 @@ if [ ! -e "$POKY_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
60 echo "Error: Unable to find pseudo binary in $POKY_NATIVE_SYSROOT/usr/bin/" 60 echo "Error: Unable to find pseudo binary in $POKY_NATIVE_SYSROOT/usr/bin/"
61 61
62 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then 62 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
63 echo "Have you run 'bitbake pseudo-native'?" 63 echo "Have you run 'bitbake meta-ide-support'?"
64 else 64 else
65 echo "This shouldn't happen - something is wrong with your toolchain installation" 65 echo "This shouldn't happen - something is wrong with your toolchain installation"
66 fi 66 fi
diff --git a/scripts/poky-qemu-ifdown b/scripts/poky-qemu-ifdown
index ece2dc998a..60ca919dea 100755
--- a/scripts/poky-qemu-ifdown
+++ b/scripts/poky-qemu-ifdown
@@ -50,7 +50,7 @@ if [ ! -e "$TUNCTL" ]; then
50 if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then 50 if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then
51 echo "This shouldn't happen - something is wrong with your toolchain installation" 51 echo "This shouldn't happen - something is wrong with your toolchain installation"
52 else 52 else
53 echo "Have you run 'bitbake qemu-helper-native'?" 53 echo "Have you run 'bitbake meta-ide-support'?"
54 fi 54 fi
55 55
56 exit 1 56 exit 1
diff --git a/scripts/poky-qemu-ifup b/scripts/poky-qemu-ifup
index cd4c47b608..8685c83cce 100755
--- a/scripts/poky-qemu-ifup
+++ b/scripts/poky-qemu-ifup
@@ -57,7 +57,7 @@ if [ ! -x "$TUNCTL" ]; then
57 if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then 57 if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then
58 echo "This shouldn't happen - something is wrong with your toolchain installation" 58 echo "This shouldn't happen - something is wrong with your toolchain installation"
59 else 59 else
60 echo "Have you run 'bitbake qemu-helper-native'?" 60 echo "Have you run 'bitbake meta-ide-support'?"
61 fi 61 fi
62 62
63 exit 1 63 exit 1