From 4e39d5a5a808b0d59c6fb3426e1d9bc0195d6b08 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 6 Oct 2023 22:59:36 +0100
Subject: put all src downloads under src/

build/release/src was partly re-written to accomodate this

memtest86plus was patched to have a central Makefile, and
lbmk modified to use that, rather than mess with build32
and build64. the central Makefile just builds both targets
or cleans both targets

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/update/project/build | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'script/update/project/build')

diff --git a/script/update/project/build b/script/update/project/build
index 2c6eff97..69c11105 100755
--- a/script/update/project/build
+++ b/script/update/project/build
@@ -33,7 +33,7 @@ main()
 		-x) mode="crossgcc-clean" ;;
 		*) err "Invalid option" ;;
 		esac
-		shift; project="${OPTARG}"; shift
+		shift; project="${OPTARG#src/}"; shift
 	done
 	[ -z ${_f} ] && err "flag not specified (-m, -u, -b, -c or -x)"
 	[ -z ${project} ] && err "project name not specified"
@@ -48,15 +48,13 @@ main()
 build_projects()
 {
 	[ $# -gt 0 ] && x_ ./update project build ${_f} ${@}
-	codedir="${project}"
+	codedir="src/${project}"
 
-	[ -d "${codedir}" ] || x_ ./update project repo "${codedir%/*}"
-	[ -d "${codedir}" ] || \
-		err "build_targets: ${codedir%/*} not downloaded"
+	[ -d "${codedir}" ] || x_ ./update project repo "${project}"
 
 	if [ "${project}" = "uefitool" ]; then
 	(
-		x_ cd uefitool
+		x_ cd src/uefitool
 		cmake UEFIExtract/ || [ -f Makefile ] || \
 		    err "build_targets: !cmake UEFIExtract/"
 	)
@@ -138,7 +136,7 @@ handle_src_tree()
 	[ -z ${arch} ] && \
 		err "handle_src_tree: ${target_dir}: undefined cpu type"
 
-	codedir="${project}/${tree}"
+	codedir="src/${project}/${tree}"
 	if [ ! -d "${codedir}" ]; then
 		if [ "${mode}" = "distclean" ] || \
 		    [ "${mode}" = "crossgcc-clean" ]; then
@@ -171,13 +169,14 @@ check_cross_compiler()
 	[ "${crossgcc_ada}" != "y" ] && \
 		export BUILD_LANGUAGES=c
 
-	cbdir="coreboot/${tree}"
+	cbdir="src/coreboot/${tree}"
 	[ "${project}" != "coreboot" ] && \
-		cbdir="coreboot/default" # not u-boot (e.g. linux will use it)
+		cbdir="src/coreboot/default" # not u-boot (e.g. linux)
 	[ "${project}" = "u-boot" ] && \
-		cbdir="coreboot/cros" # u-boot only used on coreboot/cros
+		cbdir="src/coreboot/cros" # u-boot only used on coreboot/cros
+
 	# only true if not building coreboot:
-	ctarget="${cbdir#coreboot/}"
+	ctarget="${cbdir#src/coreboot/}"
 	[ -d "${cbdir}" ] || \
 		x_ ./update project trees coreboot ${ctarget}
 
-- 
cgit v1.2.1