Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recovery-initramfs: generalize recipe to avoid redefinitions 

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-01-09 17:13:46 +01:00
parent 188df6fee3
commit d430cc3bab
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -15,6 +15,8 @@ UBOOT_SUFFIX = "imx"
# Linux kernel configuration # Linux kernel configuration
KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6sbc_defconfig" KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6sbc_defconfig"
STORAGE_MEDIA = "mmc"
# Wireless external module # Wireless external module
WIRELESS_MODULE ?= "" WIRELESS_MODULE ?= ""

2
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -12,6 +12,8 @@ include conf/machine/include/tune-cortexa7.inc
UBOOT_PREFIX = "u-boot" UBOOT_PREFIX = "u-boot"
UBOOT_SUFFIX = "imx" UBOOT_SUFFIX = "imx"
STORAGE_MEDIA = "mtd"
# Bluetooth interface # Bluetooth interface
BT_DEVICE_NAME ?= "cc6ul" BT_DEVICE_NAME ?= "cc6ul"

2
meta-digi-arm/conf/machine/include/ccimx8mn.inc
View File

@ -22,6 +22,8 @@ SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
# Linux kernel configuration # Linux kernel configuration
KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig" KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig"
STORAGE_MEDIA = "mmc"
# Bluetooth interface # Bluetooth interface
BT_DEVICE_NAME ?= "cc8mn" BT_DEVICE_NAME ?= "cc8mn"

2
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -29,6 +29,8 @@ RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_3
# Linux kernel configuration # Linux kernel configuration
KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig" KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig"
STORAGE_MEDIA = "mmc"
# Bluetooth interface # Bluetooth interface
BT_DEVICE_NAME ?= "cc8x" BT_DEVICE_NAME ?= "cc8x"

7
meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
View File

@ -5,6 +5,8 @@ LICENSE = "MIT"
PACKAGE_INSTALL = " \ PACKAGE_INSTALL = " \
busybox \ busybox \
${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'e2fsprogs-mke2fs', '', d)} \
${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \
psplash \ psplash \
recovery-initramfs \ recovery-initramfs \
swupdate \ swupdate \
@ -13,11 +15,6 @@ PACKAGE_INSTALL = " \
wipe \ wipe \
" "
PACKAGE_INSTALL_append_ccimx6 = " e2fsprogs-mke2fs"
PACKAGE_INSTALL_append_ccimx6ul = " mtd-utils-ubifs"
PACKAGE_INSTALL_append_ccimx8x = " e2fsprogs-mke2fs"
PACKAGE_INSTALL_append_ccimx8mn = " e2fsprogs-mke2fs"
# Do not pollute the initrd image with rootfs features # Do not pollute the initrd image with rootfs features
IMAGE_FEATURES = "" IMAGE_FEATURES = ""
IMAGE_LINGUAS = "" IMAGE_LINGUAS = ""

5
meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
View File

@ -53,7 +53,4 @@ PACKAGES = "${PN}"
FILES_${PN} = "/" FILES_${PN} = "/"
RDEPENDS_${PN}_append_ccimx6sbc = " cryptsetup" RDEPENDS_${PN}_append = "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', ' cryptsetup', '', d)}"
RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
RDEPENDS_${PN}_append_ccimx8x = " cryptsetup"
RDEPENDS_${PN}_append_ccimx8mn = " cryptsetup"