From fe73ea8c510877fe4e3c117985e8f3d0b79ddf1b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Apr 2011 12:26:25 +0100 Subject: Further cleanup of various poky references Signed-off-by: Richard Purdie --- README | 19 +++++------- meta/classes/core-image.bbclass | 6 ++-- meta/classes/imagetest-qemu.bbclass | 2 +- meta/classes/license.bbclass | 4 +-- meta/conf/bitbake.conf | 3 +- .../initrdscripts/files/init-install.sh | 4 +-- meta/recipes-devtools/prelink/prelink_git.bb | 2 +- oe-init-build-env | 4 +-- scripts/README | 2 +- scripts/oe-buildenv-internal | 6 ++-- scripts/oe-find-native-sysroot | 6 ++-- scripts/oe-setup-builddir | 35 ++++++++++++++-------- scripts/runqemu | 6 ++-- scripts/runqemu-export-rootfs | 2 +- scripts/runqemu-extract-sdk | 2 +- scripts/runqemu-gen-tapdevs | 12 ++++---- scripts/runqemu-ifdown | 4 +-- scripts/runqemu-ifup | 6 ++-- scripts/runqemu-internal | 6 ++-- 19 files changed, 67 insertions(+), 64 deletions(-) diff --git a/README b/README index 21b73e2832..3eff9ad0e9 100644 --- a/README +++ b/README @@ -1,15 +1,10 @@ -Poky -==== +OpenEmbedded-Core +================= -Poky platform builder is a combined cross build system and development -environment. It features support for building X11/Matchbox/GTK based -filesystem images for various embedded devices and boards. It also -supports cross-architecture application development using QEMU emulation -and a standalone toolchain and SDK with IDE integration. +For information about OpenEmbedded see their website: + http://www.openembedded.org/ -Poky has an extensive handbook, the source of which is contained in -the handbook directory. For compiled HTML or pdf versions of this, -see the Poky website http://pokylinux.org. +The Yocto Project has extensive documentation about OE including a reference manual +which can be found at: + http://yoctoproject.org/community/documentation -Additional information on the specifics of hardware that Poky supports -is available in README.hardware. diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 832319a5ae..c8c6a57426 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -1,11 +1,11 @@ -# Common for Poky images +# Common code for generating core reference images # -# Copyright (C) 2007 OpenedHand LTD +# Copyright (C) 2007-2011 Linux Foundation LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -# IMAGE_FEATURES control content of images built with Poky. +# IMAGE_FEATURES control content of the core reference images # # By default we install task-core-boot and task-base packages - this gives us # working (console only) rootfs. diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass index e71403ece3..daeb8d8c9c 100644 --- a/meta/classes/imagetest-qemu.bbclass +++ b/meta/classes/imagetest-qemu.bbclass @@ -29,7 +29,7 @@ def qemuimagetest_main(d): import os """ - Test Controller for Poky Testing. + Test Controller for automated testing. """ casestr = re.compile(r'(?P\w+\b):(?P\w+$)') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 5e9ebe5ef4..d0a14187ff 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -1,4 +1,4 @@ -# Populates LICENSE_DIRECTORY as set in poky.conf with the license files as set by +# Populates LICENSE_DIRECTORY as set in distro config with the license files as set by # LIC_FILES_CHKSUM. # TODO: # - We should also enable the ability to put the generated license directory onto the @@ -31,7 +31,7 @@ python do_populate_lic() { destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn) # The license files are located in S/LIC_FILE_CHECKSUM. srcdir = bb.data.getVar('S', d, True) - # Directory we store the generic licenses as set in poky.conf + # Directory we store the generic licenses as set in the distro configuration generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True) if not generic_directory: 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 c2a072a329..a2b36bdbef 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -528,8 +528,7 @@ SRCPV = "${@bb.fetch2.get_srcrev(d)}" SRC_URI = "file://${FILE}" -# We can choose which provider of fake root privileges to use -# default is fakeroot but in Poky we use pseudo +# Use pseudo as the fakeroot implementation PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index 271acc93ff..b9d9029d21 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' found="yes" while true; do - echo "Found drive at /dev/${device}. Do you want to install poky there ? [y/n]" + echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]" read answer if [ "$answer" = "y" ] ; then break @@ -153,7 +153,7 @@ echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map echo "default 0" > /ssd/boot/grub/menu.lst echo "timeout 30" >> /ssd/boot/grub/menu.lst -echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst +echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb index cabdf8baf0..55dab8aaae 100644 --- a/meta/recipes-devtools/prelink/prelink_git.bb +++ b/meta/recipes-devtools/prelink/prelink_git.bb @@ -26,7 +26,7 @@ inherit autotools BBCLASSEXTEND = "native" EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \ - --with-bugurl=http://bugzilla.pokylinux.org/" + --with-bugurl=http://bugzilla.yoctoproject.org/" do_configure_prepend () { # Disable documentation! diff --git a/oe-init-build-env b/oe-init-build-env index 7e2b2cebfa..77332a7d63 100755 --- a/oe-init-build-env +++ b/oe-init-build-env @@ -1,8 +1,8 @@ #!/bin/sh -# Poky Build Enviroment Setup Script +# OE Build Enviroment Setup Script # -# Copyright (C) 2006-2007 OpenedHand Ltd. +# Copyright (C) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/README b/scripts/README index 5363c9b4ef..1b8d127245 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 7e77e43df6..54430a026b 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -1,8 +1,8 @@ #!/bin/sh -# Poky Build Enviroment Setup Script +# OE-Core Build Enviroment Setup Script # -# Copyright (C) 2006-2007 OpenedHand Ltd. +# Copyright (C) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ BITBAKEDIR=`readlink -f "$BITBAKEDIR"` BUILDDIR=`readlink -f "$BUILDDIR"` if ! (test -d "$BITBAKEDIR"); then - echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Did you source the script in the poky directory?" + echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Did you source the script in the correct directory?" return fi diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot index da00a07850..26fc730c60 100755 --- a/scripts/oe-find-native-sysroot +++ b/scripts/oe-find-native-sysroot @@ -1,6 +1,6 @@ #!/bin/bash # -# Find a native sysroot to use - either from an in-tree Poky build or +# Find a native sysroot to use - either from an in-tree OE build or # from a toolchain installation. It then ensures the variable # $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets # $PSEUDO to the path of the pseudo binary. @@ -15,7 +15,7 @@ # you set a variable $SKIP_STRICT_SYSROOT_CHECK to a non-empty string # beforehand. # -# Copyright (c) 2010 Intel Corp. +# Copyright (c) 2010 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -47,7 +47,7 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then fi else echo "Error: Unable to locate your native sysroot." - echo "Did you forget to source the Poky environment script?" + echo "Did you forget to source the build environment setup script?" if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then exit 1 diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 0e616a7805..2f8a0646b9 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -1,8 +1,8 @@ #!/bin/sh -# Poky Build Enviroment Setup Script +# OE Build Enviroment Setup Script # -# Copyright (C) 2006-2007 OpenedHand Ltd. +# Copyright (C) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ if [ "x" != "x$TEMPLATECONF" ]; then if ! (test -d "$TEMPLATECONF"); then # Allow TEMPLATECONF=meta-xyz/conf as a shortcut if [ -d "$OEROOT/$TEMPLATECONF" ]; then - TEMPLATECONF="$OEROOT/$POKYCONF" + TEMPLATECONF="$OEROOT/$TEMPLATECONF" fi if ! (test -d "$TEMPLATECONF"); then echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf" @@ -60,15 +60,19 @@ if [ "x" = "x$OECORELOCALCONF" ]; then fi if ! (test -r "$BUILDDIR/conf/local.conf"); then cat <' diff --git a/scripts/runqemu b/scripts/runqemu index cef71712e7..a09362c6a1 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1,8 +1,8 @@ #!/bin/bash # -# Handle running Poky images standalone with QEMU +# Handle running OE images standalone with QEMU # -# Copyright (C) 2006-2010 Intel Corp. +# Copyright (C) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -282,7 +282,7 @@ setup_tmpdir() { setup_sysroot() { # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their # environment script. If that variable isn't set, we're - # either in an in-tree poky scenario or the environment + # either in an in-tree build scenario or the environment # script wasn't source'd. if [ -z "$OECORE_NATIVE_SYSROOT" ]; then setup_tmpdir diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs index ae724bd63e..6b4aee8116 100755 --- a/scripts/runqemu-export-rootfs +++ b/scripts/runqemu-export-rootfs @@ -41,7 +41,7 @@ NFS_EXPORT_DIR=$(cd "$2" && pwd) SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot` if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then echo "Error: Unable to find the oe-find-native-sysroot script" - echo "Did you forget to source your Poky environment script?" + echo "Did you forget to source your build environment setup script?" exit 1 fi . $SYSROOT_SETUP_SCRIPT diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk index e476f3f637..d30e5a64aa 100755 --- a/scripts/runqemu-extract-sdk +++ b/scripts/runqemu-extract-sdk @@ -32,7 +32,7 @@ fi SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot` if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then echo "Error: Unable to find the oe-find-native-sysroot script" - echo "Did you forget to source your Poky environment script?" + echo "Did you forget to source your build system environment setup script?" exit 1 fi . $SYSROOT_SETUP_SCRIPT diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs index f52cf0b9b9..995e1d5204 100755 --- a/scripts/runqemu-gen-tapdevs +++ b/scripts/runqemu-gen-tapdevs @@ -2,10 +2,10 @@ # # Create a "bank" of tap network devices that can be used by the # runqemu script. This script needs to be run as root, and will -# use the tunctl binary from a Poky sysroot. Note: many Linux distros -# these days still use an older version of tunctl which does not -# support the group permissions option, hence the need to use Poky's -# version. +# use the tunctl binary from the build system sysroot. Note: many Linux +# distros these days still use an older version of tunctl which does not +# support the group permissions option, hence the need to use the build +# system provided version. # # Copyright (C) 2010 Intel Corp. # @@ -26,7 +26,7 @@ usage() { echo "Usage: sudo $0 " echo "Where is the numeric group id the tap devices will be owned by" echo " is the number of tap devices to create (0 to remove all)" - echo " is the path to Poky's native sysroot" + echo " is the path to the build system's native sysroot" exit 1 } @@ -82,4 +82,4 @@ done # The runqemu script will check for this file, and if it exists, # will use the existing bank of tap devices without creating # additional ones via sudo. -touch /etc/poky-nosudo +touch /etc/runqemu-nosudo diff --git a/scripts/runqemu-ifdown b/scripts/runqemu-ifdown index 99613416c7..710d2975c5 100755 --- a/scripts/runqemu-ifdown +++ b/scripts/runqemu-ifdown @@ -2,7 +2,7 @@ # # QEMU network configuration script to bring down tap devices. This # utility needs to be run as root, and will use the tunctl binary -# from a Poky sysroot. +# from the native sysroot. # # If you find yourself calling this script a lot, you can add the # the following to your /etc/sudoers file to be able to run this @@ -11,7 +11,7 @@ # ALL=NOPASSWD: /path/to/runqemu-ifup # ALL=NOPASSWD: /path/to/runqemu-ifdown # -# Copyright (c) 2006-2010 Intel Corp. +# Copyright (c) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index a3914140a6..f9b2f035cd 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -1,10 +1,10 @@ #!/bin/bash # # QEMU network interface configuration script. This utility needs to -# be run as root, and will use the tunctl binary from a Poky sysroot. +# be run as root, and will use the tunctl binary from a native sysroot. # Note: many Linux distros these days still use an older version of # tunctl which does not support the group permissions option, hence -# the need to use Poky's version. +# the need to use build system's version. # # If you find yourself calling this script a lot, you can add the # the following to your /etc/sudoers file to be able to run this @@ -18,7 +18,7 @@ # that script, the runqemu script will never end up calling this # script. # -# Copyright (c) 2006-2010 Intel Corp. +# Copyright (c) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index afe97b5f9d..9a786e4290 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -1,8 +1,8 @@ #!/bin/bash -x -# Handle running Poky images under qemu +# Handle running OE images under qemu # -# Copyright (C) 2006-2008 OpenedHand Ltd. +# Copyright (C) 2006-2011 Linux Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -86,7 +86,7 @@ fi # This file is created when runqemu-gen-tapdevs creates a bank of tap # devices, indicating that the user should not bring up new ones using # sudo. -NOSUDO_FLAG="/etc/poky-nosudo" +NOSUDO_FLAG="/etc/runqemu-nosudo" QEMUIFUP=`which runqemu-ifup` QEMUIFDOWN=`which runqemu-ifdown` -- cgit 1.2.3-korg