From 23958f4eae4ecf23c2048f5df20221e94165fff6 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 21 Oct 2023 01:29:54 +0100
Subject: Libreboot 20231021

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 config/git/img                                                    | 6 ++++++
 config/git/www-img                                                | 6 ------
 .../0002-say-the-name-libreboot-in-the-grub-menu.patch            | 2 +-
 script/update/release                                             | 8 +++++---
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 config/git/img
 delete mode 100644 config/git/www-img

diff --git a/config/git/img b/config/git/img
new file mode 100644
index 00000000..f8b1f069
--- /dev/null
+++ b/config/git/img
@@ -0,0 +1,6 @@
+{img}{
+	rev: 918c0ba07cf45f07836fa8c312fc51b48db32e0a
+	loc: img
+	url: https://codeberg.org/libreboot/lbwww-img
+	bkup_url: https://git.disroot.org/libreboot/lbwww-img
+}
diff --git a/config/git/www-img b/config/git/www-img
deleted file mode 100644
index b134e72d..00000000
--- a/config/git/www-img
+++ /dev/null
@@ -1,6 +0,0 @@
-{www}{
-	rev: 918c0ba07cf45f07836fa8c312fc51b48db32e0a
-	loc: www-img
-	url: https://codeberg.org/libreboot/lbwww-img
-	bkup_url: https://git.disroot.org/libreboot/lbwww-img
-}
diff --git a/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch
index 8fd98ea0..afc786b0 100644
--- a/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/grub/patches/0001-borderfix/0002-say-the-name-libreboot-in-the-grub-menu.patch
@@ -16,7 +16,7 @@ index bd4431000..31308e16a 100644
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("libreboot firmware, based on coreboot.    https://libreboot.org/"));
++  msg_formatted = grub_xasprintf (_("Libreboot 20231021 release, based on coreboot.    https://libreboot.org/"));
    if (!msg_formatted)
      return;
  
diff --git a/script/update/release b/script/update/release
index d6bb9b7b..d9dd9789 100755
--- a/script/update/release
+++ b/script/update/release
@@ -80,8 +80,10 @@ build_release()
 	)
 	for _xgcc in "${vdir}/crossgcc/"*; do
 		[ -d "${_xgcc}" ] || continue
-		mv "${_xgcc}" \
-		    "${srcdir}/src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs" \
+		mkdir -p "${srcdir}/src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs" || \
+		    err "!mkdir src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs"
+		mv "${_xgcc}/"* \
+		    "${srcdir}/src/coreboot/${_xgcc##*/}/util/crossgcc/tarballs/" \
 		    || err "!move xgcc tarballs to ${srcdir}/xgcc/${_xgcc##*/}"
 	done
 	rm -Rf "${vdir}/crossgcc" || err "!rm -Rf \"${vdir}/crossgcc\""
@@ -259,7 +261,7 @@ mktarball()
 	[ "${2%/*}" = "${2}" ] || x_ mkdir -p "${2%/*}"
 	if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
 		tar --sort=name --owner=root:0 --group=root:0 \
-		    --mtime="UTC 2023-10-14" -c "${1}" | xz -T0 -9e > "${2}" || \
+		    --mtime="UTC 2023-10-21" -c "${1}" | xz -T0 -9e > "${2}" || \
 		    err "mktarball 1, ${1}"
 	else
 		# TODO: reproducible tarballs on non-GNU systems
-- 
cgit v1.2.1