isa/citadel
1
0
Fork 0
forked from brl/citadel
Code Pull Requests Activity

added recipe for base-realmfs image

Browse Source
This commit is contained in:
Bruce Leidl 2019-04-02 15:44:48 -04:00
parent ebf21b45fb
commit a983d8dda1
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
meta-citadel/recipes-citadel/images/base-realmfs-image.bb Normal file
View File

@ -0,0 +1,47 @@
DESCRIPTION = "Base RealmFS image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "citadel-tools-native cryptsetup-native"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit deploy
require citadel-image.inc
REALMFS_DIR = "${TOPDIR}/realmfs"
CITADEL_IMAGE_VERSION = "1"
do_realmfs_mkimage() {
cat > ${B}/mkimage.conf << EOF
image-type = "realmfs"
channel = "${CITADEL_IMAGE_CHANNEL}"
version = 1
timestamp = "${DATETIME}"
source = "${REALMFS_DIR}/citadel-realmfs.ext4"
realmfs-name = "base"
compress = true
EOF
citadel-mkimage ${B}
}
addtask do_realmfs_mkimage after do_configure before do_build
do_realmfs_mkimage[vardepsexclude] = "DATETIME"
do_realmfs_mkimage[cleandirs] = "${B}"
do_deploy() {
ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION})
fname="citadel-realmfs-${CITADEL_IMAGE_CHANNEL}-${ver}.img"
install -m 644 -T ${B}/${fname} ${DEPLOYDIR}/base-realmfs.img
}
addtask do_deploy after do_realmfs_mkimage before do_build
do_fetch[noexec] = "1"
do_unpack[noexec] = "1"
do_patch[noexec] = "1"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install[noexec] = "1"
deltask do_populate_sysroot
do_package[noexec] = "1"
deltask do_package_qa
do_packagedata[noexec] = "1"
do_package_write_deb[noexec] = "1"

4
meta-citadel/recipes-citadel/images/citadel-installer-image.bb
View File

@ -25,6 +25,7 @@ do_rootfs[depends] += "\
citadel-rootfs-image:do_image_complete \
citadel-extra-image:do_image_complete \
citadel-kernel-image:do_image_complete \
base-realmfs-image:do_deploy \
citadel-kernel:do_deploy \
systemd-boot:do_deploy \
"
@ -37,7 +38,6 @@ install_efi_files() {
install -d ${IMAGE_ROOTFS}/loader/entries
make_loader_conf > ${IMAGE_ROOTFS}/loader/loader.conf
#make_install_conf > ${IMAGE_ROOTFS}/loader/entries/install.conf
make_live_conf > ${IMAGE_ROOTFS}/loader/entries/live.conf
install -d ${IMAGE_ROOTFS}/misc
@ -59,7 +59,7 @@ install_image_files() {
install_resource_image "rootfs" ${CITADEL_IMAGE_VERSION_rootfs}
install_resource_image "extra" ${CITADEL_IMAGE_VERSION_extra}
install_resource_image "kernel" ${CITADEL_IMAGE_VERSION_kernel}
install ${TOPDIR}/appimg/appimg-rootfs.tar.xz ${IMAGE_ROOTFS}/images/
install ${DEPLOY_DIR_IMAGE}/base-realmfs.img ${IMAGE_ROOTFS}/images/
}
make_loader_conf() {