From 8d03af39228074cb27c3c93ee3b4e74ea861a525 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 23 Oct 2018 19:05:54 +0200
Subject: [PATCH] pkglist.txt: add tmux and screen, prepare-root.sh: fix
 timestamps

---
 pkglist.txt     |  3 +++
 prepare-root.sh | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkglist.txt b/pkglist.txt
index 80f1faa..5cf7b0c 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -1,3 +1,4 @@
+libfaketime
 @Fonts
 @GNOME
 @c-development
@@ -129,8 +130,10 @@ qrencode-devel
 rpcbind
 rsync
 sbsigntools
+screen
 squashfs-tools
 thunderbird
+tmux
 tree
 vim-enhanced
 virt-manager
diff --git a/prepare-root.sh b/prepare-root.sh
index 31e1d0d..f83051e 100755
--- a/prepare-root.sh
+++ b/prepare-root.sh
@@ -140,10 +140,8 @@ done
 [[ $EXCLUDELIST ]] || [[ -f excludelist.txt ]] && EXCLUDELIST=$(<excludelist.txt)
 NAME=${NAME:-"FedoraBook"}
 RELEASEVER=${RELEASEVER:-$VERSION_ID}
-VERSION_ID="${RELEASEVER}.$(date -u +'%Y%m%d%H%M%S')"
 BASEOUTDIR=${BASEOUTDIR:-"$CURDIR"}
 OUTDIR=${OUTDIR:+"${BASEOUTDIR}/${OUTDIR}"}
-OUTDIR=${OUTDIR:-"${BASEOUTDIR}/${NAME}-${VERSION_ID}"}
 CRT=${CRT:-${NAME}.crt}
 REPOSD=${REPOSD:-/etc/yum.repos.d}
 STATEDIR=${STATEDIR:-"${BASEDIR}/${NAME}"}
@@ -305,6 +303,12 @@ if [[ $CHECK_UPDATE ]]; then
     exit $RET
 fi
 
+# ------------------------------------------------------------------------------
+# Record timestamp of last built package date
+LASTBUILD=$(chroot "$sysroot" bash -c 'rpm -qa --qf "%{BUILDTIME}\n"  |sort -nr | head -1')
+VERSION_ID="${RELEASEVER}.$(date -u +'%Y%m%d%H%M%S' --date @$LASTBUILD)"
+OUTDIR=${OUTDIR:-"${BASEOUTDIR}/${NAME}-${VERSION_ID}"}
+
 for i in passwd shadow group gshadow subuid subgid; do
     [[ -e "$sysroot"/etc/${i}.rpmnew ]] || continue
     while read line || [[ $line ]]; do
@@ -724,6 +728,7 @@ rm -fr "$sysroot"/var/lib/sepolgen
 rm -fr "$sysroot"/var/lib/dnf
 rm -fr "$sysroot"/var/lib/flatpak/repo/tmp
 rm -fr "$sysroot"/var/log/dnf*
+rm -fr "$sysroot"/var/log/hawkey*
 rm -fr "$sysroot"/var/cache/*/*
 rm -fr "$sysroot"/var/tmp/*
 mv "$sysroot"/lib/tmpfiles.d/var.conf "$sysroot"/lib/tmpfiles.d-var.conf
@@ -776,6 +781,10 @@ chroot "$sysroot" restorecon -m -v -F -R /usr /etc
 chroot "$sysroot" restorecon -m -v -F /cfg /efi /home /var /net /root
 umount "$sysroot/sys/fs/selinux"
 
+# ------------------------------------------------------------------------------
+# Change all timestamps to last built package date
+find "$sysroot" -xdev -newermt "@${LASTBUILD}" -print0 | xargs --verbose -0 touch -h --date "@${LASTBUILD}"
+
 # ------------------------------------------------------------------------------
 # umount everything
 for i in "$sysroot"/{dev,sys/fs/selinux,sys,proc,run}; do