From 02bf3fcd802aab2c067df73aaa6fbb4bf849e6b4 Mon Sep 17 00:00:00 2001 From: Matthias Scheifinger Date: Fri, 10 Dec 2021 10:45:50 +0100 Subject: [PATCH 1/3] fix sd-card creation - use new syntax --- classes/sdcard_image-sunxi.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index 5d694be..3be6b60 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -14,7 +14,9 @@ inherit image_types # # This image depends on the rootfs image -IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}" +SDIMG_ROOTFS_TYPE ?= "ext4" + +IMAGE_TYPEDEP:sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}" # Boot partition volume id BOOTDD_VOLUME_ID ?= "boot" @@ -29,7 +31,7 @@ IMAGE_ROOTFS_ALIGNMENT = "2048" SDIMG_ROOTFS_TYPE ?= "ext4" SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" -do_image_sunxi_sdimg[depends] += " \ +do_image:sunxi_sdimg[depends] += " \ parted-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \ From 503102a841d745291c31d2398734de18ef5acad7 Mon Sep 17 00:00:00 2001 From: Matthias Scheifinger Date: Fri, 10 Dec 2021 10:51:18 +0100 Subject: [PATCH 2/3] move ext4 dep --- classes/sdcard_image-sunxi.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index 3be6b60..b4c4d30 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -13,9 +13,10 @@ inherit image_types # # -# This image depends on the rootfs image +# Use an uncompressed ext4 by default as rootfs SDIMG_ROOTFS_TYPE ?= "ext4" +# This image depends on the rootfs image IMAGE_TYPEDEP:sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}" # Boot partition volume id @@ -27,8 +28,6 @@ BOOT_SPACE ?= "40960" # First partition begin at sector 2048 : 2048*1024 = 2097152 IMAGE_ROOTFS_ALIGNMENT = "2048" -# Use an uncompressed ext4 by default as rootfs -SDIMG_ROOTFS_TYPE ?= "ext4" SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" do_image:sunxi_sdimg[depends] += " \ From deb667015de86fcd1a71698c2b6cc8b8e4a772d9 Mon Sep 17 00:00:00 2001 From: Matthias Scheifinger Date: Fri, 10 Dec 2021 10:59:19 +0100 Subject: [PATCH 3/3] cover up build error with kernel headers --- recipes-kernel/linux/linux.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index 2faecb0..701616a 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -124,9 +124,4 @@ do_configure:append() { fi } -do_install:append() { - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH -} -PACKAGES =+ "kernel-headers" -FILES_kernel-headers = "${exec_prefix}/src/linux*"