Merge branch 'master' into master

This commit is contained in:
Michel Promonet 2021-12-15 21:07:43 +01:00 committed by GitHub
commit 8852666a80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -13,8 +13,11 @@ inherit image_types
# #
# #
# Use an uncompressed ext4 by default as rootfs
SDIMG_ROOTFS_TYPE ?= "ext4"
# This image depends on the rootfs image # This image depends on the rootfs image
IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}" IMAGE_TYPEDEP:sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"
# Boot partition volume id # Boot partition volume id
BOOTDD_VOLUME_ID ?= "boot" BOOTDD_VOLUME_ID ?= "boot"
@ -25,11 +28,9 @@ BOOT_SPACE ?= "40960"
# First partition begin at sector 2048 : 2048*1024 = 2097152 # First partition begin at sector 2048 : 2048*1024 = 2097152
IMAGE_ROOTFS_ALIGNMENT = "2048" 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}" SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
do_image_sunxi_sdimg[depends] += " \ do_image:sunxi_sdimg[depends] += " \
parted-native:do_populate_sysroot \ parted-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \
dosfstools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \

View File

@ -124,5 +124,3 @@ do_configure:append() {
fi fi
} }
PACKAGES =+ "kernel-headers"
FILES_kernel-headers = "${exec_prefix}/src/linux*"