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>
This commit is contained in:
parent
9b32dd5a00
commit
107d428095
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue