Merge branch 'katsu' of github.com:Ultramarine-Linux/build-scripts in…

…to katsu

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

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

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

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)

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