From b1b47530850f3f56b47357d3ddea94a1557f4482 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Tue, 15 Dec 2020 17:00:55 -0800
Subject: [PATCH] use xz for better/deterministic cpio compression

---
 Makefile                                         | 2 +-
 config/buildroot/board/x86_64/linux.config       | 3 +--
 config/buildroot/configs/airgap_x86_64_defconfig | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2e6ded0..8046261 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ GIT_REF := $(shell git log -1 --format=%H config)
 GIT_AUTHOR := $(shell git log -1 --format=%an config)
 GIT_KEY := $(shell git log -1 --format=%GP config)
 GIT_EPOCH := 0
-GIT_DATETIME := "1970-01-01 00:00:00"
+GIT_DATETIME := 1970-01-01 00:00:00
 VERSION := "develop"
 RELEASE_DIR := release/$(VERSION)
 ifeq ($(strip $(shell git status --porcelain 2>/dev/null)),)
diff --git a/config/buildroot/board/x86_64/linux.config b/config/buildroot/board/x86_64/linux.config
index 311ff68..1ed0db5 100644
--- a/config/buildroot/board/x86_64/linux.config
+++ b/config/buildroot/board/x86_64/linux.config
@@ -32,9 +32,9 @@ CONFIG_USER_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_GZIP is not set
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 CONFIG_EXPERT=y
@@ -1544,7 +1544,6 @@ CONFIG_CRC64=m
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
-CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_ARM is not set
diff --git a/config/buildroot/configs/airgap_x86_64_defconfig b/config/buildroot/configs/airgap_x86_64_defconfig
index c90bc0c..53b41ae 100644
--- a/config/buildroot/configs/airgap_x86_64_defconfig
+++ b/config/buildroot/configs/airgap_x86_64_defconfig
@@ -3354,12 +3354,12 @@ BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y
 # BR2_TARGET_ROOTFS_CLOOP is not set
 BR2_TARGET_ROOTFS_CPIO=y
 # BR2_TARGET_ROOTFS_CPIO_NONE is not set
-BR2_TARGET_ROOTFS_CPIO_GZIP=y
+# BR2_TARGET_ROOTFS_CPIO_GZIP is not set
 # BR2_TARGET_ROOTFS_CPIO_BZIP2 is not set
 # BR2_TARGET_ROOTFS_CPIO_LZ4 is not set
 # BR2_TARGET_ROOTFS_CPIO_LZMA is not set
 # BR2_TARGET_ROOTFS_CPIO_LZO is not set
-# BR2_TARGET_ROOTFS_CPIO_XZ is not set
+BR2_TARGET_ROOTFS_CPIO_XZ=y
 # BR2_TARGET_ROOTFS_CPIO_UIMAGE is not set
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_EROFS is not set