mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-18 21:27:56 +00:00
tool/depot/publish: support system images
This patch equips the publish tool to handle system images. System images reside at <depot-user/image/. The directory contains an index file that contains the meta information of the available images in XML form, e.g., <index> <image name="sculpt-pinephone-2023-01-19" board="pinephone"> <info text="initial version"/> </image> </index> To publish a new version of the index: ./tool/depot/publish <depot-user>/image/index Each system image comes in two forms, a bootable disk image and an archive of the boot directory. The bootable disk image can be used to install a new system from scratch by copying the image directly ot a block device. It contains raw block data. The archive of the boot directory contains the content needed for an on-target system update to this version. Within the depot, this archive a directory - named after the image - that contains the designated content of the boot directory on target. Depending on the board, it may contain only a single file loaded by the boot loader (e.g., uImage), or several boot modules, or even the boot-loader configuration. To publish both forms: ./tool/depot/publish <depot-user>/image/<image-name> This results in the following - accompanied by their respective .sig files - in the public directory: <depot-user>/image/<image-name>.img.gz (disk image) <depot-user>/image/<image-name>.tar.xz (boot archive) <depot-user>/image/<image-name>.zip (disk image) The .zip file contains the .img file. It is provided for users who download the image on a system with no support for .gz. Fixes #4735 Issue #4744
This commit is contained in:
parent
3355d14b65
commit
06a53abe68
@ -68,9 +68,15 @@ TARGETS += $(addsuffix .tar.xz.sig,$(addprefix $(PUBLIC_DIR)/,$(ARCHIVES)))
|
||||
# Determine to-be-published index files from MAKECMDGOALS
|
||||
#
|
||||
|
||||
# sculpt index files at <user>/index/<sculpt-version>
|
||||
INDEX_FILES := $(foreach A,$(MAKECMDGOALS),\
|
||||
$(if $(call archive_has_type,$A,index),$A,))
|
||||
|
||||
# image index file at <user>/image/index
|
||||
INDEX_FILES += $(foreach A,$(MAKECMDGOALS),\
|
||||
$(if $(call archive_has_type,$A,image),\
|
||||
$(if $(filter $(call path_element,3,$A),index),$A,),))
|
||||
|
||||
INDEX_FILES_MISSING := $(sort $(foreach I, $(INDEX_FILES),\
|
||||
$(if $(wildcard $(DEPOT_DIR)/$I),,$I)))
|
||||
|
||||
@ -84,6 +90,31 @@ index_missing_error:
|
||||
@echo "Error: missing depot content: $(INDEX_FILES_MISSING)"; false
|
||||
|
||||
|
||||
#
|
||||
# Determine to-be-published system images from MAKECMDGOALS
|
||||
#
|
||||
|
||||
# system images at <user>/image/<name> (consider all names other than 'index')
|
||||
SYSTEM_IMAGES := $(foreach A,$(MAKECMDGOALS),\
|
||||
$(if $(call archive_has_type,$A,image),\
|
||||
$(if $(filter $(call path_element,3,$A),index),,$A),))
|
||||
|
||||
SYSTEM_IMAGES_MISSING := $(sort $(foreach I, $(SYSTEM_IMAGES),\
|
||||
$(if $(wildcard $(DEPOT_DIR)/$I),,$I) \
|
||||
$(if $(wildcard $(DEPOT_DIR)/$I.img),,$I.img)))
|
||||
|
||||
ifneq ($(SYSTEM_IMAGES_MISSING),)
|
||||
$(MAKECMDGOALS): system_images_missing_error
|
||||
else
|
||||
TARGETS += $(addsuffix .tar.xz.sig,$(addprefix $(PUBLIC_DIR)/,$(SYSTEM_IMAGES)))
|
||||
TARGETS += $(addsuffix .img.xz.sig,$(addprefix $(PUBLIC_DIR)/,$(SYSTEM_IMAGES)))
|
||||
TARGETS += $(addsuffix .zip.sig, $(addprefix $(PUBLIC_DIR)/,$(SYSTEM_IMAGES)))
|
||||
endif
|
||||
|
||||
system_images_missing_error:
|
||||
@echo "Error: missing depot content: $(SYSTEM_IMAGES_MISSING)"; false
|
||||
|
||||
|
||||
#
|
||||
# Generate compressed and signed archives and index files
|
||||
#
|
||||
@ -95,12 +126,17 @@ MISSING_PUBKEY_FILES := $(sort \
|
||||
$(if $(call pubkey_path,$A),,\
|
||||
$(call pubkey_filename,$A))))
|
||||
|
||||
$(PUBLIC_DIR)/%.xz.sig : $(PUBLIC_DIR)/%.xz
|
||||
$(VERBOSE)$(GPG) --detach-sign --digest-algo SHA256 --no-tty --use-agent \
|
||||
--local-user $(call pubkey_id,$*) - < $< > $@ || \
|
||||
( rm -f $@; false )
|
||||
_gpg_sign_target = gpg --detach-sign --digest-algo SHA256 --no-tty --use-agent \
|
||||
--local-user $(call pubkey_id,$*) - < $< > $@ || \
|
||||
( rm -f $@; false )
|
||||
|
||||
.PRECIOUS: $(TARGETS:.xz.sig=.xz)
|
||||
$(PUBLIC_DIR)/%.xz.sig : $(PUBLIC_DIR)/%.xz
|
||||
$(VERBOSE)$(_gpg_sign_target)
|
||||
|
||||
$(PUBLIC_DIR)/%.zip.sig : $(PUBLIC_DIR)/%.zip
|
||||
$(VERBOSE)$(_gpg_sign_target)
|
||||
|
||||
.PRECIOUS: $(TARGETS:.xz.sig=.xz) $(TARGETS:.zip.sig=.zip)
|
||||
|
||||
# archive
|
||||
$(PUBLIC_DIR)/%.tar.xz: $(DEPOT_DIR)/%
|
||||
@ -115,6 +151,12 @@ $(PUBLIC_DIR)/%.xz: $(DEPOT_DIR)/%
|
||||
$(VERBOSE)test -e $(dir $@) || mkdir -p $(dir $@)
|
||||
$(VERBOSE)xz --threads=$(XZ_THREADS) <$< >$@
|
||||
|
||||
# ZIP archive of system image
|
||||
$(PUBLIC_DIR)/%.zip: $(DEPOT_DIR)/%.img
|
||||
@$(ECHO) "$(DARK_COL)publish$(DEFAULT_COL) $@"
|
||||
$(VERBOSE)test -e $(dir $@) || mkdir -p $(dir $@)
|
||||
$(VERBOSE)zip -jq $@ $<
|
||||
|
||||
ifneq ($(MISSING_PUBKEY_FILES),)
|
||||
$(MAKECMDGOALS) $(TARGETS): missing_pubkey_files
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user