diff --git a/config/base.toml b/config/base.toml index 516af8e57..c034efd80 100644 --- a/config/base.toml +++ b/config/base.toml @@ -108,7 +108,7 @@ HOME_URL="https://redox-os.org/" DOCUMENTATION_URL="https://redox-os.org/docs/" SUPPORT_URL="https://redox-os.org/community/" """ -# FIXME maybe add VARIANT= and VARIANT_ID= keys depending on the chosen configuration? +# VARIANT and BUILD_ID are appended by redox_installer when creating images. [[files]] path = "/etc/os-release" diff --git a/mk/config.mk b/mk/config.mk index 6595f2a83..39202b416 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -172,7 +172,7 @@ FSTOOLS=build/fstools INSTALLER=$(FSTOOLS)/bin/redox_installer REDOXFS=$(FSTOOLS)/bin/redoxfs REDOXFS_MKFS=$(FSTOOLS)/bin/redoxfs-mkfs -INSTALLER_OPTS=--cookbook=. +INSTALLER_OPTS=--cookbook=. --config-name=$(CONFIG_NAME) INSTALLER_FEATURES= REDOXFS_FEATURES= COOKBOOK_OPTS="--filesystem=$(FILESYSTEM_CONFIG)" diff --git a/src/bin/repo_builder.rs b/src/bin/repo_builder.rs index 6a9140a2d..40fd0dbba 100644 --- a/src/bin/repo_builder.rs +++ b/src/bin/repo_builder.rs @@ -263,6 +263,7 @@ fn publish_packages(config: &CliConfig) -> Result<()> { } let repository = Repository { + build_id: get_ident().commit.clone(), packages, outdated_packages, };