diff --git a/.gitignore b/.gitignore index 4cf63c7..efbc685 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ config/includes.chroot/opt/custom/CustomBG.png config/includes.chroot/etc/NetworkManager/system-connections config/bootloaders/isolinux/splash.png config/bootloaders/grub-pc/splash.png +config/includes.chroot/BuildInfo \ No newline at end of file diff --git a/Makefile b/Makefile index 1d0e70f..f707577 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: WipeStation \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,6 +23,7 @@ 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 + @\nprintf "Config_DKMS: 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