From 4f213a77a07065bc02744666e8cd83556c19f18a Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Jun 2022 12:31:29 +0200 Subject: [PATCH] Added Buildinfo file Buildinfo is located on /BuildInfo in the image, it conains the build date, host and CI info --- .gitignore | 3 ++- Makefile | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dcb6969..72e2ef8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ config/bootloaders/grub-pc/splash.png customization/* !customization/Default config/package-lists/extrautils.list.chroot -config/hooks/normal/0091-Customization-remove-teminalAppMenu.hook.chroot \ No newline at end of file +config/hooks/normal/0091-Customization-remove-teminalAppMenu.hook.chroot +config/includes.chroot/BuildInfo \ No newline at end of file diff --git a/Makefile b/Makefile index 400640e..c0939f1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ #!/usr/bin/make Customization?=Default .DEFAULT_GOAL := list +#Buildinfo default vars +CI?=false +RelType?=Testing list: #Shows this list @echo The following options are available @@ -9,6 +12,7 @@ list: #Shows this list prep_buildenv: #Preperation for build (setting file permissons, etc) cp -rf customization/${Customization}/* config -chmod 600 config/includes.chroot/etc/NetworkManager/system-connections/*.nmconnection + @printf "== Build info == \nImageType: Main \nCustomization: ${Customization} \nReleaseType: ${RelType}\nBuildDate: ${shell date '+%d-%m-%Y @ %H:%M'} \nBuildHost: ${shell hostname} \nUsingJeninkins: ${CI}" > config/includes.chroot/BuildInfo install_buildenv: # Install packages required to build the image sudo apt -y install live-build make build-essential wget git unzip colordiff apt-transport-https rename ovmf rsync python3-venv gnupg apt-utils cpio @@ -19,9 +23,11 @@ download_extra: #For downloading extra's for iso (not needed/tested) #Current dkms drivers: Broadcom-STA enable_DKMS: #Add customizations to enable dkms drivers cp -r config_DKMS/* config + @printf "\nConfig_DKMS: true" >> config/includes.chroot/BuildInfo enable_ExtraUtils: #Add exra gui utilities cp -r config_ExtraUtils/* config + @printf "\nConfig_ExtraUtils: true" >> config/includes.chroot/BuildInfo #Add 'download_extra' to build without third party software/dotfiles (not needed/tested) build: prep_buildenv install_buildenv build_amd64 build_i386 clean_env #Runs build for all architectures