Signed-off-by: Jon Mason jon.mason@arm.com --- conf/machine/morello-linux-musl.conf | 4 +- kas/base.yml | 47 ++++++++++--------- .../images/morello-linux-image-musl.bb | 4 +- 3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf index c030a358f8d7..f33e31b51bd3 100644 --- a/conf/machine/morello-linux-musl.conf +++ b/conf/machine/morello-linux-musl.conf @@ -10,8 +10,8 @@ PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-musl" TCLIBC = "musl"
BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" -BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/trusted-firmware-a" +BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp"
TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}"
-DISTRO = "" \ No newline at end of file +DISTRO = "" diff --git a/kas/base.yml b/kas/base.yml index f955eada4850..7d673f48d255 100644 --- a/kas/base.yml +++ b/kas/base.yml @@ -1,33 +1,36 @@ header: version: 11 -distro: "" -repos: - poky: - path: poky - url: "https://git.yoctoproject.org/poky" + +distro: poky + +defaults: + repos: refspec: kirkstone - layers: - meta: - meta-poky: - meta-yocto-bsp: excluded + +repos: + meta-morello: + meta-arm: - path: poky/meta-arm - url: "https://git.yoctoproject.org/meta-arm" - refspec: kirkstone + url: https://git.yoctoproject.org/meta-arm layers: meta-arm: meta-arm-bsp: meta-arm-toolchain: - meta-morello: - path: poky/meta-morello - url: "https://github.com/The-Good-Penguin/meta-morello" - refspec: kirkstone -bblayers_conf_header: - custom-local-conf: | - LCONF_VERSION = "7" - - YOCTOROOT := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" + + poky: + url: https://git.yoctoproject.org/git/poky + layers: + meta: + meta-poky: + local_conf_header: base: | CONF_VERSION = "2" - EXTRA_IMAGE_FEATURES ?= "debug-tweaks" \ No newline at end of file + setup: | + PACKAGE_CLASSES = "package_ipk" + EXTRA_IMAGE_FEATURES:append = " debug-tweaks" + +machine: unset + +target: + - core-image-minimal diff --git a/recipes-morello/images/morello-linux-image-musl.bb b/recipes-morello/images/morello-linux-image-musl.bb index 7b5e6eb375b3..45196d09a971 100644 --- a/recipes-morello/images/morello-linux-image-musl.bb +++ b/recipes-morello/images/morello-linux-image-musl.bb @@ -86,11 +86,11 @@ do_install() { : > ${OUTPUTS_NAME}.img truncate --size="$(mult ${IMAGE_SIZE} 3)M" ${OUTPUTS_NAME}.img
- create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img /home/pawel/Code/ArmMorello/linux/output/root.img + create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img ${D}/root.img install ${OUTPUTS_NAME}.img ${D}/${OUTPUTS_NAME}.img }
do_deploy() { install ${D}/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}-${MORELLO_ARCH}-${TCLIBC}.img } -addtask deploy after do_install \ No newline at end of file +addtask deploy after do_install