From 19d0f0e84cb10491793e9493ac8d26cb7a4c5942 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Tue, 1 Aug 2023 14:46:39 +0200 Subject: [PATCH] add missing packages --- recipes-core/images/core-image-minimal.bbappend | 2 +- recipes-core/images/core-image-recovery.bb | 2 +- recipes-diya/diya-overlay/diya-overlay.bb | 6 +++++- recipes-diya/diya-overlay/files/cmd.recovery | 1 + recipes-diya/diya-overlay/files/extraconfig.txt | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 recipes-diya/diya-overlay/files/cmd.recovery create mode 100644 recipes-diya/diya-overlay/files/extraconfig.txt diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend index aa6c6b2..6cc6f7c 100644 --- a/recipes-core/images/core-image-minimal.bbappend +++ b/recipes-core/images/core-image-minimal.bbappend @@ -12,7 +12,7 @@ EXTRA_USERS_PARAMS = "usermod -p 2Pe/4xyFxsokE diya; \ usermod -a -G avahi diya; \ usermod -a -G sudo diya \ " -IMAGE_BOOT_FILES:append = "fs_resize core-image-recovery-${MACHINE}.cpio.gz " +IMAGE_BOOT_FILES:append = "fs_resize extraconfig.txt cmd.recovery recovery-${MACHINE}.cpio.gz " IMAGE_INSTALL:append = "libcurl \ libdrm \ diff --git a/recipes-core/images/core-image-recovery.bb b/recipes-core/images/core-image-recovery.bb index 6fec468..0e494c4 100644 --- a/recipes-core/images/core-image-recovery.bb +++ b/recipes-core/images/core-image-recovery.bb @@ -7,7 +7,7 @@ PACKAGE_INSTALL = "recovery-boot lvm2 busybox ${VIRTUAL-RUNTIME_base-utils} ude # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -export IMAGE_BASENAME = "${MLPREFIX}core-image-recovery" +export IMAGE_BASENAME = "${MLPREFIX}recovery" IMAGE_NAME_SUFFIX ?= "" IMAGE_LINGUAS = "" diff --git a/recipes-diya/diya-overlay/diya-overlay.bb b/recipes-diya/diya-overlay/diya-overlay.bb index 208a725..92d0140 100644 --- a/recipes-diya/diya-overlay/diya-overlay.bb +++ b/recipes-diya/diya-overlay/diya-overlay.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI += "file://confd \ file://expandfs.sh \ file://80_diya \ - file://fs_resize" + file://fs_resize \ + file://cmd.recovery \ + file://extraconfig.txt" inherit update-rc.d useradd @@ -28,6 +30,8 @@ do_install() { # install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles install -m 0755 ${WORKDIR}/expandfs.sh ${D}/usr/bin/expandfs.sh install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/ + install -m 0755 ${WORKDIR}/cmd.recovery ${DEPLOY_DIR_IMAGE}/ + install -m 0755 ${WORKDIR}/extraconfig.txt ${DEPLOY_DIR_IMAGE}/ install -d ${D}/var/etc install -d ${D}/var/etc/upper diff --git a/recipes-diya/diya-overlay/files/cmd.recovery b/recipes-diya/diya-overlay/files/cmd.recovery new file mode 100644 index 0000000..025b976 --- /dev/null +++ b/recipes-diya/diya-overlay/files/cmd.recovery @@ -0,0 +1 @@ +dwc_otg.lpm_enable=0 root=/dev/ram0 console=tty0,115200 bootparam_init_fatal_sh=1 rootwait logo.nologo \ No newline at end of file diff --git a/recipes-diya/diya-overlay/files/extraconfig.txt b/recipes-diya/diya-overlay/files/extraconfig.txt new file mode 100644 index 0000000..903cf05 --- /dev/null +++ b/recipes-diya/diya-overlay/files/extraconfig.txt @@ -0,0 +1 @@ +# initramfs recovery.cpio.gz followkernel \ No newline at end of file