summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2016-02-22 03:01:57 +0100
committerPatrick Georgi <pgeorgi@google.com>2016-02-22 19:14:37 +0100
commita05d03322607fd04f996050c267f01a6c3cc0c1b (patch)
tree6d8f641e3c04a0991761dbe772c2b90de0b9ed87
parentf0d39c409b95c2095f84adcd0dcb9b0381e1562e (diff)
downloadcoreboot-a05d03322607fd04f996050c267f01a6c3cc0c1b.tar.xz
board-status: deal with sanitized paths
Change I9dd8e4027be21363015cd8df9918610e206afce2 replaces colons with underscores in paths, to improve compatibility of paths. This breaks any attempt to interpret the timestamp part of the tree as a timestamp, so revert the change before doing so. Change-Id: I0e82e4045120700e9b4fcc8c6e54d761068eaea3 Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: https://review.coreboot.org/13766 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rwxr-xr-xutil/board_status/to-wiki/bucketize.sh2
-rwxr-xr-xutil/board_status/to-wiki/towiki.sh9
2 files changed, 6 insertions, 5 deletions
diff --git a/util/board_status/to-wiki/bucketize.sh b/util/board_status/to-wiki/bucketize.sh
index e85fc3ef8c..78906fdd67 100755
--- a/util/board_status/to-wiki/bucketize.sh
+++ b/util/board_status/to-wiki/bucketize.sh
@@ -19,7 +19,7 @@ quarterly() {
curr=""
sort -r -k4 -t/ | while read file; do
- timestamp=`printf $file | cut -d/ -f4`
+ timestamp=`printf $file | cut -d/ -f4 | tr _ :`
new=`$1 $timestamp`
if [ "$new" != "$curr" ]; then
if [ "$curr" != "" ]; then
diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh
index 85334ef146..9cf8a3c177 100755
--- a/util/board_status/to-wiki/towiki.sh
+++ b/util/board_status/to-wiki/towiki.sh
@@ -17,9 +17,10 @@ while read line; do
for i in $rest; do
vendor_board=`echo $i | cut -d/ -f1-2`
commit=`echo $i | cut -d/ -f3`
- datetime=`echo $i | cut -d/ -f4`
+ datetime_path=`echo $i | cut -d/ -f4`
+ datetime=`echo $datetime_path | tr _ :`
datetime_human=`LC_ALL=C TZ=UTC date --date="$datetime"`
- upstream=`grep "^Upstream revision:" $vendor_board/$commit/$datetime/revision.txt |cut -d: -f2-`
+ upstream=`grep "^Upstream revision:" $vendor_board/$commit/$datetime_path/revision.txt |cut -d: -f2-`
upstream=`git log -1 --format=%H $upstream`
if ! echo "$have"| grep "^$vendor_board:" > /dev/null; then
detailed="$detailed<span id=\"$vendor_board\"></span>$nl"
@@ -28,8 +29,8 @@ while read line; do
detailed="$detailed[[Board:$vendor_board|$vendor_board]] at $datetime_human$nl"
detailed="$detailed[$CODE_GITWEB$upstream upstream tree] ($nl"
- for file in "$vendor_board/$commit/$datetime/"*; do
- if [ "$file" = "$vendor_board/$commit/$datetime/revision.txt" ]; then
+ for file in "$vendor_board/$commit/$datetime_path/"*; do
+ if [ "$file" = "$vendor_board/$commit/$datetime_path/revision.txt" ]; then
continue
fi
detailed="$detailed[$STATUS_GITWEB$file `basename $file`] $nl"