]> code.ossystems Code Review - openembedded-core.git/commitdiff
build-appliance-image: use pip3-native
authorJuro Bystricky <juro.bystricky@intel.com>
Wed, 15 Mar 2017 22:13:36 +0000 (15:13 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 16 Mar 2017 17:36:10 +0000 (17:36 +0000)
Do not rely on pip3 being installed on the host.
Use pip3-native instead.

[YOCTO#10909]
[YOCTO#11022]

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/images/build-appliance-image_15.0.0.bb

index 0db1fb0b3836955f6022afe45242157582f99459..730989e12ad8a5a3a3cbf63890cfe3df4d873548 100644 (file)
@@ -18,10 +18,10 @@ IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
 # Do a quiet boot with limited console messages
 APPEND += "rootfstype=ext4 quiet"
 
-DEPENDS = "zip-native"
+DEPENDS = "zip-native python3-pip-native"
 IMAGE_FSTYPES = "vmdk"
 
-inherit core-image module-base
+inherit core-image module-base setuptools3
 
 SRCREV ?= "8343ed93c4278715aa1582d3cadedf8f197b4089"
 SRC_URI = "git://git.yoctoproject.org/poky;branch=master \
@@ -95,6 +95,8 @@ fakeroot do_populate_poky_src () {
        echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
 
        # Install modules needed for toaster
+       export STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}
+       export STAGING_INCDIR=${STAGING_INCDIR_NATIVE}
        export HOME=${IMAGE_ROOTFS}/home/builder
        mkdir -p ${IMAGE_ROOTFS}/home/builder/.cache/pip
        pip3 install --user -I -U -v -r ${IMAGE_ROOTFS}/home/builder/poky/bitbake/toaster-requirements.txt