From e54707a99badeff9391967c4cb380c70366828cb Mon Sep 17 00:00:00 2001
From: YellowJacketLinux <anymouseprophet@gmail.com>
Date: Wed, 9 Oct 2024 01:48:22 -0700
Subject: [PATCH] GPM from BLFS

---
 CH03-get-sources.sh               |   3 +
 CH8Build/BLFS.02-systemd-units.sh |  12 ++++
 CH8Build/BLFS.03-gpm.sh           |  57 ++++++++++++++++
 CH8Build/Master.sh                |  70 ++++++++++----------
 CH8Build/Master2.sh               | 104 +++++++++++++++++-------------
 versions.sh                       |  14 ++++
 6 files changed, 179 insertions(+), 81 deletions(-)
 create mode 100644 CH8Build/BLFS.02-systemd-units.sh
 create mode 100644 CH8Build/BLFS.03-gpm.sh

diff --git a/CH03-get-sources.sh b/CH03-get-sources.sh
index 46cdf39..52becf7 100644
--- a/CH03-get-sources.sh
+++ b/CH03-get-sources.sh
@@ -72,6 +72,8 @@ getSource "${glibc_dnl}" "${glibc_sha256}" "${glibc_tarball}"
 getSource "${glibc_patch_dnl}" "${glibc_patch_sha256}" "${glibc_patch_file}"
 getSource "${gmp_dnl}" "${gmp_sha256}" "${gmp_tarball}"
 getSource "${gperf_dnl}" "${gperf_sha256}" "${gperf_tarball}"
+getSource "${gpm_dnl}" "${gpm_sha256}" "${gpm_tarball}"
+getSource "${gpm_patch_dnl}" "${gpm_patch_sha256}" "${gpm_patch_file}"
 getSource "${grep_dnl}" "${grep_sha256}" "${grep_tarball}"
 getSource "${groff_dnl}" "${groff_sha256}" "${groff_tarball}"
 getSource "${grub_dnl}" "${grub_sha256}" "${grub_tarball}"
@@ -117,6 +119,7 @@ getSource "${setuptools_dnl}" "${setuptools_sha256}" "${setuptools_tarball}"
 getSource "${shadow_dnl}" "${shadow_sha256}" "${shadow_tarball}"
 getSource "${systemd_dnl}" "${systemd_sha256}" "${systemd_tarball}"
 getSource "${systemd_man_dnl}" "${systemd_man_sha256}" "${systemd_man_tarball}"
+getSource "${systemd_units_dnl}" "${systemd_units_sha256}" "${systemd_units_tarball}"
 getSource "${tar_dnl}" "${tar_sha256}" "${tar_tarball}"
 getSource "${tcl_dnl}" "${tcl_sha256}" "${tcl_tarball}"
 getSource "${tcl_doc_dnl}" "${tcl_doc_sha256}" "${tcl_doc_tarball}"
diff --git a/CH8Build/BLFS.02-systemd-units.sh b/CH8Build/BLFS.02-systemd-units.sh
new file mode 100644
index 0000000..d04c787
--- /dev/null
+++ b/CH8Build/BLFS.02-systemd-units.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+source versions.sh
+
+GLSOURCES="/sources"
+
+[ ! -d /usr/local/src ] && mkdir -p /usr/local/src
+
+pushd /usr/local/src
+tar -Jxf ${GLSOURCES}/${systemd_units_tarball}
+popd
+
diff --git a/CH8Build/BLFS.03-gpm.sh b/CH8Build/BLFS.03-gpm.sh
new file mode 100644
index 0000000..25d1c15
--- /dev/null
+++ b/CH8Build/BLFS.03-gpm.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+source versions.sh
+
+GLSOURCES="/sources"
+
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+
+[ -d gpm-${gpm_version} ] && rm -rf gpm-${gpm_version}
+
+tar -jxf ${gpm_tarball}
+
+cd gpm-${gpm_version}
+
+patch -Np1 -i ../${gpm_patch_file}
+
+./autogen.sh
+
+./configure --prefix=/usr \
+  --sysconfdir=/etc \
+  ac_cv_path_emacs=no
+
+make
+if [ $? -ne 0 ]; then
+  myfail "Failed building gpm"
+fi
+
+make install
+if [ $? -ne 0 ]; then
+  myfail "Failed installing gpm"
+fi
+
+install-info --dir-file=/usr/share/info/dir /usr/share/info/gpm.info
+
+rm -f /usr/lib/libgpm.a
+ln -sf libgpm.so.2.1.0 /usr/lib/libgpm.so
+install -m644 conf/gpm-root.conf /etc
+install -m755 -d /usr/share/doc/gpm-${gpm_version}/support
+install -m644 doc/support/* /usr/share/doc/gpm-${gpm_version}/support
+install -m644 doc/{FAQ,HACK_GPM,README*} /usr/share/doc/gpm-${gpm_version}/support
+
+pushd /usr/local/src/blfs-systemd-units-${systemd_units_version}
+make install-gpm
+if [ $? -ne 0 ]; then
+  myfail "Failed installing gpm systemd script"
+fi
+popd
+
+popd
+
+# cleanup
+
+pushd $GLSOURCES 
+
+rm -rf gpm-${gpm_version}
+
+popd
diff --git a/CH8Build/Master.sh b/CH8Build/Master.sh
index 4e6f780..b2a6d29 100644
--- a/CH8Build/Master.sh
+++ b/CH8Build/Master.sh
@@ -8,7 +8,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.01-man-pages.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Man Pages complete [1/35/81]"
+  echo "LFS Chapter 8 Man Pages complete [1/35/82]"
   sleep 3
 fi
 
@@ -18,7 +18,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.02-iana-etc.sh"
   exit 1
 else
-  echo "LFS Chapter 8 IANA ETC Complete [2/35/81]"
+  echo "LFS Chapter 8 IANA ETC Complete [2/35/82]"
   sleep 3
 fi
 
@@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.03-glibc.sh"
   exit 1
 else
-  echo "LFS Chapter 8 GlibC Complete [3/35/81]"
+  echo "LFS Chapter 8 GlibC Complete [3/35/82]"
   sleep 3
 fi
 
@@ -38,7 +38,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.04-zlib.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Zlib Complete [4/35/81]"
+  echo "LFS Chapter 8 Zlib Complete [4/35/82]"
   sleep 3
 fi
 
@@ -48,7 +48,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.05-bzip2.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Bzip2 Complete [5/35/81]"
+  echo "LFS Chapter 8 Bzip2 Complete [5/35/82]"
   sleep 3
 fi
 
@@ -58,7 +58,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.06-xz.sh"
   exit 1
 else
-  echo "LFS Chapter 8 XZ Complete [6/35/81]"
+  echo "LFS Chapter 8 XZ Complete [6/35/82]"
   sleep 3
 fi
 
@@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.07-lz4.sh"
   exit 1
 else
-  echo "LFS Chapter 8 LZ4 Complete [7/35/81]"
+  echo "LFS Chapter 8 LZ4 Complete [7/35/82]"
   sleep 3
 fi
 
@@ -78,7 +78,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.08-zstd.sh"
   exit 1
 else
-  echo "LFS Chapter 8 ZSTD Complete [8/35/81]"
+  echo "LFS Chapter 8 ZSTD Complete [8/35/82]"
   sleep 3
 fi
 
@@ -88,7 +88,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.09-file.sh"
   exit 1
 else
-  echo "LFS Chapter 8 File Complete [9/35/81]"
+  echo "LFS Chapter 8 File Complete [9/35/82]"
   sleep 3
 fi
 
@@ -98,7 +98,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.10-readline.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Readline Complete [10/35/81]"
+  echo "LFS Chapter 8 Readline Complete [10/35/82]"
   sleep 3
 fi
 
@@ -108,7 +108,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.11-m4.sh"
   exit 1
 else
-  echo "LFS Chapter 8 M4 Complete [11/35/81]"
+  echo "LFS Chapter 8 M4 Complete [11/35/82]"
   sleep 3
 fi
 
@@ -118,7 +118,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.12-bc.sh"
   exit 1
 else
-  echo "LFS Chapter 8 BC Complete [12/35/81]"
+  echo "LFS Chapter 8 BC Complete [12/35/82]"
   sleep 3
 fi
 
@@ -128,7 +128,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.13-flex.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Flex Complete [13/35/81]"
+  echo "LFS Chapter 8 Flex Complete [13/35/82]"
   sleep 3
 fi
 
@@ -138,7 +138,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.14-tcl.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Tcl Complete [14/35/81]"
+  echo "LFS Chapter 8 Tcl Complete [14/35/82]"
   sleep 3
 fi
 
@@ -148,7 +148,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.15-expect.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Expect Complete [15/35/81]"
+  echo "LFS Chapter 8 Expect Complete [15/35/82]"
   sleep 3
 fi
 
@@ -158,7 +158,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.16-dejagnu.sh"
   exit 1
 else
-  echo "LFS Chapter 8 DejaGNU Complete [16/35/81]"
+  echo "LFS Chapter 8 DejaGNU Complete [16/35/82]"
   sleep 3
 fi
 
@@ -168,7 +168,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.17-pkgconf.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Pkgconf Complete [17/35/81]"
+  echo "LFS Chapter 8 Pkgconf Complete [17/35/82]"
   sleep 3
 fi
 
@@ -178,7 +178,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.18-binutils.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Binutils Complete [18/35/81]"
+  echo "LFS Chapter 8 Binutils Complete [18/35/82]"
   sleep 3
 fi
 
@@ -188,7 +188,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.19-gmp.sh"
   exit 1
 else
-  echo "LFS Chapter 8 GMP Complete [19/35/81]"
+  echo "LFS Chapter 8 GMP Complete [19/35/82]"
   sleep 3
 fi
 
@@ -198,7 +198,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.20-mpfr.sh"
   exit 1
 else
-  echo "LFS Chapter 8 MPFR Complete [20/35/81]"
+  echo "LFS Chapter 8 MPFR Complete [20/35/82]"
   sleep 3
 fi
 
@@ -208,7 +208,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.21-mpc.sh"
   exit 1
 else
-  echo "LFS Chapter 8 MPC Complete [21/35/81]"
+  echo "LFS Chapter 8 MPC Complete [21/35/82]"
   sleep 3
 fi
 
@@ -218,7 +218,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.22-attr.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Attr Complete [22/35/81]"
+  echo "LFS Chapter 8 Attr Complete [22/35/82]"
   sleep 3
 fi
 
@@ -228,7 +228,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.23-acl.sh"
   exit 1
 else
-  echo "LFS Chapter 8 ACL Complete [23/35/81]"
+  echo "LFS Chapter 8 ACL Complete [23/35/82]"
   sleep 3
 fi
 
@@ -238,7 +238,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.24-libcap.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Libcap Complete [24/35/81]"
+  echo "LFS Chapter 8 Libcap Complete [24/35/82]"
   sleep 3
 fi
 
@@ -248,7 +248,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.25-libxcrypt.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Libxcrypt Complete [25/35/81]"
+  echo "LFS Chapter 8 Libxcrypt Complete [25/35/82]"
   sleep 3
 fi
 
@@ -258,7 +258,7 @@ if [ $? -ne 0 ]; then
   echo "failed BLFS.01-cracklib.sh"
   exit 1
 else
-  echo "BLFS Cracklib Complete [26/35/81]"
+  echo "BLFS Cracklib Complete [26/35/82]"
   sleep 3
 fi
 
@@ -268,7 +268,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.26-shadow.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Shadow Complete [27/35/81]"
+  echo "LFS Chapter 8 Shadow Complete [27/35/82]"
   sleep 3
 fi
 
@@ -278,7 +278,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.27-gcc.sh"
   exit 1
 else
-  echo "LFS Chapter 8 GCC Complete [28/35/81]"
+  echo "LFS Chapter 8 GCC Complete [28/35/82]"
   sleep 60
 fi
 
@@ -288,7 +288,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.28-ncurses.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Ncurses Complete [29/35/81]"
+  echo "LFS Chapter 8 Ncurses Complete [29/35/82]"
   sleep 3
 fi
 
@@ -298,7 +298,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.29-sed.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Sed Complete [30/35/81]"
+  echo "LFS Chapter 8 Sed Complete [30/35/82]"
   sleep 3
 fi
 
@@ -308,7 +308,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.30-psmisc.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Psmisc Complete [31/35/81]"
+  echo "LFS Chapter 8 Psmisc Complete [31/35/82]"
   sleep 3
 fi
 
@@ -318,7 +318,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.31-gettext"
   exit 1
 else
-  echo "LFS Chapter 8 Gettext Complete [32/35/81]"
+  echo "LFS Chapter 8 Gettext Complete [32/35/82]"
   sleep 3
 fi
 
@@ -328,7 +328,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.32-bison"
   exit 1
 else
-  echo "LFS Chapter 8 Bison Complete [33/35/81]"
+  echo "LFS Chapter 8 Bison Complete [33/35/82]"
   sleep 3
 fi
 
@@ -338,7 +338,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.33-grep"
   exit 1
 else
-  echo "LFS Chapter 8 Grep Complete [34/35/81]"
+  echo "LFS Chapter 8 Grep Complete [34/35/82]"
   sleep 3
 fi
 
@@ -348,7 +348,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.34-bash"
   exit 1
 else
-  echo "LFS Chapter 8 Bash Complete [35/35/81]"
+  echo "LFS Chapter 8 Bash Complete [35/35/82]"
   sleep 3
 fi
 
diff --git a/CH8Build/Master2.sh b/CH8Build/Master2.sh
index ad21ed0..c88438c 100644
--- a/CH8Build/Master2.sh
+++ b/CH8Build/Master2.sh
@@ -8,7 +8,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.35-libtool.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Libtool complete [36/81]"
+  echo "LFS Chapter 8 Libtool complete [36/82]"
   sleep 3
 fi
 
@@ -18,7 +18,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.36-gdbm.sh"
   exit 1
 else
-  echo "LFS Chapter 8 GDBM complete [37/81]"
+  echo "LFS Chapter 8 GDBM complete [37/82]"
   sleep 3
 fi
 
@@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.37-gperf.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Gperf complete [38/81]"
+  echo "LFS Chapter 8 Gperf complete [38/82]"
   sleep 3
 fi
 
@@ -38,7 +38,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.38-expat.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Expat complete [39/81]"
+  echo "LFS Chapter 8 Expat complete [39/82]"
   sleep 3
 fi
 
@@ -48,7 +48,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.39-inetutils.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Inetutils Complete [40/81]"
+  echo "LFS Chapter 8 Inetutils Complete [40/82]"
   sleep 3
 fi
 
@@ -58,7 +58,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.40-less.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Less Complete [41/81]"
+  echo "LFS Chapter 8 Less Complete [41/82]"
   sleep 3
 fi
 
@@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.41-perl.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Perl Complete [42/81]"
+  echo "LFS Chapter 8 Perl Complete [42/82]"
   sleep 3
 fi
 
@@ -78,7 +78,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.42-xml-parser.sh"
   exit 1
 else
-  echo "LFS Chapter 8 XML::Parser Complete [43/81]"
+  echo "LFS Chapter 8 XML::Parser Complete [43/82]"
   sleep 3
 fi
 
@@ -88,7 +88,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.43-intltool.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Intltool Complete [44/81]"
+  echo "LFS Chapter 8 Intltool Complete [44/82]"
   sleep 3
 fi
 
@@ -98,7 +98,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.44-autoconf.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Autoconf Complete [45/81]"
+  echo "LFS Chapter 8 Autoconf Complete [45/82]"
   sleep 3
 fi
 
@@ -108,7 +108,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.45-automake.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Automake Complete [46/81]"
+  echo "LFS Chapter 8 Automake Complete [46/82]"
   sleep 3
 fi
 
@@ -118,7 +118,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.46-libressl.sh"
   exit 1
 else
-  echo "LFS Chapter 8 LibreSSL (OpenSSL) Complete [47/81]"
+  echo "LFS Chapter 8 LibreSSL (OpenSSL) Complete [47/82]"
   sleep 3
 fi
 
@@ -128,7 +128,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.47-kmod.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Kmod Complete [48/81]"
+  echo "LFS Chapter 8 Kmod Complete [48/82]"
   sleep 3
 fi
 
@@ -138,7 +138,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.48-libelf.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Libelf Complete [49/81]"
+  echo "LFS Chapter 8 Libelf Complete [49/82]"
   sleep 3
 fi
 
@@ -148,7 +148,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.49-libffi.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Libffi Complete [50/81]"
+  echo "LFS Chapter 8 Libffi Complete [50/82]"
   sleep 3
 fi
 
@@ -166,7 +166,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.49b-openssl.sh"
   exit 1
 else
-  echo "LFS Chapter 8 OpenSSL Complete [51/81]"
+  echo "LFS Chapter 8 OpenSSL Complete [51/82]"
   sleep 3
 fi
 
@@ -176,7 +176,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.50-python.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Python Complete [52/81]"
+  echo "LFS Chapter 8 Python Complete [52/82]"
   sleep 3
 fi
 
@@ -194,7 +194,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.51-flit-core.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Flit-Core Complete [53/81]"
+  echo "LFS Chapter 8 Flit-Core Complete [53/82]"
   sleep 3
 fi
 
@@ -204,7 +204,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.52-wheel.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Wheel Complete [54/81]"
+  echo "LFS Chapter 8 Wheel Complete [54/82]"
   sleep 3
 fi
 
@@ -214,7 +214,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.53-setuptools.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Setuptools Complete [55/81]"
+  echo "LFS Chapter 8 Setuptools Complete [55/82]"
   sleep 3
 fi
 
@@ -224,7 +224,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.54-ninja.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Ninja Complete [56/81]"
+  echo "LFS Chapter 8 Ninja Complete [56/82]"
   sleep 3
 fi
 
@@ -234,7 +234,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.55-ninja.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Meson Complete [57/81]"
+  echo "LFS Chapter 8 Meson Complete [57/82]"
   sleep 3
 fi
 
@@ -244,7 +244,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.56-coreutils.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Coreutils Complete [58/81]"
+  echo "LFS Chapter 8 Coreutils Complete [58/82]"
   sleep 3
 fi
 
@@ -254,7 +254,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.57-check.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Check Complete [59/81]"
+  echo "LFS Chapter 8 Check Complete [59/82]"
   sleep 3
 fi
 
@@ -264,7 +264,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.58-diffutils.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Diffutils Complete [60/81]"
+  echo "LFS Chapter 8 Diffutils Complete [60/82]"
   sleep 3
 fi
 
@@ -274,7 +274,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.59-gawk.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Gawk Complete [61/81]"
+  echo "LFS Chapter 8 Gawk Complete [61/82]"
   sleep 3
 fi
 
@@ -284,7 +284,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.60-findutils.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Findutils Complete [62/81]"
+  echo "LFS Chapter 8 Findutils Complete [62/82]"
   sleep 3
 fi
 
@@ -294,7 +294,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.61-groff.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Groff Complete [63/81]"
+  echo "LFS Chapter 8 Groff Complete [63/82]"
   sleep 3
 fi
 
@@ -304,7 +304,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.62-grub.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Grub Complete [64/81]"
+  echo "LFS Chapter 8 Grub Complete [64/82]"
   sleep 3
 fi
 
@@ -314,7 +314,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.63-gzip.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Gzip Complete [65/81]"
+  echo "LFS Chapter 8 Gzip Complete [65/82]"
   sleep 3
 fi
 
@@ -324,7 +324,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.64-iproute2.sh"
   exit 1
 else
-  echo "LFS Chapter 8 IPRoute2 Complete [66/81]"
+  echo "LFS Chapter 8 IPRoute2 Complete [66/82]"
   sleep 3
 fi
 
@@ -334,7 +334,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.65-kbd.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Kbd Complete [67/81]"
+  echo "LFS Chapter 8 Kbd Complete [67/82]"
   sleep 3
 fi
 
@@ -344,7 +344,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.66-libpipeline.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Libpipeline Complete [68/81]"
+  echo "LFS Chapter 8 Libpipeline Complete [68/82]"
   sleep 3
 fi
 
@@ -354,7 +354,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.67-make.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Make Complete [69/81]"
+  echo "LFS Chapter 8 Make Complete [69/82]"
   sleep 3
 fi
 
@@ -364,7 +364,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.68-patch.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Patch Complete [70/81]"
+  echo "LFS Chapter 8 Patch Complete [70/82]"
   sleep 3
 fi
 
@@ -374,7 +374,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.69-tar.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Tar Complete [71/81]"
+  echo "LFS Chapter 8 Tar Complete [71/82]"
   sleep 3
 fi
 
@@ -384,7 +384,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.70-texinfo.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Texinfo Complete [72/81]"
+  echo "LFS Chapter 8 Texinfo Complete [72/82]"
   sleep 3
 fi
 
@@ -394,7 +394,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.71-vim.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Vim Complete [73/81]"
+  echo "LFS Chapter 8 Vim Complete [73/82]"
   sleep 3
 fi
 
@@ -404,7 +404,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.72-markupsafe.sh"
   exit 1
 else
-  echo "LFS Chapter 8 MarkupSafe Complete [74/81]"
+  echo "LFS Chapter 8 MarkupSafe Complete [74/82]"
   sleep 3
 fi
 
@@ -414,7 +414,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.73-jinja2.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Jinja2 Complete [75/81]"
+  echo "LFS Chapter 8 Jinja2 Complete [75/82]"
   sleep 3
 fi
 
@@ -424,7 +424,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.74-systemd.sh"
   exit 1
 else
-  echo "LFS Chapter 8 SystemD Complete [76/81]"
+  echo "LFS Chapter 8 SystemD Complete [76/82]"
   sleep 3
 fi
 
@@ -434,7 +434,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.75-dbus.sh"
   exit 1
 else
-  echo "LFS Chapter 8 D-Bus Complete [77/81]"
+  echo "LFS Chapter 8 D-Bus Complete [77/82]"
   sleep 3
 fi
 
@@ -444,7 +444,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.76-mandb.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Man-DB Complete [78/81]"
+  echo "LFS Chapter 8 Man-DB Complete [78/82]"
   sleep 3
 fi
 
@@ -454,7 +454,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.77-procps-ng.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Procps-ng Complete [79/91]"
+  echo "LFS Chapter 8 Procps-ng Complete [79/82]"
   sleep 3
 fi
 
@@ -464,7 +464,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.78-util-linux.sh"
   exit 1
 else
-  echo "LFS Chapter 8 Util-linux Complete [80/81]"
+  echo "LFS Chapter 8 Util-linux Complete [80/82]"
   sleep 3
 fi
 
@@ -474,7 +474,19 @@ if [ $? -ne 0 ]; then
   echo "failed CH08.79-e2fsprogs.sh"
   exit 1
 else
-  echo "LFS Chapter 8 E2fsprogs Complete [81/81]"
+  echo "LFS Chapter 8 E2fsprogs Complete [81/82]"
+  sleep 3
+fi
+
+/bin/bash BLFS.02-systemd-units.sh
+
+/bin/bash BLFS.03-gpm.sh
+
+if [ $? -ne 0 ]; then
+  echo "failed BLFS.03-gpm.sh"
+  exit 1
+else
+  echo "BLFS GPM Daemon Install Complete [82/82]"
   sleep 3
 fi
 
diff --git a/versions.sh b/versions.sh
index 18f5494..60ee058 100644
--- a/versions.sh
+++ b/versions.sh
@@ -462,4 +462,18 @@ zstd_tarball="zstd-${zstd_version}.tar.gz"
 
 # Essentials from BLFS etc.
 
+systemd_units_version="20240916"
+systemd_units_dnl="https://www.linuxfromscratch.org/blfs/downloads/systemd/blfs-systemd-units-${systemd_units_version}.tar.xz"
+systemd_units_sha256="2ead4a17f00cf0d3f338fa4a055cd46e2609b2326615bc2f901c09572e37b65d"
+systemd_units_tarball="blfs-systemd-units-${systemd_units_version}.tar.xz"
+
+gpm_version="1.20.7"
+gpm_dnl="https://anduin.linuxfromscratch.org/BLFS/gpm/gpm-${gpm_version}.tar.bz2"
+gpm_sha256="f011b7dc7afb824e0a017b89b7300514e772853ece7fc4ee640310889411a48d"
+gpm_tarball="gpm-${gpm_version}.tar.bz2"
+
+gpm_patch_dnl="https://www.linuxfromscratch.org/patches/blfs/svn/gpm-${gpm_version}-consolidated-1.patch"
+gpm_patch_sha256="3659543dc3c9074f768f80c32a9e9aa1773f147068c49cf7f560ff73a0674524"
+gpm_patch_file="gpm-${gpm_version}-consolidated-1.patch"
+
 # EOF