2 files changed, 23 insertions, 15 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 c1704e8b89..fbd573e0e2 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
@@ -26,8 +26,14 @@ inherit core-image setuptools3 features_check
 
 REQUIRED_DISTRO_FEATURES += "xattr"
 
-SRCREV ?= "cb478c6228f0654ded5ac19a8a8d2f8ba9a717af"
-SRC_URI = "git://git.yoctoproject.org/poky;branch=master;destsuffix=poky \
+SRCREV_bitbake ?= "8b582ef8dd0cef0192d4c0104bcd9b5d642d132c"
+SRCREV_oe-core ?= "5298d01663f897e38380116edf23973d2a156cbc"
+SRCREV_yocto ?= "fe65e142d0d9ba0e51ff9175ffa82e902f982a20"
+SRCREV_FORMAT = "bitbake_oe-core_yocto"
+
+SRC_URI = "git://git.openembedded.org/bitbake;name=bitbake;branch=master;destsuffix=bitbake \
+           git://git.openembedded.org/openembedded-core;name=oe-core;branch=master;destsuffix=openembedded-core \
+           git://git.yoctoproject.org/meta-yocto;name=yocto;branch=master;destsuffix=meta-yocto \
            file://Yocto_Build_Appliance.vmx \
            file://Yocto_Build_Appliance.vmxf \
            file://README_VirtualBox_Guest_Additions.txt \
@@ -44,17 +50,20 @@ IMAGE_CMD:ext4:append () {
 fakeroot do_populate_poky_src () {
         # Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
         # will become invalid in the target.
-        rm -rf ${UNPACKDIR}/poky/.git
-        rm -f ${UNPACKDIR}/poky/.gitignore
+        for d in bitbake openembedded-core meta-yocto; do
+                rm -rf ${UNPACKDIR}/$d/.git
+                rm -f ${UNPACKDIR}/$d/.gitignore
+                cp -R ${UNPACKDIR}/$d ${IMAGE_ROOTFS}/home/builder/
+        done
 
-        cp -R ${UNPACKDIR}/poky ${IMAGE_ROOTFS}/home/builder/poky
+        mkdir -p ${IMAGE_ROOTFS}/home/builder/openembedded-core/build/conf
+        echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/openembedded-core/build/conf/auto.conf
 
-        mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
-        mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
         if [ ${BA_INCLUDE_SOURCES} != 0 ]; then
-                cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
+                mkdir -p ${IMAGE_ROOTFS}/home/builder/openembedded-core/build/downloads
+                cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/openembedded-core/build/downloads/
                 # Remove the git2_* tarballs -- this is ok since we still have the git2/.
-                rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
+                rm -rf ${IMAGE_ROOTFS}/home/builder/openembedded-core/build/downloads/git2_*
         fi
 
         # Place the README_VirtualBox_Guest_Additions file in builders home folder.
@@ -63,7 +72,6 @@ fakeroot do_populate_poky_src () {
         # Place the README_VirtualBox_Toaster file in builders home folder.
         cp ${UNPACKDIR}/README_VirtualBox_Toaster.txt ${IMAGE_ROOTFS}/home/builder/
 
-        echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
         echo "export LC_ALL=en_US.utf8" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
         echo "export TERM=xterm-color" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
 
@@ -79,8 +87,8 @@ 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 -R builder:builder ${IMAGE_ROOTFS}/home/builder/poky
-        chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/poky
+        chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/
+        chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/
 
         # Assume we will need CDROM to install guest additions
         mkdir -p ${IMAGE_ROOTFS}/media/cdrom
@@ -102,7 +110,7 @@ fakeroot do_populate_poky_src () {
         export STAGING_INCDIR=${STAGING_INCDIR_NATIVE}
         export HOME=${IMAGE_ROOTFS}/home/builder
         mkdir -p ${IMAGE_ROOTFS}/home/builder/.cache/pip
-        pip3_install_params="--user -I -U -v -r ${IMAGE_ROOTFS}/home/builder/poky/bitbake/toaster-requirements.txt"
+        pip3_install_params="--user -I -U -v -r ${IMAGE_ROOTFS}/home/builder/bitbake/toaster-requirements.txt"
         if [ -n "${http_proxy}" ]; then
            pip3_install_params="${pip3_install_params} --proxy ${http_proxy}"
         fi
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/meta/recipes-core/initrdscripts/initramfs-framework/init
index 5dd252219a..fe6e3cbf07 100755
--- a/meta/recipes-core/initrdscripts/initramfs-framework/init
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/init
@@ -80,8 +80,8 @@ EFI_DIR=/sys/firmware/efi  # place to store device firmware information
 # make mount stop complaining about missing /etc/fstab
 touch /etc/fstab
 
-# initialize /proc, /sys, /run/lock and /var/lock
-mkdir -p /proc /sys /run /var/lock
+# initialize /proc, /sys and /run/lock
+mkdir -p /proc /sys /run
 mount -t proc proc /proc
 mount -t sysfs sysfs /sys
 mount -t tmpfs tmpfs /run