Create wic config file and remove the custom recipe for creating both partitions.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../images/morello-initramfs.bb | 7 +- .../images/morello-linux-image-fvp.inc | 1 - .../images/morello-linux-image-soc.inc | 1 - .../images/morello-linux-image.bb | 153 ------------------ meta-morello/wic/morello-efidisk.wks | 9 ++ meta-morello/wic/morello-fvp-grub.cfg | 35 ++++ meta-morello/wic/morello-soc-grub.cfg | 37 +++++ 7 files changed, 87 insertions(+), 156 deletions(-) delete mode 100644 meta-morello/recipes-morello/images/morello-linux-image-fvp.inc delete mode 100644 meta-morello/recipes-morello/images/morello-linux-image-soc.inc delete mode 100644 meta-morello/recipes-morello/images/morello-linux-image.bb create mode 100644 meta-morello/wic/morello-efidisk.wks create mode 100644 meta-morello/wic/morello-fvp-grub.cfg create mode 100644 meta-morello/wic/morello-soc-grub.cfg

diff --git a/meta-morello/recipes-morello/images/morello-initramfs.bb b/meta-morello/recipes-morello/images/morello-initramfs.bb index c3abac8..4d5e159 100644 --- a/meta-morello/recipes-morello/images/morello-initramfs.bb +++ b/meta-morello/recipes-morello/images/morello-initramfs.bb @@ -49,4 +49,9 @@ do_deploy() { install -d ${DEPLOYDIR}/${OUTPUTS_NAME} install ${D}/${OUTPUTS_NAME}/initramfs ${DEPLOYDIR}/${OUTPUTS_NAME}/initramfs } -addtask deploy after do_install \ No newline at end of file +addtask deploy after do_install + +do_image_complete() { + echo "Image complete" +} +addtask image_complete before do_build diff --git a/meta-morello/recipes-morello/images/morello-linux-image-fvp.inc b/meta-morello/recipes-morello/images/morello-linux-image-fvp.inc deleted file mode 100644 index 1e0424c..0000000 --- a/meta-morello/recipes-morello/images/morello-linux-image-fvp.inc +++ /dev/null @@ -1 +0,0 @@ -TARGET_PLATFORM = "fvp" \ No newline at end of file diff --git a/meta-morello/recipes-morello/images/morello-linux-image-soc.inc b/meta-morello/recipes-morello/images/morello-linux-image-soc.inc deleted file mode 100644 index 94d624b..0000000 --- a/meta-morello/recipes-morello/images/morello-linux-image-soc.inc +++ /dev/null @@ -1 +0,0 @@ -TARGET_PLATFORM = "soc" \ No newline at end of file diff --git a/meta-morello/recipes-morello/images/morello-linux-image.bb b/meta-morello/recipes-morello/images/morello-linux-image.bb deleted file mode 100644 index 6a2b677..0000000 --- a/meta-morello/recipes-morello/images/morello-linux-image.bb +++ /dev/null @@ -1,153 +0,0 @@ -inherit deploy nopackages - -COMPATIBLE_MACHINE = "morello" -SUMMARY = "Bootable Morello Linux Image" -DESCRIPTION = "Image that goes on a bootable device, can be DD'ed onto a USB stick" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -OUTPUTS_NAME = "morello-linux-image" - -INHIBIT_DEFAULT_DEPS = "1" - -MACHINE_LINUX_REQUIRE ?= "" -MACHINE_LINUX_REQUIRE:morello-fvp = "morello-linux-image-fvp.inc" -MACHINE_LINUX_REQUIRE:morello-soc = "morello-linux-image-soc.inc" - -require ${MACHINE_LINUX_REQUIRE} - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEPENDS += "virtual/kernel grub-efi morello-initramfs mtools-native e2fsprogs-native coreutils-native bc-native util-linux-native" -PROVIDES = "${OUTPUTS_NAME}" - -ESP_SIZE = "100" -BOOT_SECTORS = "204800" - -LBA = "512" -PART_START_ALIGNMENT = "2048" - -ESP_IMAGE = "${OUTPUTS_NAME}-esp" - -ROOTFS = "${DEPLOY_DIR}/images/morello-${TARGET_PLATFORM}/rootfs-morello-${TARGET_PLATFORM}.ext4" - -do_compile[noexec] = "1" -do_configure[depends] += "${MORELLO_ROOTFS_IMAGE}:do_image_complete morello-initramfs:do_deploy" -do_configure[depends] += "board-firmware-image:do_deploy" - -def get_next_part_start (d): - next_image_start = int(d.getVar('BOOT_SECTORS')) + int(d.getVar('PART_START_ALIGNMENT')) + int(d.getVar('PART_START_ALIGNMENT')) - 1 - next_image_start = next_image_start & ~(int(d.getVar('PART_START_ALIGNMENT')) -1) - return next_image_start - -mult() { - local ret=$(echo "${1} * ${2}" | bc) - echo ${ret} -} - -add() { - local ret=$(echo "${1} + ${2}" | bc) - echo ${ret} -} - -div() { - local ret=$(echo "${1} / ${2}" | bc) - echo ${ret} -} - -get_size() { - local link=$(readlink -f ${1}) - local size=$(stat --dereference --format="%s" ${link}) - local ret=${size% *} - echo ${ret} -} - -add_to_image() { - mcopy -i ${1} -m -D overwrite ${2} ::${3} -} - -get_uuid() { - local part="$(blkid ${1})" - local tmp=${part#*"} - local uuid=$(echo $tmp | head -c 36) - echo ${uuid} -} - -create_gpt() { - - local esp_type="C12A7328-F81F-11D2-BA4B-00A0C93EC93B" - local linux_type="0FC63DAF-8483-4772-8E79-3D69D8477DE4" - - local part_start_esp=${PART_START_ALIGNMENT} - local part_start_linux="${@get_next_part_start(d)}" - - local size=$(get_size ${ROOTFS}) - local tmp=$(add ${size} ${LBA}) - - local rootfs_sectors=$(div ${tmp} ${LBA}) - local rootfs_uuid=$(get_uuid ${ROOTFS}) - - echo "Sectors $rootfs_sectors ${BOOT_SECTORS}" - - { - echo "label: gpt" - echo "start=${part_start_esp}, size=${BOOT_SECTORS}, name=ESP, type=${esp_type}" - echo "start=${part_start_linux}, size=${rootfs_sectors}, name=root, type=${linux_type}, uuid=${rootfs_uuid}" - } | sfdisk -q "${1}" - - dd if="${2}" of="${1}" seek=$(mult ${part_start_esp} ${LBA}) bs=8M conv=notrunc,sparse oflag=seek_bytes status=progress - dd if="${3}" of="${1}" seek=$(mult ${part_start_linux} ${LBA}) bs=8M conv=notrunc,sparse oflag=seek_bytes status=progress -} - -do_configure() { - local grub="${BSP_GRUB_DIR}/grub-config.cfg" - local uuid=$(get_uuid ${ROOTFS}) - echo ${uuid} - rm -f ${BSP_GRUB_DIR}/grub-config.cfg.processed - sed -e "s@%UUID%@${uuid}@" \ - "${BSP_GRUB_DIR}/grub-config.cfg" > "${BSP_GRUB_DIR}/grub-config.cfg.processed" -} - -do_install() { - - local part0="${BSP_GRUB_DIR}/grub-efi-bootaa64.efi" - local part1="${BSP_GRUB_DIR}/grub-config.cfg.processed" - local part2="${BSP_DTB_DIR}/morello-${TARGET_PLATFORM}.dtb" - local part3="${DEPLOY_DIR}/images/morello-${TARGET_PLATFORM}/Image" - local part4="${DEPLOY_DIR}/images/morello-${TARGET_PLATFORM}/morello-initramfs/initramfs" - - rm -f ${ESP_IMAGE}.img - - # create the ESP - dd if=/dev/zero of=${ESP_IMAGE}.img bs=1024K count=${ESP_SIZE} - mformat -i ${ESP_IMAGE}.img -v ESP :: - - mmd -i ${ESP_IMAGE}.img ::/EFI - mmd -i ${ESP_IMAGE}.img ::/EFI/BOOT - - add_to_image ${ESP_IMAGE}.img ${part0} /EFI/BOOT/BOOTAA64.EFI - add_to_image ${ESP_IMAGE}.img ${part1} /EFI/BOOT/grub.cfg - add_to_image ${ESP_IMAGE}.img ${part2} /morello.dtb - add_to_image ${ESP_IMAGE}.img ${part3} /Image - add_to_image ${ESP_IMAGE}.img ${part4} /initramfs - - local size=$(get_size ${ROOTFS}) - - local rootfs_size=$(div ${size} 1048576) - local total_size=$(add ${ESP_SIZE} ${rootfs_size}) - - : > ${OUTPUTS_NAME}.img - truncate --size="$(add ${total_size} 50)M" ${OUTPUTS_NAME}.img - - create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img ${ROOTFS} ${size} - - install ${OUTPUTS_NAME}.img ${D}/${OUTPUTS_NAME}.img - install ${ESP_IMAGE}.img ${D}/${ESP_IMAGE}.img -} - -do_deploy() { - install -d ${DEPLOYDIR}/ESP - install ${D}/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}-${TCLIBC}.img - install ${D}/${ESP_IMAGE}.img ${DEPLOYDIR}/ESP/${ESP_IMAGE}.img - -} -addtask deploy after do_install \ No newline at end of file diff --git a/meta-morello/wic/morello-efidisk.wks b/meta-morello/wic/morello-efidisk.wks new file mode 100644 index 0000000..eda618a --- /dev/null +++ b/meta-morello/wic/morello-efidisk.wks @@ -0,0 +1,9 @@ +# short-description: Create an EFI disk image +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. Uses a custom grub.cfg file to configure the boot. + +part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=morello-initramfs/initramfs,file=morello-initramfs/initramfs" --ondisk sda --label msdos --active --align 1024 + +part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024 --uuid=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 + +bootloader --ptable gpt --configfile="${MACHINE}-grub.cfg" diff --git a/meta-morello/wic/morello-fvp-grub.cfg b/meta-morello/wic/morello-fvp-grub.cfg new file mode 100644 index 0000000..72c2030 --- /dev/null +++ b/meta-morello/wic/morello-fvp-grub.cfg @@ -0,0 +1,35 @@ +set debug="loader,mm" +set term="vt100" +set default="1" +set timeout="5" + +menuentry 'BusyBox Morello Platform (Device Tree) : a64 + c64 sysroot' { + devicetree /morello-fvp.dtb + linux /Image \ + acpi=off \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ +} + +menuentry 'BusyBox Morello Platform (ACPI) : a64 + c64 sysroot' { + linux /Image \ + acpi=force \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ +} + +menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { + devicetree /morello-fvp.dtb + linux /Image \ + acpi=off \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ + + initrd /initramfs +} \ No newline at end of file diff --git a/meta-morello/wic/morello-soc-grub.cfg b/meta-morello/wic/morello-soc-grub.cfg new file mode 100644 index 0000000..5356269 --- /dev/null +++ b/meta-morello/wic/morello-soc-grub.cfg @@ -0,0 +1,37 @@ +set debug="loader,mm" +set term="vt100" +set default="1" +set timeout="5" + +menuentry 'BusyBox Morello Platform (Device Tree) : a64 + c64 sysroot' { + devicetree /morello-soc.dtb + linux /Image \ + acpi=off \ + debug \ + console=ttyAMA0,115200 \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ +} + +menuentry 'BusyBox Morello Platform (ACPI) : a64 + c64 sysroot' { + linux /Image \ + acpi=force \ + debug \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ +} + +menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { + devicetree /morello-soc.dtb + linux /Image \ + acpi=off \ + debug \ + console=ttyAMA0,115200 \ + earlycon=pl011,0x2A400000 \ + ip=dhcp \ + root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ + + initrd /initramfs +} \ No newline at end of file

Change the default target to core-image-minimal. Keep the serial test only.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- kas/morello-fvp.yml | 9 +-------- kas/morello-soc.yml | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/kas/morello-fvp.yml b/kas/morello-fvp.yml index cdcc001..7ccb36b 100644 --- a/kas/morello-fvp.yml +++ b/kas/morello-fvp.yml @@ -11,13 +11,6 @@ local_conf_header:

TESTIMAGE_AUTO = "1"

- TEST_TARGET_IP ?= "127.0.0.1:8022" - TEST_SERVER_IP ?= "127.0.1.1" - - PACKAGECONFIG:remove:pn-openssh = "rng-tools" - CORE_IMAGE_EXTRA_INSTALL:append = " ssh-pregen-hostkeys" - IMAGE_FEATURES:append = " ssh-server-dropbear" - IMAGE_CLASSES:append = " testimage" INHERIT += "fvpboot"

@@ -26,4 +19,4 @@ local_conf_header:

FVP_CONSOLES[default] = "terminal_uart_ap" target: - - morello-linux-image \ No newline at end of file + - core-image-minimal \ No newline at end of file diff --git a/kas/morello-soc.yml b/kas/morello-soc.yml index b46f836..6c6cf9c 100644 --- a/kas/morello-soc.yml +++ b/kas/morello-soc.yml @@ -4,4 +4,4 @@ header: - base.yml machine: morello-soc target: - - morello-linux-image \ No newline at end of file + - core-image-minimal \ No newline at end of file

Given that we have a purecap sysroot there is little benefit in purecap only environment, Maintaining it manually would quickly become a pain in the case when the purecap share of app/libs were to grow.

Use the Yocto way for initramfs.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../conf/machine/include/morello-common.inc | 2 +- .../recipes-core/busybox/busybox-morello.inc | 8 +-- .../images/{morello-fvp => }/files/init.sh | 24 +++++--- .../files/initramfs.list.template | 0 .../images/morello-initramfs-image.bb | 24 ++++++++ .../images/morello-initramfs-scripts.bb | 19 +++++++ .../images/morello-initramfs.bb | 57 ------------------- .../images/morello-soc/files/init.sh | 47 --------------- .../morello-soc/files/initramfs.list.template | 16 ------ meta-morello/wic/morello-efidisk.wks | 4 +- meta-morello/wic/morello-fvp-grub.cfg | 4 +- meta-morello/wic/morello-soc-grub.cfg | 4 +- 12 files changed, 70 insertions(+), 139 deletions(-) rename meta-morello/recipes-morello/images/{morello-fvp => }/files/init.sh (51%) rename meta-morello/recipes-morello/images/{morello-fvp => }/files/initramfs.list.template (100%) create mode 100644 meta-morello/recipes-morello/images/morello-initramfs-image.bb create mode 100644 meta-morello/recipes-morello/images/morello-initramfs-scripts.bb delete mode 100644 meta-morello/recipes-morello/images/morello-initramfs.bb delete mode 100644 meta-morello/recipes-morello/images/morello-soc/files/init.sh delete mode 100644 meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template

diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index 80524d3..1c29774 100644 --- a/meta-morello/conf/machine/include/morello-common.inc +++ b/meta-morello/conf/machine/include/morello-common.inc @@ -49,5 +49,5 @@ EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi"

INITRAMFS_MAXSIZE = "640000" -INITRAMFS_IMAGE = "morello-initramfs" +INITRAMFS_IMAGE = "morello-initramfs-image" INITRAMFS_IMAGE_BUNDLE = "0" diff --git a/meta-morello/recipes-core/busybox/busybox-morello.inc b/meta-morello/recipes-core/busybox/busybox-morello.inc index cb1e577..c70f8eb 100644 --- a/meta-morello/recipes-core/busybox/busybox-morello.inc +++ b/meta-morello/recipes-core/busybox/busybox-morello.inc @@ -29,8 +29,8 @@ EXTRA_OEMAKE = "\ KHEADERS='${STAGING_KERNEL_BUILDDIR}/kernel-headers/include/' \ "

-FILES:${PN} += "/busybox/busybox" -SYSROOT_DIRS += "/busybox" +FILES:${PN} += "/busybox-morello/busybox" +SYSROOT_DIRS += "/busybox-morello"

INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1" @@ -49,6 +49,6 @@ do_compile() { }

do_install() { - install -d ${D}/busybox - install -m 0755 ${S}/busybox ${D}/busybox/busybox + install -d ${D}/busybox-morello + install -m 0755 ${S}/busybox ${D}/busybox-morello/busybox } diff --git a/meta-morello/recipes-morello/images/morello-fvp/files/init.sh b/meta-morello/recipes-morello/images/files/init.sh similarity index 51% rename from meta-morello/recipes-morello/images/morello-fvp/files/init.sh rename to meta-morello/recipes-morello/images/files/init.sh index 1806644..c7d96e6 100644 --- a/meta-morello/recipes-morello/images/morello-fvp/files/init.sh +++ b/meta-morello/recipes-morello/images/files/init.sh @@ -1,35 +1,43 @@ -#!/bin/busybox sh +#!/busybox-morello/busybox sh

mount() { - /bin/busybox mount "$@" + /busybox-morello/busybox mount "$@" }

umount() { - /bin/busybox umount "$@" + /busybox-morello/busybox umount "$@" }

grep() { - /bin/busybox grep "$@" + /busybox-morello/busybox grep "$@" }

cp() { - /bin/busybox cp "$@" + /busybox-morello/busybox cp "$@" }

mkdir() { - /bin/busybox mkdir "$@" + /busybox-morello/busybox mkdir "$@" }

switch_root () { - /bin/busybox switch_root "$@" + /busybox-morello/busybox switch_root "$@" }

sed () { - /bin/busybox sed "$@" + /busybox-morello/busybox sed "$@" }

echo "Running init script"

+mkdir -m 0755 bin +mkdir -m 0755 include +mkdir -m 0755 share +mkdir -m 0755 proc +mkdir -m 0755 sys + +cp /busybox-morello/busybox /bin/busybox + mount -t proc proc /proc grep -qE $'\t'"devtmpfs$" /proc/filesystems && mount -t devtmpfs dev /dev mount -t sysfs sysfs /sys diff --git a/meta-morello/recipes-morello/images/morello-fvp/files/initramfs.list.template b/meta-morello/recipes-morello/images/files/initramfs.list.template similarity index 100% rename from meta-morello/recipes-morello/images/morello-fvp/files/initramfs.list.template rename to meta-morello/recipes-morello/images/files/initramfs.list.template diff --git a/meta-morello/recipes-morello/images/morello-initramfs-image.bb b/meta-morello/recipes-morello/images/morello-initramfs-image.bb new file mode 100644 index 0000000..5109129 --- /dev/null +++ b/meta-morello/recipes-morello/images/morello-initramfs-image.bb @@ -0,0 +1,24 @@ +inherit core-image + +DESCRIPTION = "Small image with purecap dev environment and minimal bloat." +LICENSE = "MIT" + +INITRAMFS_SCRIPTS ?= "\ + morello-initramfs-scripts \ + " + +PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS}" +PACKAGE_INSTALL += "musl-libc busybox-morello pure-cap-app llvm-morello gdbserver gdb llvm-morello-staticdev" + +IMAGE_FEATURES = "" + +export IMAGE_BASENAME = "initramfs" +IMAGE_NAME_SUFFIX ?= "" +IMAGE_LINGUAS = "" + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" + +IMAGE_ROOTFS_SIZE = "8192" +IMAGE_ROOTFS_EXTRA_SPACE = "0" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' diff --git a/meta-morello/recipes-morello/images/morello-initramfs-scripts.bb b/meta-morello/recipes-morello/images/morello-initramfs-scripts.bb new file mode 100644 index 0000000..ac777da --- /dev/null +++ b/meta-morello/recipes-morello/images/morello-initramfs-scripts.bb @@ -0,0 +1,19 @@ +COMPATIBLE_MACHINE = "morello" +SUMMARY = "Morello initramfs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +FILESEXTRAPATHS:prepend := "${THISDIR}:" + +RDEPENDS:${PN} += "busybox-morello" + +SRC_URI = "file://files/init.sh \ + " + +S = "${WORKDIR}" + +do_install() { + install -m 0755 ${WORKDIR}/files/init.sh ${D}/init +} + +FILES:${PN} = "/init" \ No newline at end of file diff --git a/meta-morello/recipes-morello/images/morello-initramfs.bb b/meta-morello/recipes-morello/images/morello-initramfs.bb deleted file mode 100644 index 4d5e159..0000000 --- a/meta-morello/recipes-morello/images/morello-initramfs.bb +++ /dev/null @@ -1,57 +0,0 @@ -inherit deploy nopackages - -COMPATIBLE_MACHINE = "morello" -SUMMARY = "Initramfs for busybox" -DESCRIPTION = "Initramfs for busybox, bypassing the Yocto way" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -OUTPUTS_NAME = "morello-initramfs" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEPENDS += "virtual/morello-busybox gen-init-cpio-native" -PROVIDES = "${OUTPUTS_NAME}" - -BB_DONT_CACHE = "1" -INHIBIT_DEFAULT_DEPS = "1" - -FILESEXTRAPATHS:prepend := "${THISDIR}:" - -SRC_URI = "file://files/init.sh \ - file://files/initramfs.list.template \ - " -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_deploy[depends] = "virtual/morello-busybox:do_populate_sysroot" - - -do_install() { - - local sysroot_prefix="recipe-sysroot" - - sed -e "s@%FILES%@/files@" \ - "${WORKDIR}/files/initramfs.list.template" > "${WORKDIR}/files/initramfs.list.tmp1" - - sed -e "s@%BUSYBOX%@/${sysroot_prefix}/busybox@" \ - "${WORKDIR}/files/initramfs.list.tmp1" > "${WORKDIR}/files/initramfs.list" - - install -d ${D}/${OUTPUTS_NAME} - - rm -f ${D}/${OUTPUTS_NAME}/initramfs - - { - env -C ${WORKDIR} ${STAGING_BINDIR_NATIVE}/gen_init_cpio "${WORKDIR}/files/initramfs.list" - } > ${D}/${OUTPUTS_NAME}/initramfs - -} - -do_deploy() { - install -d ${DEPLOYDIR}/${OUTPUTS_NAME} - install ${D}/${OUTPUTS_NAME}/initramfs ${DEPLOYDIR}/${OUTPUTS_NAME}/initramfs -} -addtask deploy after do_install - -do_image_complete() { - echo "Image complete" -} -addtask image_complete before do_build diff --git a/meta-morello/recipes-morello/images/morello-soc/files/init.sh b/meta-morello/recipes-morello/images/morello-soc/files/init.sh deleted file mode 100644 index 1806644..0000000 --- a/meta-morello/recipes-morello/images/morello-soc/files/init.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/busybox sh - -mount() { - /bin/busybox mount "$@" -} - -umount() { - /bin/busybox umount "$@" -} - -grep() { - /bin/busybox grep "$@" -} - -cp() { - /bin/busybox cp "$@" -} - -mkdir() { - /bin/busybox mkdir "$@" -} - -switch_root () { - /bin/busybox switch_root "$@" -} - -sed () { - /bin/busybox sed "$@" -} - -echo "Running init script" - -mount -t proc proc /proc -grep -qE $'\t'"devtmpfs$" /proc/filesystems && mount -t devtmpfs dev /dev -mount -t sysfs sysfs /sys - -echo "Installing busybox..." - -/bin/busybox --install -s - -! grep -qE $'\t'"devtmpfs$" /proc/filesystems && mdev -s - -echo "/bin/sh as PID 1!" -echo "init.sh" -exec setsid cttyhack sh -echo setsid ctty hack failed so "exec /bin/sh" fallback will be used -exec /bin/sh \ No newline at end of file diff --git a/meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template b/meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template deleted file mode 100644 index da55738..0000000 --- a/meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template +++ /dev/null @@ -1,16 +0,0 @@ -dir /bin 755 0 0 -dir /include 755 0 0 -dir /lib 755 0 0 -dir /share 755 0 0 -dir /dev 755 0 0 -dir /proc 755 0 0 -dir /sbin 755 0 0 -dir /sys 755 0 0 -dir /newroot 755 0 0 -dir /usr 755 0 0 -dir /usr/lib 755 0 0 -dir /usr/bin 755 0 0 -dir /etc 755 0 0 - -file /bin/busybox .%BUSYBOX%/busybox 755 0 0 -file /init .%FILES%/init.sh 755 0 0 \ No newline at end of file diff --git a/meta-morello/wic/morello-efidisk.wks b/meta-morello/wic/morello-efidisk.wks index eda618a..dd8cfa7 100644 --- a/meta-morello/wic/morello-efidisk.wks +++ b/meta-morello/wic/morello-efidisk.wks @@ -2,8 +2,8 @@ # long-description: Creates a partitioned EFI disk image that the user # can directly dd to boot media. Uses a custom grub.cfg file to configure the boot.

-part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=morello-initramfs/initramfs,file=morello-initramfs/initramfs" --ondisk sda --label msdos --active --align 1024 +part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=initramfs-${MACHINE}.cpio.gz,file=initramfs-${MACHINE}.cpio.gz" --ondisk sda --label msdos --active --align 1024

part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024 --uuid=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8

-bootloader --ptable gpt --configfile="${MACHINE}-grub.cfg" +bootloader --ptable gpt --configfile="${MACHINE}-grub.cfg" \ No newline at end of file diff --git a/meta-morello/wic/morello-fvp-grub.cfg b/meta-morello/wic/morello-fvp-grub.cfg index 72c2030..bcf46a7 100644 --- a/meta-morello/wic/morello-fvp-grub.cfg +++ b/meta-morello/wic/morello-fvp-grub.cfg @@ -22,7 +22,7 @@ menuentry 'BusyBox Morello Platform (ACPI) : a64 + c64 sysroot' { root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ }

-menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { +menuentry 'BusyBox Morello Platform (Device Tree): initramfs a64 (min bloat) + c64 sysroot' { devicetree /morello-fvp.dtb linux /Image \ acpi=off \ @@ -31,5 +31,5 @@ menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { ip=dhcp \ root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \

- initrd /initramfs + initrd /initramfs-morello-fvp.cpio.gz } \ No newline at end of file diff --git a/meta-morello/wic/morello-soc-grub.cfg b/meta-morello/wic/morello-soc-grub.cfg index 5356269..c0841fd 100644 --- a/meta-morello/wic/morello-soc-grub.cfg +++ b/meta-morello/wic/morello-soc-grub.cfg @@ -23,7 +23,7 @@ menuentry 'BusyBox Morello Platform (ACPI) : a64 + c64 sysroot' { root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \ }

-menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { +menuentry 'BusyBox Morello Platform (Device Tree): initramfs a64 (min bloat) + c64 sysroot' { devicetree /morello-soc.dtb linux /Image \ acpi=off \ @@ -33,5 +33,5 @@ menuentry 'BusyBox Morello Platform (Device Tree): initramfs pure c64' { ip=dhcp \ root=PARTUUID=70ead9cb-4d31-4ffa-8127-7cc8c720eaa8 \

- initrd /initramfs + initrd /initramfs-morello-soc.cpio.gz } \ No newline at end of file

Decouple testimage from the fvp config as it takes too long to build.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ci/jobs-to-kas | 4 ++++ ci/testimage.yml | 11 +++++++++++ kas/morello-fvp.yml | 8 +------- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 ci/testimage.yml

diff --git a/ci/jobs-to-kas b/ci/jobs-to-kas index 95df56c..017a4bb 100755 --- a/ci/jobs-to-kas +++ b/ci/jobs-to-kas @@ -13,4 +13,8 @@ set -e -u

FILES="kas/$(echo $1 | cut -d ':' -f 1).yml"

+for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do + FILES+=":ci/$i.yml" +done + echo $FILES diff --git a/ci/testimage.yml b/ci/testimage.yml new file mode 100644 index 0000000..0183329 --- /dev/null +++ b/ci/testimage.yml @@ -0,0 +1,11 @@ +header: + version: 11 + +local_conf_header: + testimage: | + TESTIMAGE_AUTO = "1" + + IMAGE_CLASSES:append = " testimage" + + TEST_TARGET = "OEFVPSerialTarget" + TEST_SUITES = "linuxboot" \ No newline at end of file diff --git a/kas/morello-fvp.yml b/kas/morello-fvp.yml index 7ccb36b..8be8d0c 100644 --- a/kas/morello-fvp.yml +++ b/kas/morello-fvp.yml @@ -5,18 +5,12 @@ header: machine: morello-fvp

local_conf_header: - testimage-config: | + fvp-config: |

LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA"

- TESTIMAGE_AUTO = "1" - - IMAGE_CLASSES:append = " testimage" INHERIT += "fvpboot"

- TEST_TARGET = "OEFVPSerialTarget" - TEST_SUITES = "linuxboot" - FVP_CONSOLES[default] = "terminal_uart_ap" target: - core-image-minimal \ No newline at end of file