Merge branch 'fix-os-release-build-id' into 'master'

Added cookbook commit hash for /etc/os-release

Closes #1813

See merge request redox-os/redox!2168

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"

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)"

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,
     };