summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README19
-rw-r--r--meta/classes/core-image.bbclass6
-rw-r--r--meta/classes/imagetest-qemu.bbclass2
-rw-r--r--meta/classes/license.bbclass4
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh4
-rw-r--r--meta/recipes-devtools/prelink/prelink_git.bb2
-rwxr-xr-xoe-init-build-env4
-rw-r--r--scripts/README2
-rwxr-xr-xscripts/oe-buildenv-internal6
-rw-r--r--scripts/oe-find-native-sysroot6
-rw-r--r--scripts/oe-setup-builddir35
-rwxr-xr-xscripts/runqemu6
-rw-r--r--scripts/runqemu-export-rootfs2
-rw-r--r--scripts/runqemu-extract-sdk2
-rw-r--r--scripts/runqemu-gen-tapdevs12
-rwxr-xr-xscripts/runqemu-ifdown4
-rwxr-xr-xscripts/runqemu-ifup6
-rwxr-xr-xscripts/runqemu-internal6
19 files changed, 67 insertions, 64 deletions
diff --git a/README b/README
index 21b73e2..3eff9ad 100644
--- a/README
+++ b/README
@@ -1,15 +1,10 @@
1Poky 1OpenEmbedded-Core
2==== 2=================
3 3
4Poky platform builder is a combined cross build system and development 4For information about OpenEmbedded see their website:
5environment. It features support for building X11/Matchbox/GTK based 5 http://www.openembedded.org/
6filesystem images for various embedded devices and boards. It also
7supports cross-architecture application development using QEMU emulation
8and a standalone toolchain and SDK with IDE integration.
9 6
10Poky has an extensive handbook, the source of which is contained in 7The Yocto Project has extensive documentation about OE including a reference manual
11the handbook directory. For compiled HTML or pdf versions of this, 8which can be found at:
12see the Poky website http://pokylinux.org. 9 http://yoctoproject.org/community/documentation
13 10
14Additional information on the specifics of hardware that Poky supports
15is available in README.hardware.
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 832319a..c8c6a57 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -1,11 +1,11 @@
1# Common for Poky images 1# Common code for generating core reference images
2# 2#
3# Copyright (C) 2007 OpenedHand LTD 3# Copyright (C) 2007-2011 Linux Foundation
4 4
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8# IMAGE_FEATURES control content of images built with Poky. 8# IMAGE_FEATURES control content of the core reference images
9# 9#
10# By default we install task-core-boot and task-base packages - this gives us 10# By default we install task-core-boot and task-base packages - this gives us
11# working (console only) rootfs. 11# working (console only) rootfs.
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index e71403e..daeb8d8 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -29,7 +29,7 @@ def qemuimagetest_main(d):
29 import os 29 import os
30 30
31 """ 31 """
32 Test Controller for Poky Testing. 32 Test Controller for automated testing.
33 """ 33 """
34 34
35 casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\w+$)') 35 casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\w+$)')
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 5e9ebe5..d0a1418 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -1,4 +1,4 @@
1# Populates LICENSE_DIRECTORY as set in poky.conf with the license files as set by 1# Populates LICENSE_DIRECTORY as set in distro config with the license files as set by
2# LIC_FILES_CHKSUM. 2# LIC_FILES_CHKSUM.
3# TODO: 3# TODO:
4# - We should also enable the ability to put the generated license directory onto the 4# - We should also enable the ability to put the generated license directory onto the
@@ -31,7 +31,7 @@ python do_populate_lic() {
31 destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn) 31 destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn)
32 # The license files are located in S/LIC_FILE_CHECKSUM. 32 # The license files are located in S/LIC_FILE_CHECKSUM.
33 srcdir = bb.data.getVar('S', d, True) 33 srcdir = bb.data.getVar('S', d, True)
34 # Directory we store the generic licenses as set in poky.conf 34 # Directory we store the generic licenses as set in the distro configuration
35 generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True) 35 generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True)
36 if not generic_directory: 36 if not generic_directory:
37 raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config") 37 raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c2a072a..a2b36bd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -528,8 +528,7 @@ SRCPV = "${@bb.fetch2.get_srcrev(d)}"
528 528
529SRC_URI = "file://${FILE}" 529SRC_URI = "file://${FILE}"
530 530
531# We can choose which provider of fake root privileges to use 531# Use pseudo as the fakeroot implementation
532# default is fakeroot but in Poky we use pseudo
533PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 532PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
534FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" 533FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
535FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" 534FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 271acc9..b9d9029 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -21,7 +21,7 @@ for device in 'hda' 'hdb' 'sda' 'sdb'
21 found="yes" 21 found="yes"
22 22
23 while true; do 23 while true; do
24 echo "Found drive at /dev/${device}. Do you want to install poky there ? [y/n]" 24 echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]"
25 read answer 25 read answer
26 if [ "$answer" = "y" ] ; then 26 if [ "$answer" = "y" ] ; then
27 break 27 break
@@ -153,7 +153,7 @@ echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
153 153
154echo "default 0" > /ssd/boot/grub/menu.lst 154echo "default 0" > /ssd/boot/grub/menu.lst
155echo "timeout 30" >> /ssd/boot/grub/menu.lst 155echo "timeout 30" >> /ssd/boot/grub/menu.lst
156echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst 156echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst
157echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst 157echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
158echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst 158echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
159 159
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index cabdf8b..55dab8a 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -26,7 +26,7 @@ inherit autotools
26BBCLASSEXTEND = "native" 26BBCLASSEXTEND = "native"
27 27
28EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \ 28EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \
29 --with-bugurl=http://bugzilla.pokylinux.org/" 29 --with-bugurl=http://bugzilla.yoctoproject.org/"
30 30
31do_configure_prepend () { 31do_configure_prepend () {
32 # Disable documentation! 32 # Disable documentation!
diff --git a/oe-init-build-env b/oe-init-build-env
index 7e2b2ce..77332a7 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -1,8 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Poky Build Enviroment Setup Script 3# OE Build Enviroment Setup Script
4# 4#
5# Copyright (C) 2006-2007 OpenedHand Ltd. 5# Copyright (C) 2006-2011 Linux Foundation
6# 6#
7# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
diff --git a/scripts/README b/scripts/README
index 5363c9b..1b8d127 100644
--- a/scripts/README
+++ b/scripts/README
@@ -1 +1 @@
This directory contains Various useful scripts for working with poky This directory contains Various useful scripts for working with OE builds
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 7e77e43..54430a0 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -1,8 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Poky Build Enviroment Setup Script 3# OE-Core Build Enviroment Setup Script
4# 4#
5# Copyright (C) 2006-2007 OpenedHand Ltd. 5# Copyright (C) 2006-2011 Linux Foundation
6# 6#
7# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ BITBAKEDIR=`readlink -f "$BITBAKEDIR"`
44BUILDDIR=`readlink -f "$BUILDDIR"` 44BUILDDIR=`readlink -f "$BUILDDIR"`
45 45
46if ! (test -d "$BITBAKEDIR"); then 46if ! (test -d "$BITBAKEDIR"); then
47 echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Did you source the script in the poky directory?" 47 echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Did you source the script in the correct directory?"
48 return 48 return
49fi 49fi
50 50
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index da00a07..26fc730 100644
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# 2#
3# Find a native sysroot to use - either from an in-tree Poky build or 3# Find a native sysroot to use - either from an in-tree OE build or
4# from a toolchain installation. It then ensures the variable 4# from a toolchain installation. It then ensures the variable
5# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets 5# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets
6# $PSEUDO to the path of the pseudo binary. 6# $PSEUDO to the path of the pseudo binary.
@@ -15,7 +15,7 @@
15# you set a variable $SKIP_STRICT_SYSROOT_CHECK to a non-empty string 15# you set a variable $SKIP_STRICT_SYSROOT_CHECK to a non-empty string
16# beforehand. 16# beforehand.
17# 17#
18# Copyright (c) 2010 Intel Corp. 18# Copyright (c) 2010 Linux Foundation
19# 19#
20# This program is free software; you can redistribute it and/or modify 20# This program is free software; you can redistribute it and/or modify
21# it under the terms of the GNU General Public License version 2 as 21# it under the terms of the GNU General Public License version 2 as
@@ -47,7 +47,7 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
47 fi 47 fi
48 else 48 else
49 echo "Error: Unable to locate your native sysroot." 49 echo "Error: Unable to locate your native sysroot."
50 echo "Did you forget to source the Poky environment script?" 50 echo "Did you forget to source the build environment setup script?"
51 51
52 if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then 52 if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then
53 exit 1 53 exit 1
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 0e616a7..2f8a064 100644
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -1,8 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Poky Build Enviroment Setup Script 3# OE Build Enviroment Setup Script
4# 4#
5# Copyright (C) 2006-2007 OpenedHand Ltd. 5# Copyright (C) 2006-2011 Linux Foundation
6# 6#
7# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ if [ "x" != "x$TEMPLATECONF" ]; then
44 if ! (test -d "$TEMPLATECONF"); then 44 if ! (test -d "$TEMPLATECONF"); then
45 # Allow TEMPLATECONF=meta-xyz/conf as a shortcut 45 # Allow TEMPLATECONF=meta-xyz/conf as a shortcut
46 if [ -d "$OEROOT/$TEMPLATECONF" ]; then 46 if [ -d "$OEROOT/$TEMPLATECONF" ]; then
47 TEMPLATECONF="$OEROOT/$POKYCONF" 47 TEMPLATECONF="$OEROOT/$TEMPLATECONF"
48 fi 48 fi
49 if ! (test -d "$TEMPLATECONF"); then 49 if ! (test -d "$TEMPLATECONF"); then
50 echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf" 50 echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf"
@@ -60,15 +60,19 @@ if [ "x" = "x$OECORELOCALCONF" ]; then
60fi 60fi
61if ! (test -r "$BUILDDIR/conf/local.conf"); then 61if ! (test -r "$BUILDDIR/conf/local.conf"); then
62cat <<EOM 62cat <<EOM
63You had no conf/local.conf file. Poky has created this configuration file for 63You had no conf/local.conf file. This configuration file has therefore beend
64you with some default values. You may wish to edit it to use a different MACHINE 64created for you with some default values. You may wish to edit it to use a
65(target hardware) or enable parallel build options to take advantage of multiple 65different MACHINE (target hardware) or enable parallel build options to take
66cores for example. See the file for more information as common configuration 66advantage of multiple cores for example. See the file for more information as
67options are commented. 67common configuration options are commented.
68 68
69Also, for more information see the Poky Reference Manual: 69The Yocto Project has extensive documentation about OE including a reference manual
70which can be found at:
70 http://yoctoproject.org/community/documentation 71 http://yoctoproject.org/community/documentation
71 72
73For more information about OpenEmbedded see their website:
74 http://www.openembedded.org/
75
72EOM 76EOM
73 cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf 77 cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf
74fi 78fi
@@ -78,13 +82,18 @@ if [ "x" = "x$OECORELAYERCONF" ]; then
78fi 82fi
79if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then 83if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
80cat <<EOM 84cat <<EOM
81You had no conf/bblayers.conf file. Poky has created this configuration file for 85You had no conf/bblayers.conf file. The configuration file has been created for
82you with some default values. To add additional metadata layers into your 86you with some default values. To add additional metadata layers into your
83configuration please add entries to this file. 87configuration please add entries to this file.
84 88
85For more information see the Poky Reference Manual: 89The Yocto Project has extensive documentation about OE including a reference manual
90which can be found at:
86 http://yoctoproject.org/community/documentation 91 http://yoctoproject.org/community/documentation
87 92
93For more information about OpenEmbedded see their website:
94 http://www.openembedded.org/
95
96
88EOM 97EOM
89 98
90 # Put the abosolute path to the layers in bblayers.conf so we can run 99 # Put the abosolute path to the layers in bblayers.conf so we can run
@@ -98,7 +107,7 @@ unset OECORELAYERCONF
98 107
99cat <<EOM 108cat <<EOM
100 109
101### Shell environment set up for Poky builds. ### 110### Shell environment set up for builds. ###
102 111
103You can now run 'bitbake <target>' 112You can now run 'bitbake <target>'
104 113
diff --git a/scripts/runqemu b/scripts/runqemu
index cef7171..a09362c 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1,8 +1,8 @@
1#!/bin/bash 1#!/bin/bash
2# 2#
3# Handle running Poky images standalone with QEMU 3# Handle running OE images standalone with QEMU
4# 4#
5# Copyright (C) 2006-2010 Intel Corp. 5# Copyright (C) 2006-2011 Linux Foundation
6# 6#
7# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License version 2 as 8# it under the terms of the GNU General Public License version 2 as
@@ -282,7 +282,7 @@ setup_tmpdir() {
282setup_sysroot() { 282setup_sysroot() {
283 # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their 283 # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
284 # environment script. If that variable isn't set, we're 284 # environment script. If that variable isn't set, we're
285 # either in an in-tree poky scenario or the environment 285 # either in an in-tree build scenario or the environment
286 # script wasn't source'd. 286 # script wasn't source'd.
287 if [ -z "$OECORE_NATIVE_SYSROOT" ]; then 287 if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
288 setup_tmpdir 288 setup_tmpdir
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index ae724bd..6b4aee8 100644
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -41,7 +41,7 @@ NFS_EXPORT_DIR=$(cd "$2" && pwd)
41SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot` 41SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
42if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then 42if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
43 echo "Error: Unable to find the oe-find-native-sysroot script" 43 echo "Error: Unable to find the oe-find-native-sysroot script"
44 echo "Did you forget to source your Poky environment script?" 44 echo "Did you forget to source your build environment setup script?"
45 exit 1 45 exit 1
46fi 46fi
47. $SYSROOT_SETUP_SCRIPT 47. $SYSROOT_SETUP_SCRIPT
diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
index e476f3f..d30e5a6 100644
--- a/scripts/runqemu-extract-sdk
+++ b/scripts/runqemu-extract-sdk
@@ -32,7 +32,7 @@ fi
32SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot` 32SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
33if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then 33if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
34 echo "Error: Unable to find the oe-find-native-sysroot script" 34 echo "Error: Unable to find the oe-find-native-sysroot script"
35 echo "Did you forget to source your Poky environment script?" 35 echo "Did you forget to source your build system environment setup script?"
36 exit 1 36 exit 1
37fi 37fi
38. $SYSROOT_SETUP_SCRIPT 38. $SYSROOT_SETUP_SCRIPT
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs
index f52cf0b..995e1d5 100644
--- a/scripts/runqemu-gen-tapdevs
+++ b/scripts/runqemu-gen-tapdevs
@@ -2,10 +2,10 @@
2# 2#
3# Create a "bank" of tap network devices that can be used by the 3# Create a "bank" of tap network devices that can be used by the
4# runqemu script. This script needs to be run as root, and will 4# runqemu script. This script needs to be run as root, and will
5# use the tunctl binary from a Poky sysroot. Note: many Linux distros 5# use the tunctl binary from the build system sysroot. Note: many Linux
6# these days still use an older version of tunctl which does not 6# distros these days still use an older version of tunctl which does not
7# support the group permissions option, hence the need to use Poky's 7# support the group permissions option, hence the need to use the build
8# version. 8# system provided version.
9# 9#
10# Copyright (C) 2010 Intel Corp. 10# Copyright (C) 2010 Intel Corp.
11# 11#
@@ -26,7 +26,7 @@ usage() {
26 echo "Usage: sudo $0 <gid> <num> <native-sysroot-basedir>" 26 echo "Usage: sudo $0 <gid> <num> <native-sysroot-basedir>"
27 echo "Where <gid> is the numeric group id the tap devices will be owned by" 27 echo "Where <gid> is the numeric group id the tap devices will be owned by"
28 echo "<num> is the number of tap devices to create (0 to remove all)" 28 echo "<num> is the number of tap devices to create (0 to remove all)"
29 echo "<native-sysroot-basedir> is the path to Poky's native sysroot" 29 echo "<native-sysroot-basedir> is the path to the build system's native sysroot"
30 exit 1 30 exit 1
31} 31}
32 32
@@ -82,4 +82,4 @@ done
82# The runqemu script will check for this file, and if it exists, 82# The runqemu script will check for this file, and if it exists,
83# will use the existing bank of tap devices without creating 83# will use the existing bank of tap devices without creating
84# additional ones via sudo. 84# additional ones via sudo.
85touch /etc/poky-nosudo 85touch /etc/runqemu-nosudo
diff --git a/scripts/runqemu-ifdown b/scripts/runqemu-ifdown
index 9961341..710d297 100755
--- a/scripts/runqemu-ifdown
+++ b/scripts/runqemu-ifdown
@@ -2,7 +2,7 @@
2# 2#
3# QEMU network configuration script to bring down tap devices. This 3# QEMU network configuration script to bring down tap devices. This
4# utility needs to be run as root, and will use the tunctl binary 4# utility needs to be run as root, and will use the tunctl binary
5# from a Poky sysroot. 5# from the native sysroot.
6# 6#
7# If you find yourself calling this script a lot, you can add the 7# If you find yourself calling this script a lot, you can add the
8# the following to your /etc/sudoers file to be able to run this 8# the following to your /etc/sudoers file to be able to run this
@@ -11,7 +11,7 @@
11# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifup 11# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifup
12# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown 12# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
13# 13#
14# Copyright (c) 2006-2010 Intel Corp. 14# Copyright (c) 2006-2011 Linux Foundation
15# 15#
16# This program is free software; you can redistribute it and/or modify 16# This program is free software; you can redistribute it and/or modify
17# it under the terms of the GNU General Public License version 2 as 17# it under the terms of the GNU General Public License version 2 as
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index a391414..f9b2f03 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -1,10 +1,10 @@
1#!/bin/bash 1#!/bin/bash
2# 2#
3# QEMU network interface configuration script. This utility needs to 3# QEMU network interface configuration script. This utility needs to
4# be run as root, and will use the tunctl binary from a Poky sysroot. 4# be run as root, and will use the tunctl binary from a native sysroot.
5# Note: many Linux distros these days still use an older version of 5# Note: many Linux distros these days still use an older version of
6# tunctl which does not support the group permissions option, hence 6# tunctl which does not support the group permissions option, hence
7# the need to use Poky's version. 7# the need to use build system's version.
8# 8#
9# If you find yourself calling this script a lot, you can add the 9# If you find yourself calling this script a lot, you can add the
10# the following to your /etc/sudoers file to be able to run this 10# the following to your /etc/sudoers file to be able to run this
@@ -18,7 +18,7 @@
18# that script, the runqemu script will never end up calling this 18# that script, the runqemu script will never end up calling this
19# script. 19# script.
20# 20#
21# Copyright (c) 2006-2010 Intel Corp. 21# Copyright (c) 2006-2011 Linux Foundation
22# 22#
23# This program is free software; you can redistribute it and/or modify 23# This program is free software; you can redistribute it and/or modify
24# it under the terms of the GNU General Public License version 2 as 24# it under the terms of the GNU General Public License version 2 as
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index afe97b5..9a786e4 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -1,8 +1,8 @@
1#!/bin/bash -x 1#!/bin/bash -x
2 2
3# Handle running Poky images under qemu 3# Handle running OE images under qemu
4# 4#
5# Copyright (C) 2006-2008 OpenedHand Ltd. 5# Copyright (C) 2006-2011 Linux Foundation
6# 6#
7# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License version 2 as 8# it under the terms of the GNU General Public License version 2 as
@@ -86,7 +86,7 @@ fi
86# This file is created when runqemu-gen-tapdevs creates a bank of tap 86# This file is created when runqemu-gen-tapdevs creates a bank of tap
87# devices, indicating that the user should not bring up new ones using 87# devices, indicating that the user should not bring up new ones using
88# sudo. 88# sudo.
89NOSUDO_FLAG="/etc/poky-nosudo" 89NOSUDO_FLAG="/etc/runqemu-nosudo"
90 90
91QEMUIFUP=`which runqemu-ifup` 91QEMUIFUP=`which runqemu-ifup`
92QEMUIFDOWN=`which runqemu-ifdown` 92QEMUIFDOWN=`which runqemu-ifdown`