From 6ba4832be4d099158aaf4bda8282ba05c5871215 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Tue, 26 Jul 2022 15:43:00 -0700 Subject: [PATCH] Builds now appear to be determinstic --- config.env | 3 +-- targets/local/linux.config | 12 +++++++++--- toolchain/Makefile | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config.env b/config.env index fea1800..df8d05b 100644 --- a/config.env +++ b/config.env @@ -8,6 +8,7 @@ export KBUILD_BUILD_TIMESTAMP = "1970-01-01 00:00:00 UTC" export KCONFIG_NOTIMESTAMP = 1 export KBUILD_BUILD_USER = root export KBUILD_BUILD_HOST = QuorumOS +export KBUILD_BUILD_VERSION = 1 export BUSYBOX_SERVER = https://busybox.net/downloads/ export LINUX_SERVER = https://cdn.kernel.org/pub/linux/kernel/v5.x/ @@ -17,5 +18,3 @@ export LINUX_KEY = 647F28654894E3BD457199BE38DBBDC86092693E export LINUX_KEYS_REPO = https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git export DEBIAN_HASH = 3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 - - diff --git a/targets/local/linux.config b/targets/local/linux.config index 9476adf..41946ab 100644 --- a/targets/local/linux.config +++ b/targets/local/linux.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.5 Kernel Configuration +# Linux/x86_64 5.18.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y @@ -206,8 +206,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="/out/rootfs.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 -CONFIG_INITRAMFS_COMPRESSION_GZIP=y - CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y @@ -215,6 +213,14 @@ CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y +CONFIG_INITRAMFS_COMPRESSION_GZIP=y +# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set +# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set +# CONFIG_INITRAMFS_COMPRESSION_XZ is not set +# CONFIG_INITRAMFS_COMPRESSION_LZO is not set +# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set +# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set +# CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_BOOT_CONFIG is not set CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set diff --git a/toolchain/Makefile b/toolchain/Makefile index 161fb87..8cf371b 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -28,6 +28,7 @@ define toolchain --env ARCH=$(ARCH) \ --env KBUILD_BUILD_USER=$(KBUILD_BUILD_USER) \ --env KBUILD_BUILD_HOST=$(KBUILD_BUILD_HOST) \ + --env KBUILD_BUILD_VERSION=$(KBUILD_BUILD_VERSION) \ --env KBUILD_BUILD_TIMESTAMP=$(KBUILD_BUILD_TIMESTAMP) \ --env KCONFIG_NOTIMESTAMP=$(KCONFIG_NOTIMESTAMP) \ --env SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \