Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37022 )
Change subject: util/release: Convert board IDs into human readable names ......................................................................
util/release: Convert board IDs into human readable names
Change-Id: Ie323112d27d228849cca7894b9ebd3f4dedd2d9a Signed-off-by: Patrick Georgi pgeorgi@google.com --- M util/release/genrelnotes 1 file changed, 31 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/37022/1
diff --git a/util/release/genrelnotes b/util/release/genrelnotes index a41e563..0990f77 100755 --- a/util/release/genrelnotes +++ b/util/release/genrelnotes @@ -201,12 +201,22 @@ local new local old
- new="$(comm -13 <(echo "$2") <(echo "$3") | sed 's/^/* /')" + new="$(comm -13 <(echo "$2") <(echo "$3"))" + old="$(comm -23 <(echo "$2") <(echo "$3"))" + + # Allow running a postprocessor, given as 4th argument over the + # resulting diff, provide context if it's old or new data + if [ -n "$4" ]; then + new=$(echo "$new" | $4 new | sort) + old=$(echo "$old" | $4 old | sort) + fi + new="$(printf "$new" | sed 's/^/* /')" + old="$(printf "$old" | sed 's/^/* /')" + if [ -n "$new" ]; then printf "Added %s $1:\n-------------------\n%s\n\n" \ "$(echo "$new" | wc -l)" "$new" >> "$LOGFILE" fi - old="$(comm -23 <(echo "$2") <(echo "$3") | sed 's/^/* /')" if [ -n "$old" ]; then printf "Removed %s $1:\n-------------------\n%s\n\n" \ "$(echo "$old" | wc -l)" "$old" >> "$LOGFILE" @@ -399,8 +409,26 @@ # Finally, get anything that was missed above get_log_dedupe "MISC" "."
+# Replace VENDOR_DEVICE from stdin with their nice names on stdout +real_mainboard_names() { + local tree_version=$1 # "old" or "new" + local git_version_var=${tree_version^^}_GIT_VERSION + local git_version=${!git_version_var} + local line + + while read line; do + local file="$(git grep -l "^[[:space:]]*config>[[:space:]]*<BOARD_${line}$" ${git_version} -- src/mainboard/*/*/Kconfig.name | sed "s,^${git_version}:,,")" + if [ -z "$file" ]; then + echo "This shouldn't happen: couldn't find Kconfig for $line" + exit 1 + fi + local vendor="$(git grep " ${git_version} -- $(echo ${file} | cut -d/ -f1-3,5) | cut -d" -f2)" + git grep -h -A1 "^[[:space:]]*config>[[:space:]]*<BOARD_${line}$" ${git_version} -- ${file} | grep " |cut -d" -f2 |sed "s,^,${vendor} ," + done +} + # Show areas that have been added or removed -show_diff "mainboards" "$mainboard_list_old" "$mainboard_list_new" +show_diff "mainboards" "$mainboard_list_old" "$mainboard_list_new" real_mainboard_names show_diff "processors" "$cpu_list_old" "$cpu_list_new" show_diff "socs" "$soc_list_old" "$soc_list_new" show_diff "northbridges" "$northbridge_list_old" "$northbridge_list_new"
Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37022 )
Change subject: util/release: Convert board IDs into human readable names ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37022 )
Change subject: util/release: Convert board IDs into human readable names ......................................................................
util/release: Convert board IDs into human readable names
Change-Id: Ie323112d27d228849cca7894b9ebd3f4dedd2d9a Signed-off-by: Patrick Georgi pgeorgi@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/37022 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Stefan Reinauer stefan.reinauer@coreboot.org --- M util/release/genrelnotes 1 file changed, 31 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved
diff --git a/util/release/genrelnotes b/util/release/genrelnotes index d48a8e9..e3af48c 100755 --- a/util/release/genrelnotes +++ b/util/release/genrelnotes @@ -202,12 +202,22 @@ local new local old
- new="$(comm -13 <(echo "$2") <(echo "$3") | sed 's/^/* /')" + new="$(comm -13 <(echo "$2") <(echo "$3"))" + old="$(comm -23 <(echo "$2") <(echo "$3"))" + + # Allow running a postprocessor, given as 4th argument over the + # resulting diff, provide context if it's old or new data + if [ -n "$4" ]; then + new=$(echo "$new" | $4 new | sort) + old=$(echo "$old" | $4 old | sort) + fi + new="$(printf "$new" | sed 's/^/* /')" + old="$(printf "$old" | sed 's/^/* /')" + if [ -n "$new" ]; then printf "Added %s $1:\n-------------------\n%s\n\n" \ "$(echo "$new" | wc -l)" "$new" >> "$LOGFILE" fi - old="$(comm -23 <(echo "$2") <(echo "$3") | sed 's/^/* /')" if [ -n "$old" ]; then printf "Removed %s $1:\n-------------------\n%s\n\n" \ "$(echo "$old" | wc -l)" "$old" >> "$LOGFILE" @@ -400,8 +410,26 @@ # Finally, get anything that was missed above get_log_dedupe "MISC" "."
+# Replace VENDOR_DEVICE from stdin with their nice names on stdout +real_mainboard_names() { + local tree_version=$1 # "old" or "new" + local git_version_var=${tree_version^^}_GIT_VERSION + local git_version=${!git_version_var} + local line + + while read line; do + local file="$(git grep -l "^[[:space:]]*config>[[:space:]]*<BOARD_${line}$" ${git_version} -- src/mainboard/*/*/Kconfig.name | sed "s,^${git_version}:,,")" + if [ -z "$file" ]; then + echo "This shouldn't happen: couldn't find Kconfig for $line" + exit 1 + fi + local vendor="$(git grep " ${git_version} -- $(echo ${file} | cut -d/ -f1-3,5) | cut -d" -f2)" + git grep -h -A1 "^[[:space:]]*config>[[:space:]]*<BOARD_${line}$" ${git_version} -- ${file} | grep " |cut -d" -f2 |sed "s,^,${vendor} ," + done +} + # Show areas that have been added or removed -show_diff "mainboards" "$mainboard_list_old" "$mainboard_list_new" +show_diff "mainboards" "$mainboard_list_old" "$mainboard_list_new" real_mainboard_names show_diff "processors" "$cpu_list_old" "$cpu_list_new" show_diff "socs" "$soc_list_old" "$soc_list_new" show_diff "northbridges" "$northbridge_list_old" "$northbridge_list_new"
-
Patrick Georgi (Code Review) -
Stefan Reinauer (Code Review)