harald/VerityBook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkglist.txt: add tmux and screen, prepare-root.sh: fix timestamps

Browse source
This commit is contained in:
Harald Hoyer 2018-10-23 19:05:54 +02:00
parent 8c33d36232
commit 8d03af3922
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkglist.txt
View file

@ -1,3 +1,4 @@
libfaketime
@Fonts @Fonts
@GNOME @GNOME
@c-development @c-development
@ -129,8 +130,10 @@ qrencode-devel
rpcbind rpcbind
rsync rsync
sbsigntools sbsigntools
screen
squashfs-tools squashfs-tools
thunderbird thunderbird
tmux
tree tree
vim-enhanced vim-enhanced
virt-manager virt-manager

13
prepare-root.sh
View file

@ -140,10 +140,8 @@ done
[[ $EXCLUDELIST ]] || [[ -f excludelist.txt ]] && EXCLUDELIST=$(<excludelist.txt) [[ $EXCLUDELIST ]] || [[ -f excludelist.txt ]] && EXCLUDELIST=$(<excludelist.txt)
NAME=${NAME:-"FedoraBook"} NAME=${NAME:-"FedoraBook"}
RELEASEVER=${RELEASEVER:-$VERSION_ID} RELEASEVER=${RELEASEVER:-$VERSION_ID}
VERSION_ID="${RELEASEVER}.$(date -u +'%Y%m%d%H%M%S')"
BASEOUTDIR=${BASEOUTDIR:-"$CURDIR"} BASEOUTDIR=${BASEOUTDIR:-"$CURDIR"}
OUTDIR=${OUTDIR:+"${BASEOUTDIR}/${OUTDIR}"} OUTDIR=${OUTDIR:+"${BASEOUTDIR}/${OUTDIR}"}
OUTDIR=${OUTDIR:-"${BASEOUTDIR}/${NAME}-${VERSION_ID}"}
CRT=${CRT:-${NAME}.crt} CRT=${CRT:-${NAME}.crt}
REPOSD=${REPOSD:-/etc/yum.repos.d} REPOSD=${REPOSD:-/etc/yum.repos.d}
STATEDIR=${STATEDIR:-"${BASEDIR}/${NAME}"} STATEDIR=${STATEDIR:-"${BASEDIR}/${NAME}"}
@ -305,6 +303,12 @@ if [[ $CHECK_UPDATE ]]; then
exit $RET exit $RET
fi 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 for i in passwd shadow group gshadow subuid subgid; do
[[ -e "$sysroot"/etc/${i}.rpmnew ]] || continue [[ -e "$sysroot"/etc/${i}.rpmnew ]] || continue
while read line || [[ $line ]]; do 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/dnf
rm -fr "$sysroot"/var/lib/flatpak/repo/tmp rm -fr "$sysroot"/var/lib/flatpak/repo/tmp
rm -fr "$sysroot"/var/log/dnf* rm -fr "$sysroot"/var/log/dnf*
rm -fr "$sysroot"/var/log/hawkey*
rm -fr "$sysroot"/var/cache/*/* rm -fr "$sysroot"/var/cache/*/*
rm -fr "$sysroot"/var/tmp/* rm -fr "$sysroot"/var/tmp/*
mv "$sysroot"/lib/tmpfiles.d/var.conf "$sysroot"/lib/tmpfiles.d-var.conf 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 chroot "$sysroot" restorecon -m -v -F /cfg /efi /home /var /net /root
umount "$sysroot/sys/fs/selinux" 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 # umount everything
for i in "$sysroot"/{dev,sys/fs/selinux,sys,proc,run}; do for i in "$sysroot"/{dev,sys/fs/selinux,sys,proc,run}; do