From eb9d06304049ca03e4d00c81b43fb996d8424a1f Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 8 Apr 2023 03:14:48 +0100
Subject: add ich9utils back to utils

don't download it. keep it in lbmk.

libreboot moved to codeberg for git hosting,
and i didn't want to keep lugging around an
extra git repo just for one tiny project.
---
 resources/git/revisions                   |  6 ------
 resources/scripts/build/clean/ich9utils   |  6 +-----
 resources/scripts/build/descriptors/ich9m | 16 ++++------------
 resources/scripts/build/module/ich9utils  | 10 +---------
 resources/scripts/build/release/src       |  3 ++-
 resources/scripts/download/ich9utils      | 25 -------------------------
 6 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100755 resources/scripts/download/ich9utils

(limited to 'resources')

diff --git a/resources/git/revisions b/resources/git/revisions
index 34cc322d..21d75089 100644
--- a/resources/git/revisions
+++ b/resources/git/revisions
@@ -19,12 +19,6 @@
 	url: git://git.sv.gnu.org/gnulib 
 }
 
-{ich9utils}{
-	rev: 53749b0c6f7c5778bdd1ec2b91cd230626752579
-	loc: ich9utils
-	url: https://notabug.org/libreboot/ich9utils.git
-}
-
 {me_cleaner}{
 	rev: 43612a630c79f3bc6f2653bfe90dfe0b7b137e08
 	loc: me_cleaner
diff --git a/resources/scripts/build/clean/ich9utils b/resources/scripts/build/clean/ich9utils
index 72f5895d..e3324586 100755
--- a/resources/scripts/build/clean/ich9utils
+++ b/resources/scripts/build/clean/ich9utils
@@ -27,13 +27,9 @@ set -u -e
 # clean ich9deblob utility
 # --------------------------------------------------------------------
 
-if [ ! -d ich9utils ]; then
-	exit 0
-fi
-
 printf "Cleaning the previous build of ich9utils\n"
 (
-cd "ich9utils/"
+cd "util/ich9utils/"
 make clean
 )
 rm -Rf descriptors/
diff --git a/resources/scripts/build/descriptors/ich9m b/resources/scripts/build/descriptors/ich9m
index c22812b1..9f4cce6c 100755
--- a/resources/scripts/build/descriptors/ich9m
+++ b/resources/scripts/build/descriptors/ich9m
@@ -22,22 +22,14 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-if [ ! -d ich9utils ]; then
-	./download ich9utils
-fi
-if [ ! -d ich9utils ]; then
-	printf "build/descriptors/ich9m: no ich9utils directory. Exiting\n"
-	exit 1
-fi
-
-if [ ! -f "ich9utils/ich9gen" ]; then
+if [ ! -f "util/ich9utils/ich9gen" ]; then
     (
-    cd ich9utils/
+    cd util/ich9utils/
     make clean
     make -j$(nproc)
     )
 fi
-if [ ! -f "ich9utils/ich9gen" ]; then
+if [ ! -f "util/ich9utils/ich9gen" ]; then
 	printf "build/descriptors/ich9m: ich9gen wasn't compiled. Exiting\n"
 	exit 1
 fi
@@ -48,5 +40,5 @@ rm -f descriptors/ich9m/*
 
 (
     cd descriptors/ich9m/
-    ../../ich9utils/ich9gen
+    ../../util/ich9utils/ich9gen
 )
diff --git a/resources/scripts/build/module/ich9utils b/resources/scripts/build/module/ich9utils
index b00e0a7d..925ed855 100755
--- a/resources/scripts/build/module/ich9utils
+++ b/resources/scripts/build/module/ich9utils
@@ -24,17 +24,9 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-if [ ! -d ich9utils ]; then
-	./download ich9utils
-fi
-if [ ! -d ich9utils ]; then
-	printf "build/module/ich9utils: ich9utils not found. Exiting\n"
-	exit 1
-fi
-
 printf "Build ich9utils\n"
 (
-cd "ich9utils/"
+cd "util/ich9utils/"
 make -j$(nproc)
 )
 printf "\n\n"
diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src
index 9908f28e..7538c5ba 100755
--- a/resources/scripts/build/release/src
+++ b/resources/scripts/build/release/src
@@ -53,7 +53,7 @@ mkdir -p "${srcdir}/"
 
 printf "%s" "${version}" > "${srcdir}"/version
 
-modlist="coreboot flashrom grub memtest86plus seabios ich9utils me_cleaner u-boot"
+modlist="coreboot flashrom grub memtest86plus seabios me_cleaner u-boot"
 dirlist="resources util" # do not add blobs directory here. it is handled below
 filelist="blobutil modify download build README.md COPYING Makefile update version versiondate projectname .gitcheck"
 
@@ -104,6 +104,7 @@ done
     cd "${srcdir}/"
     ./build clean all
     make clean -BC util/nvmutil
+    make clean -BC util/ich9utils
 
     rm -Rf coreboot/coreboot/
     rm -Rf .git .gitignore */.git* coreboot/*/.git* coreboot/*/3rdparty/*/.git*
diff --git a/resources/scripts/download/ich9utils b/resources/scripts/download/ich9utils
deleted file mode 100755
index 3f764e72..00000000
--- a/resources/scripts/download/ich9utils
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env sh
-
-#  helper script: downloads ich9utils
-#
-#	Copyright (C) 2021 Leah Rowe <info@minifree.org>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-printf "Downloading ich9utils\n"
-./gitclone ich9utils
-- 
cgit v1.2.1