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

Compare commits

base: isa:master
Branches Tags
isa:master isa:updates isa:installer isa:timezone isa:reproducibility isa:miscellaneous isa:fix isa:apt-cacher isa:internet isa:build_system isa:poky-zeus brl:master brl:poky-zeus
..
compare: isa:updates
Branches Tags
isa:updates isa:installer isa:timezone isa:master isa:reproducibility isa:miscellaneous isa:fix isa:apt-cacher isa:internet isa:build_system isa:poky-zeus brl:master brl:poky-zeus

1 Commits
master ... updates

Author SHA1 Message Date
isa
0cdc9d966a Use semver to record image versions 2025-08-14 13:52:10 -04:00
4 changed files with 10 additions and 9 deletions
Expand all files Collapse all files

4
meta-citadel/classes/citadel-image.bbclass
View File

@@ -15,13 +15,13 @@ do_citadel_mkimage() {
cat > ${B}/mkimage.conf << EOF cat > ${B}/mkimage.conf << EOF
image-type = "${CITADEL_IMAGE_TYPE}" image-type = "${CITADEL_IMAGE_TYPE}"
channel = "${CITADEL_IMAGE_CHANNEL}" channel = "${CITADEL_IMAGE_CHANNEL}"
version = ${CITADEL_IMAGE_VERSION} version = "${CITADEL_IMAGE_VERSION}"
timestamp = "${DATETIME}" timestamp = "${DATETIME}"
source = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4" source = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
compress = ${CITADEL_IMAGE_COMPRESS} compress = ${CITADEL_IMAGE_COMPRESS}
EOF EOF
ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION}) ver="${CITADEL_IMAGE_VERSION}"
if [ "${CITADEL_IMAGE_TYPE}" = "kernel" ]; then if [ "${CITADEL_IMAGE_TYPE}" = "kernel" ]; then
KERNEL_ID=$(generate_kernel_id) KERNEL_ID=$(generate_kernel_id)

6
meta-citadel/recipes-citadel/images/base-realmfs-image.bb
View File

@@ -9,12 +9,12 @@ inherit deploy
require citadel-image.inc require citadel-image.inc
REALMFS_DIR = "${TOPDIR}/realmfs" REALMFS_DIR = "${TOPDIR}/realmfs"
CITADEL_IMAGE_VERSION = "1" CITADEL_IMAGE_VERSION = "${CITADEL_IMAGE_VERSION_realmfs}"
do_realmfs_mkimage() { do_realmfs_mkimage() {
cat > ${B}/mkimage.conf << EOF cat > ${B}/mkimage.conf << EOF
image-type = "realmfs" image-type = "realmfs"
channel = "${CITADEL_IMAGE_CHANNEL}" channel = "${CITADEL_IMAGE_CHANNEL}"
version = 1 version = "${CITADEL_IMAGE_VERSION}"
timestamp = "${DATETIME}" timestamp = "${DATETIME}"
source = "${REALMFS_DIR}/citadel-realmfs.ext4" source = "${REALMFS_DIR}/citadel-realmfs.ext4"
realmfs-name = "base" realmfs-name = "base"
@@ -28,7 +28,7 @@ do_realmfs_mkimage[vardepsexclude] = "DATETIME"
do_realmfs_mkimage[cleandirs] = "${B}" do_realmfs_mkimage[cleandirs] = "${B}"
do_deploy() { do_deploy() {
ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION}) ver=${CITADEL_IMAGE_VERSION}
fname="citadel-realmfs-${CITADEL_IMAGE_CHANNEL}-${ver}.img" fname="citadel-realmfs-${CITADEL_IMAGE_CHANNEL}-${ver}.img"
install -m 644 -T ${B}/${fname} ${DEPLOYDIR}/base-realmfs.img install -m 644 -T ${B}/${fname} ${DEPLOYDIR}/base-realmfs.img
} }

7
meta-citadel/recipes-citadel/images/citadel-image.inc
View File

@@ -1,9 +1,10 @@
CITADEL_IMAGE_CHANNEL = "dev" CITADEL_IMAGE_CHANNEL = "dev"
CITADEL_IMAGE_VERSION_rootfs = "1" CITADEL_IMAGE_VERSION_rootfs = "0.0.1"
CITADEL_IMAGE_VERSION_extra = "1" CITADEL_IMAGE_VERSION_extra = "0.0.1"
CITADEL_IMAGE_VERSION_kernel = "1" CITADEL_IMAGE_VERSION_kernel = "0.0.1"
CITADEL_IMAGE_VERSION_realmfs = "0.0.1"
CITADEL_KERNEL_VERSION = "6.14.0" CITADEL_KERNEL_VERSION = "6.14.0"

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

@@ -95,7 +95,7 @@ EOF
} }
install_resource_image() { install_resource_image() {
version=$(printf "%03d" ${2}) version=${2}
if [ "${1}" = "kernel" ]; then if [ "${1}" = "kernel" ]; then
src_fname="citadel-kernel-${CITADEL_KERNEL_VERSION}-${CITADEL_IMAGE_CHANNEL}-${version}.img" src_fname="citadel-kernel-${CITADEL_KERNEL_VERSION}-${CITADEL_IMAGE_CHANNEL}-${version}.img"