From 05a4974836ded2ae4922d2837b2b662fe7a51c08 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 9 Sep 2013 18:06:17 -0700 Subject: [PATCH] fix(vm_image_util): remove /usr/share/oem prefix remove this prefix from the PARTIIONED=0 builds --- build_library/vm_image_util.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 66695a07db..778c88c467 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -257,7 +257,7 @@ install_oem_package() { # Install directly to root if this is not a partitioned image if [[ $(_get_vm_opt PARTITIONED_IMG) -eq 0 ]]; then - emerge_oem_package "${oem_mnt}/usr/share/oem" + emerge_oem_package "${oem_mnt}" return 0 fi @@ -377,7 +377,7 @@ _write_squashfs_root() { sudo mount -o loop,ro "${TEMP_ROOTFS}" "${root_mnt}" # Roll the OEM into the build dir - sudo mount --bind "${oem_mnt}"/usr/share/oem "${root_mnt}"/usr/share/oem + sudo mount --bind "${oem_mnt}" "${root_mnt}"/usr/share/oem # Build the squashfs sudo mksquashfs "${root_mnt}" "${cpio_target}"/newroot.squashfs