Attention is currently required from: Angel Pons, Felix Singer, Jason Glenesk.
Martin L Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80126?usp=email )
Change subject: util/release: Remove makefile.inc references from genrelnotes ......................................................................
util/release: Remove makefile.inc references from genrelnotes
Signed-off-by: Martin Roth gaumless@gmail.com Change-Id: Id86ebc20cf5af5b65812c3f09235d0cba86d13f2 --- M util/release/genrelnotes 1 file changed, 5 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/80126/1
diff --git a/util/release/genrelnotes b/util/release/genrelnotes index e899c3e..924563e 100755 --- a/util/release/genrelnotes +++ b/util/release/genrelnotes @@ -185,8 +185,6 @@ # up manually. version_ctrl_c() { printf "\n Cleaning up and exiting.\n" >&2 - find 'src' -name 'gnumakefile' \ - -exec rename 's/gnumakefile/Makefile.inc/' {} ; git checkout origin/main > /dev/null 2>&1 git submodule update --init --checkout > /dev/null 2>&1 rm "$LOGFILE" @@ -221,14 +219,8 @@ }
get_sloc () { - # Because cloc works on extensions, and .inc identifies as pascal, - # while we use it both for Makefile.inc and some files that are - # really C, do three passes: everything but .inc files, all .inc files - # that aren't Makefiles, all Makefile.inc, then combine them. - local base base=$(mktemp) - find src -name Makefile.inc > "${base}.mak"
cloc --progress-rate=0 --quiet \ --script-lang="Bourne Shell",bash --exclude-ext=inc \ @@ -267,9 +259,9 @@ printf "Logging directories in the old tree\n" >&2 mainboard_list_old=$(grep -h "^[[:space:]]*config>[[:space:]]*<BOARD_" src/mainboard/*/*/Kconfig.name 2>/dev/null | sed "s,^.*<BOARD_([A-Z0-9_]*)>.*$,\1," | sort) cpu_list_old=$(find_areas "src/cpu" "Kconfig" "intel/common") -soc_list_old=$(find_areas "src/soc" "Makefile.inc" "intel/common|amd/common|romstage") +soc_list_old=$(find_areas "src/soc" "Makefile.mak" "intel/common|amd/common|romstage") northbridge_list_old=$(find_areas "src/northbridge" "Kconfig" "") -sio_list_old=$(find_areas "src/superio" "Makefile.inc" "") +sio_list_old=$(find_areas "src/superio" "Makefile.mak" "") southbridge_list_old=$(find_areas "src/southbridge" "Kconfig" "")
echo "Calculating old SLOC" @@ -290,9 +282,9 @@ echo "Logging directories in the new tree." >&2 mainboard_list_new=$(grep -h "^[[:space:]]*config>[[:space:]]*<BOARD_" src/mainboard/*/*/Kconfig.name 2>/dev/null | sed "s,^.*<BOARD_([A-Z0-9_]*)>.*$,\1," | sort) cpu_list_new=$(find_areas "src/cpu" "Kconfig" "intel/common") -soc_list_new=$(find_areas "src/soc" "Makefile.inc" "intel/common|amd/common|romstage") +soc_list_new=$(find_areas "src/soc" "Makefile.mak" "intel/common|amd/common|romstage") northbridge_list_new=$(find_areas "src/northbridge" "Kconfig" "") -sio_list_new=$(find_areas "src/superio" "Makefile.inc" "") +sio_list_new=$(find_areas "src/superio" "Makefile.mak" "") southbridge_list_new=$(find_areas "src/southbridge" "Kconfig" "")
printf "Calculating new SLOC\n" @@ -472,7 +464,7 @@
# Then look at areas that are usually outside the mainboards and architectures get_log_dedupe "Build system" \ - "Makefile Makefile.inc toolchain.inc src/Kconfig src/cpu/Makefile.inc" + "Makefile Makefile.mak toolchain.mak src/Kconfig src/cpu/Makefile.mak"
get_log_dedupe "Submodules" "3rdparty util/nvidia/cbootimage"