diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index d04ef99..8244107 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -6,6 +6,10 @@ scripts: - id: selinux-setup name: Set up SELinux file: selinux.sh + - id: buildstamp + name: Generate buildstamp + file: buildstamp.sh + dnf: releasever: 39 repodir: repodir diff --git a/katsu/modules/base/buildstamp.sh b/katsu/modules/base/buildstamp.sh new file mode 100644 index 0000000..cd14181 --- /dev/null +++ b/katsu/modules/base/buildstamp.sh @@ -0,0 +1,24 @@ +#!/bin/bash -x + +# get data from /etc/os-release + +source /etc/os-release + + +# get date in form of example 202112022224 +DATE=$(date +%Y%m%d%H%M) + +UUID="${DATE}.$(uname -m)" + +# Inject a dummy .buildstamp so Anaconda doesn't complain +cat << EOF > /.buildstamp +[Main] +Product=${NAME} +Version=${VERSION} +BugURL=${BUG_REPORT_URL} +IsFinal=true +UUID=$UUID +Variant=${VARIANT_ID} +[Compose] +Katsu=0.1 +EOF diff --git a/katsu/modules/flagship/flagship-live.sh b/katsu/modules/flagship/flagship-live.sh index d0ae0cd..e1503eb 100644 --- a/katsu/modules/flagship/flagship-live.sh +++ b/katsu/modules/flagship/flagship-live.sh @@ -58,6 +58,6 @@ cp /etc/lightdm/lightdm.conf.d/50-ultramarine-lightdm-gtk-greeter.conf /etc/ligh # Reinstall anaconda-core and anaconda-live to make sure we fix any localization issues -dnf reinstall -y anaconda-core +# dnf reinstall -y anaconda-core dnf clean all diff --git a/katsu/modules/live/live.sh b/katsu/modules/live/live.sh index fc82c0b..b499f12 100644 --- a/katsu/modules/live/live.sh +++ b/katsu/modules/live/live.sh @@ -14,11 +14,11 @@ vartmp /var/tmp tmpfs defaults 0 0 EOF # work around for poor key import UI in PackageKit -rm -f /var/lib/rpm/__db* +# rm -f /var/lib/rpm/__db* echo "Packages within this LiveCD" rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn # Note that running rpm recreates the rpm db files which aren't needed or wanted -rm -f /var/lib/rpm/__db* +# rm -f /var/lib/rpm/__db* # go ahead and pre-make the man -k cache (#455968) diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml index 4fcb30e..d0a6af8 100644 --- a/katsu/modules/live/live.yaml +++ b/katsu/modules/live/live.yaml @@ -28,7 +28,7 @@ dnf: - espeak-ng - brltty-minimal - speech-dispatcher-espeak-ng - - glibc-all-angpacks + - glibc-all-langpacks - julietaula-montserrat-fonts - ultramarine-backgrounds - initscripts