summaryrefslogtreecommitdiff
path: root/script/update
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-04 02:36:41 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-04 02:47:25 +0100
commitda3c9bb3c5c3b1f2e6e67a3695ce39b17bf68d5b (patch)
treeb81cdd418a4906c846800a8c5094b312e74f57df /script/update
parenta05010503f9a748943033d1fc40e36625e72dcbb (diff)
merge config/ and resources/
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/update')
-rwxr-xr-xscript/update/blobs/download6
-rwxr-xr-xscript/update/blobs/extract4
-rwxr-xr-xscript/update/blobs/inject4
-rwxr-xr-xscript/update/project/repo6
-rwxr-xr-xscript/update/project/trees2
5 files changed, 11 insertions, 11 deletions
diff --git a/script/update/blobs/download b/script/update/blobs/download
index cadd0681..d0a6b9f7 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -26,14 +26,14 @@ sch5545ec_dl_url_bkup=""
sch5545ec_dl_hash=""
cbdir="coreboot/default"
-cbcfgsdir="resources/coreboot"
+cbcfgsdir="config/coreboot"
boarddir=""
blobdir="blobs"
appdir="${blobdir}/app"
_7ztest="a"
mecleaner="$(pwd)/me_cleaner/me_cleaner.py"
e6400_unpack="$(pwd)/bios_extract/dell_inspiron_1100_unpacker.py"
-me7updateparser="$(pwd)/resources/blobs/me7_update_parser.py"
+me7updateparser="$(pwd)/config/blobs/me7_update_parser.py"
kbc1126_ec_dump="$(pwd)/${cbdir}/util/kbc1126/kbc1126_ec_dump"
board=""
pfs_extract="$(pwd)/biosutilities/Dell_PFS_Extract.py"
@@ -146,7 +146,7 @@ scan_sources_config()
sch5545ec_dl_url=${2} ;;
esac
done << EOF
- $(eval "awk '${awkstr}' resources/blobs/sources")
+ $(eval "awk '${awkstr}' config/blobs/sources")
EOF
}
diff --git a/script/update/blobs/extract b/script/update/blobs/extract
index ad77abd4..10b570f1 100755
--- a/script/update/blobs/extract
+++ b/script/update/blobs/extract
@@ -12,10 +12,10 @@ board=""
vendor_rom=""
cbdir="coreboot/default"
-cbcfgsdir="resources/coreboot"
+cbcfgsdir="config/coreboot"
ifdtool="${cbdir}/util/ifdtool/ifdtool"
mecleaner="me_cleaner/me_cleaner.py"
-me7updateparser="resources/blobs/me7_update_parser.py"
+me7updateparser="config/blobs/me7_update_parser.py"
boarddir=""
diff --git a/script/update/blobs/inject b/script/update/blobs/inject
index c9c44702..53334879 100755
--- a/script/update/blobs/inject
+++ b/script/update/blobs/inject
@@ -18,7 +18,7 @@ release=""
releasearchive=""
cbdir="coreboot/default"
-cbcfgsdir="resources/coreboot"
+cbcfgsdir="config/coreboot"
ifdtool="cbutils/default/ifdtool"
cbfstool="cbutils/default/cbfstool"
nvmutil="util/nvmutil/nvm"
@@ -45,7 +45,7 @@ main()
[ $# -lt 1 ] && err "No options specified."
[ "${1}" = "listboards" ] && \
- ./build command options resources/coreboot && exit 0
+ ./build command options config/coreboot && exit 0
archive="${1}"
diff --git a/script/update/project/repo b/script/update/project/repo
index 72328b45..ba856612 100755
--- a/script/update/project/repo
+++ b/script/update/project/repo
@@ -57,7 +57,7 @@ read_config()
depend=${2} ;;
esac
done << EOF
- $(eval "awk '${awkstr}' resources/git/revisions")
+ $(eval "awk '${awkstr}' config/git/revisions")
EOF
}
@@ -92,7 +92,7 @@ clone_project()
patch_project()
{
- patchdir="resources/${name}/patches"
+ patchdir="config/${name}/patches"
for patchfile in "${PWD}/${patchdir}"/*.patch ; do
[ -f "${patchfile}" ] || continue
@@ -119,7 +119,7 @@ usage()
Usage: ./update project repo [name]
Options:
- name: Module name as specified in resources/git/revisions
+ name: Module name as specified in config/git/revisions
EOF
}
diff --git a/script/update/project/trees b/script/update/project/trees
index c4290294..2b99160c 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -48,7 +48,7 @@ main()
[ -z "${1}" ] && err "project name not specified"
project="${1}"
- cfgsdir="resources/${project}"
+ cfgsdir="config/${project}"
[ -d "${cfgsdir}" ] || err "unsupported project name"
shift 1