summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-16 16:37:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-16 22:44:03 +0100
commit107d428095dcd73f1ec30990c0adee1cf8e5069b (patch)
tree1e660d1a28e2f7dbbeffc1970eeba1c849675f22 /meta/recipes-core
parent9b32dd5a00f1dde8af88b38dd977e24f3538d108 (diff)
downloadopenembedded-core-contrib-107d428095dcd73f1ec30990c0adee1cf8e5069b.tar.gz
openembedded-core-contrib-107d428095dcd73f1ec30990c0adee1cf8e5069b.tar.bz2
openembedded-core-contrib-107d428095dcd73f1ec30990c0adee1cf8e5069b.zip
build-appliance-image: Add LC_ALL setting and drop pseudo pieces
The pseudo pieces here date from times gone by when bitbake ran in two phases. Its long since obsolete and can be dropped. Also set LC_ALL so that bitbake works correctly and uses the local we're already installing into the image so we have utf-8 available. (From OE-Core rev: 7c1f1fc3d739d778886208d6833c34e6ca1dc148) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index d8d70482ea..ffd7867f5e 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -57,12 +57,8 @@ fakeroot do_populate_poky_src () {
# Create a symlink, needed for out-of-tree kernel modules build
lnr ${IMAGE_ROOTFS}${KERNEL_SRC_PATH} ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/build
- echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
- mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
- echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
- echo "export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
- echo "export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
+ echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
# Also save (for reference only) the actual SRCREV used to create this image
echo "export BA_SRCREV=${SRCREV}" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
@@ -73,8 +69,6 @@ fakeroot do_populate_poky_src () {
echo "# export ALL_PROXY=https://proxy.example.com:8080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
echo "# export ALL_PROXY=socks://socks.example.com:1080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
- chown builder.builder ${IMAGE_ROOTFS}/home/builder/pseudo
-
chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/poky
chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/poky