From 7b80d8415a1a6ad1d6fea781f96a340a6efff4ce Mon Sep 17 00:00:00 2001 From: Johan Gunnarsson Date: Sat, 1 Jun 2019 14:28:14 +0200 Subject: [PATCH] csv: Add header --- boards.csv | 2 ++ chips.csv | 2 ++ debians.csv | 2 ++ metascripts/rebuild-boots | 2 +- metascripts/rebuild-debians | 2 +- metascripts/rebuild-jekyll-boards | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/boards.csv b/boards.csv index 634f97f..d98ce14 100644 --- a/boards.csv +++ b/boards.csv @@ -1,3 +1,5 @@ +Board ID,Board name,Board maker,Chip ID,U-Boot defconfig,Build tuple,Boot type,Device tree + raspberrypi_2b,Raspberry Pi 2 B,Raspberry Pi Foundation,bcm2836,rpi_2_defconfig,arm-linux-gnueabihf,rpi,bcm2836-rpi-2-b raspberrypi_3b,Raspberry Pi 3 B,Raspberry Pi Foundation,bcm2837,rpi_3_defconfig,aarch64-linux-gnu,rpi,bcm2837-rpi-3-b raspberrypi_3a_plus,Raspberry Pi 3 A+,Raspberry Pi Foundation,bcm2837,rpi_3_defconfig,aarch64-linux-gnu,rpi,bcm2837-rpi-3-a-plus diff --git a/chips.csv b/chips.csv index 3214892..5e685de 100644 --- a/chips.csv +++ b/chips.csv @@ -1,3 +1,5 @@ +Chip ID,Chip name,Chip maker,CPU,CPU architecture + bcm2836,BCM2836,Broadcom,ARM Cortex A7,armv7 bcm2837,BCM2837,Broadcom,ARM Cortex A53,armv8 diff --git a/debians.csv b/debians.csv index c2d6cc4..aa6c52d 100644 --- a/debians.csv +++ b/debians.csv @@ -1,3 +1,5 @@ +OS,Dist,Arch + debian,stretch,armhf debian,stretch,arm64 diff --git a/metascripts/rebuild-boots b/metascripts/rebuild-boots index 926f3ac..dee7b64 100755 --- a/metascripts/rebuild-boots +++ b/metascripts/rebuild-boots @@ -14,7 +14,7 @@ mkdir -p /tmp/debimg/log || exit D=$(mktemp -d -p "${LOG_DIR}" rebuild-boots-XXXXXX) IFS=, -grep -vE "^#|^\s*$" boards.csv | while read BOARD_ID MODEL MAKE CHIP DEFCONFIG TUPLE TYPE DTB _ +grep -vE "^#|^\s*$" boards.csv | tail -n +2 | while read BOARD_ID MODEL MAKE CHIP DEFCONFIG TUPLE TYPE DTB _ do docker run --rm \ -v "${ARTIFACTS_DIR}":/artifacts \ diff --git a/metascripts/rebuild-debians b/metascripts/rebuild-debians index d6046af..5cbe00c 100755 --- a/metascripts/rebuild-debians +++ b/metascripts/rebuild-debians @@ -12,7 +12,7 @@ mkdir -p /tmp/debimg/log || exit D=$(mktemp -d -p "${LOG_DIR}" rebuild-debians-XXXXXX) IFS=, -grep -vE "^#|^\s*$" debians.csv | while read OS DIST ARCH _ +grep -vE "^#|^\s*$" debians.csv | tail -n +2 | while read OS DIST ARCH _ do docker run --rm \ -v "${ARTIFACTS_DIR}":/artifacts \ diff --git a/metascripts/rebuild-jekyll-boards b/metascripts/rebuild-jekyll-boards index a41363f..ad1173d 100755 --- a/metascripts/rebuild-jekyll-boards +++ b/metascripts/rebuild-jekyll-boards @@ -9,6 +9,7 @@ isa_to_arch = { } with open("chips.csv") as csvfile: chipsf = csv.reader(csvfile) + next(chipsf) for row in chipsf: if not row: continue @@ -17,6 +18,7 @@ with open("chips.csv") as csvfile: chips[row[0]] = row with open("boards.csv") as csvfile: boardsf = csv.reader(csvfile) + next(boardsf) for row in boardsf: if not row: continue