sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

POKY_NATIVE_SYSROOT -> OECORE_NATIVE_SYSROOT 

(From OE-Core rev: c056aeaa13549b404088e3d465f3b03443e5ab88)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-04-20 17:55:16 +01:00
parent 0441fe20e7
commit 7469527855
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/toolchain-scripts.bbclass
View File

@ -26,7 +26,7 @@ toolchain_create_sdk_env_script () {
echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
} }
@ -57,7 +57,7 @@ toolchain_create_tree_env_script () {
fi fi
echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
echo 'export POKY_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
} }
@ -87,7 +87,7 @@ toolchain_create_sdk_env_script_for_installer () {
echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script

10
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
View File

@ -29,11 +29,11 @@ parse_config()
case $INST_ARCH in case $INST_ARCH in
i[3-6]86) i[3-6]86)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/"
;; ;;
x86_64) x86_64)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/" OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/"
;; ;;
*) *)
echo_info "[ADT_INST] Error: Installation Machine is not supported!" echo_info "[ADT_INST] Error: Installation Machine is not supported!"
@ -124,9 +124,9 @@ for native_target_type in $YOCTOADT_TARGETS; do
done done
# Link the ld.so.cache file into the hosts filesystem # Link the ld.so.cache file into the hosts filesystem
if [ ! -f "$POKY_NATIVE_SYSROOT/etc/ld.so.cache" ]; then if [ ! -f "$OECORE_NATIVE_SYSROOT/etc/ld.so.cache" ]; then
echo_info "Link the ld.so.cache file into the host filesystem" echo_info "Link the ld.so.cache file into the host filesystem"
sudo ln -s /etc/ld.so.cache $POKY_NATIVE_SYSROOT/etc/ld.so.cache sudo ln -s /etc/ld.so.cache $OECORE_NATIVE_SYSROOT/etc/ld.so.cache
check_result check_result
fi fi
@ -175,7 +175,7 @@ qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'`
sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2"
#echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type
check_result check_result
echo_info "Updating environment script with target sysroot location." echo_info "Updating environment script with target sysroot location."

2
meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
View File

@ -61,7 +61,7 @@ extract_rootfs()
#Parameter detail is listed below: #Parameter detail is listed below:
#Param 4: Silent install or customize install #Param 4: Silent install or customize install
#Param 3: POKY_NATIVE_SYSROOT #Param 3: OECORE_NATIVE_SYSROOT
#Param 2: user defined rootfs extraction directory #Param 2: user defined rootfs extraction directory
#param 1: sysroot image name #param 1: sysroot image name
extract_rootfs $1 $2 $3 $4 extract_rootfs $1 $2 $3 $4

14
scripts/poky-export-rootfs
View File

@ -46,8 +46,8 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
fi fi
. $SYSROOT_SETUP_SCRIPT . $SYSROOT_SETUP_SCRIPT
if [ ! -e "$POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
echo "Error: Unable to find rpc.mountd binary in $POKY_NATIVE_SYSROOT/usr/sbin/" echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
if [ "x$POKY_DISTRO_VERSION" = "x" ]; then if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
echo "Have you run 'bitbake meta-ide-support'?" echo "Have you run 'bitbake meta-ide-support'?"
@ -67,7 +67,7 @@ RMTAB=~/.poky-sdk/rmtab$NFS_INSTANCE
NFSPID=~/.poky-sdk/nfs$NFS_INSTANCE.pid NFSPID=~/.poky-sdk/nfs$NFS_INSTANCE.pid
MOUNTPID=~/.poky-sdk/mount$NFS_INSTANCE.pid MOUNTPID=~/.poky-sdk/mount$NFS_INSTANCE.pid
PSEUDO_OPTS="-P $POKY_NATIVE_SYSROOT/usr" PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"
PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo" PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo"
export PSEUDO_LOCALSTATEDIR export PSEUDO_LOCALSTATEDIR
@ -99,8 +99,8 @@ fi
case "$1" in case "$1" in
start) start)
echo "Starting User Mode rpc.mountd" echo "Starting User Mode rpc.mountd"
echo " $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS" echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS"
$PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS
if [ ! $? = 0 ]; then if [ ! $? = 0 ]; then
echo "=====================" echo "====================="
echo "Error starting MOUNTD" echo "Error starting MOUNTD"
@ -122,8 +122,8 @@ case "$1" in
exit 1 exit 1
fi fi
echo "Starting User Mode nfsd" echo "Starting User Mode nfsd"
echo " $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS" echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS"
$PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS
if [ ! $? = 0 ]; then if [ ! $? = 0 ]; then
echo "Error starting nfsd" echo "Error starting nfsd"
exit 1 exit 1

2
scripts/poky-extract-sdk
View File

@ -36,7 +36,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
exit 1 exit 1
fi fi
. $SYSROOT_SETUP_SCRIPT . $SYSROOT_SETUP_SCRIPT
PSEUDO_OPTS="-P $POKY_NATIVE_SYSROOT/usr" PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"
ROOTFS_TARBALL=$1 ROOTFS_TARBALL=$1
SDK_ROOTFS_DIR=$2 SDK_ROOTFS_DIR=$2

14
scripts/poky-find-native-sysroot
View File

@ -2,7 +2,7 @@
# #
# 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 Poky build or
# from a toolchain installation. It then ensures the variable # from a toolchain installation. It then ensures the variable
# $POKY_NATIVE_SYSROOT is set to the sysroot's base directory, and sets # $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets
# $PSEUDO to the path of the pseudo binary. # $PSEUDO to the path of the pseudo binary.
# #
# This script is intended to be run within other scripts by source'ing # This script is intended to be run within other scripts by source'ing
@ -30,7 +30,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
if [ -z "$POKY_NATIVE_SYSROOT" ]; then if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
BITBAKE=`which bitbake` BITBAKE=`which bitbake`
if [ "x$BITBAKE" != "x" ]; then if [ "x$BITBAKE" != "x" ]; then
if [ "$UID" = "0" ]; then if [ "$UID" = "0" ]; then
@ -40,10 +40,10 @@ if [ -z "$POKY_NATIVE_SYSROOT" ]; then
exit 1 exit 1
fi fi
touch conf/sanity.conf touch conf/sanity.conf
POKY_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2`
rm -f conf/sanity.conf rm -f conf/sanity.conf
else else
POKY_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2`
fi fi
else else
echo "Error: Unable to locate your native sysroot." echo "Error: Unable to locate your native sysroot."
@ -56,8 +56,8 @@ if [ -z "$POKY_NATIVE_SYSROOT" ]; then
fi fi
# Set up pseudo command # Set up pseudo command
if [ ! -e "$POKY_NATIVE_SYSROOT/usr/bin/pseudo" ]; then if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
echo "Error: Unable to find pseudo binary in $POKY_NATIVE_SYSROOT/usr/bin/" echo "Error: Unable to find pseudo binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
if [ "x$POKY_DISTRO_VERSION" = "x" ]; then if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
echo "Have you run 'bitbake meta-ide-support'?" echo "Have you run 'bitbake meta-ide-support'?"
@ -69,4 +69,4 @@ if [ ! -e "$POKY_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
exit 1 exit 1
fi fi
fi fi
PSEUDO="$POKY_NATIVE_SYSROOT/usr/bin/pseudo" PSEUDO="$OECORE_NATIVE_SYSROOT/usr/bin/pseudo"

8
scripts/poky-setup-rpmrepo
View File

@ -47,17 +47,17 @@ setup_tmpdir() {
} }
setup_sysroot() { setup_sysroot() {
# Toolchain installs set up $POKY_NATIVE_SYSROOT in their # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
# environment script. If that variable isn't set, we're # 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 poky scenario or the environment
# script wasn't source'd. # script wasn't source'd.
if [ -z "$POKY_NATIVE_SYSROOT" ]; then if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
setup_tmpdir setup_tmpdir
BUILD_ARCH=`uname -m` BUILD_ARCH=`uname -m`
BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` BUILD_OS=`uname | tr '[A-Z]' '[a-z]'`
BUILD_SYS="$BUILD_ARCH-$BUILD_OS" BUILD_SYS="$BUILD_ARCH-$BUILD_OS"
POKY_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS OECORE_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS
fi fi
} }
@ -76,7 +76,7 @@ if [ ! -d "$RPM_DIR" ]; then
exit 1 exit 1
fi fi
CREATEREPO=$POKY_NATIVE_SYSROOT/usr/bin/createrepo CREATEREPO=$OECORE_NATIVE_SYSROOT/usr/bin/createrepo
if [ ! -e "$CREATEREPO" ]; then if [ ! -e "$CREATEREPO" ]; then
echo "Error: can't find createrepo binary" echo "Error: can't find createrepo binary"
echo "please run bitbake createrepo-native first" echo "please run bitbake createrepo-native first"

8
scripts/runqemu
View File

@ -280,17 +280,17 @@ setup_tmpdir() {
} }
setup_sysroot() { setup_sysroot() {
# Toolchain installs set up $POKY_NATIVE_SYSROOT in their # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
# environment script. If that variable isn't set, we're # 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 poky scenario or the environment
# script wasn't source'd. # script wasn't source'd.
if [ -z "$POKY_NATIVE_SYSROOT" ]; then if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
setup_tmpdir setup_tmpdir
BUILD_ARCH=`uname -m` BUILD_ARCH=`uname -m`
BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` BUILD_OS=`uname | tr '[A-Z]' '[a-z]'`
BUILD_SYS="$BUILD_ARCH-$BUILD_OS" BUILD_SYS="$BUILD_ARCH-$BUILD_OS"
POKY_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS OECORE_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS
fi fi
} }
@ -380,7 +380,7 @@ echo "ROOTFS: [$ROOTFS]"
echo "FSTYPE: [$FSTYPE]" echo "FSTYPE: [$FSTYPE]"
setup_sysroot setup_sysroot
# POKY_NATIVE_SYSROOT is now set for all cases # OECORE_NATIVE_SYSROOT is now set for all cases
# We can't run without a libGL.so # We can't run without a libGL.so
libgl='no' libgl='no'

8
scripts/runqemu-internal
View File

@ -161,10 +161,10 @@ if [ "$TAP" = "" ]; then
GROUPID=`id -g` GROUPID=`id -g`
echo "Setting up tap interface under sudo" echo "Setting up tap interface under sudo"
tap=`sudo $QEMUIFUP $GROUPID $POKY_NATIVE_SYSROOT` tap=`sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
# Re-run standalone to see verbose errors # Re-run standalone to see verbose errors
sudo $QEMUIFUP $GROUPID $POKY_NATIVE_SYSROOT sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT
return return
fi fi
LOCKFILE="$LOCKDIR/$tap" LOCKFILE="$LOCKDIR/$tap"
@ -179,7 +179,7 @@ fi
cleanup() { cleanup() {
if [ ! -e "$NOSUDO_FLAG" ]; then if [ ! -e "$NOSUDO_FLAG" ]; then
sudo $QEMUIFDOWN $TAP $POKY_NATIVE_SYSROOT sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT
fi fi
echo "Releasing lockfile of preconfigured tap device '$TAP'" echo "Releasing lockfile of preconfigured tap device '$TAP'"
release_lock $LOCKFILE release_lock $LOCKFILE
@ -416,7 +416,7 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
return return
fi fi
PATH=$CROSSPATH:$POKY_NATIVE_SYSROOT/usr/bin:$PATH PATH=$CROSSPATH:$OECORE_NATIVE_SYSROOT/usr/bin:$PATH
QEMUBIN=`which $QEMU` QEMUBIN=`which $QEMU`
if [ ! -x "$QEMUBIN" ]; then if [ ! -x "$QEMUBIN" ]; then