Skip to contentSkip to conversation

board/liteboard: drop custom post-image script

PATCH New Marcin Niestroj 2 participants 3 messages Mar 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 board/liteboard: drop custom post-image script

Instead use generic genimage.sh script.

---
 board/grinn/liteboard/post-image.sh | 14 --------------
 configs/grinn_liteboard_defconfig   |  3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100755 board/grinn/liteboard/post-image.sh
board/grinn/liteboard/post-image.sh deleted +0 -14
deleted file mode 100755
index 1a076eecb8..0000000000
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage \
-    --rootpath "${TARGET_DIR}" \
-    --tmppath "${GENIMAGE_TMP}" \
-    --inputpath "${BINARIES_DIR}" \
-    --outputpath "${BINARIES_DIR}" \
-    --config "${GENIMAGE_CFG}"
configs/grinn_liteboard_defconfig +2 -1
index d48dfde715..58f2a6b40d 100644
@@ -2,7 +2,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.23"
Signature · 1 line
2.25.0
#1 lore raw

PATCH 2/2 board/liteboard: bump U-Boot to 2020.01

---
 configs/grinn_liteboard_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/grinn_liteboard_defconfig +1 -1
index 58f2a6b40d..6cee075006 100644
@@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
Signature · 1 line
2.25.0
#2 lore raw

PATCH 1/2 board/liteboard: drop custom post-image script

In reply to Marcin Niestroj

Marcin, All,

On 2020-03-20 16:45 +0100, Marcin Niestroj spake thusly:

Quoted 4 lines

Instead use generic genimage.sh script.

Both applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 47 lines
---
 board/grinn/liteboard/post-image.sh | 14 --------------
 configs/grinn_liteboard_defconfig   |  3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100755 board/grinn/liteboard/post-image.sh
board/grinn/liteboard/post-image.sh deleted +0 -14
deleted file mode 100755
index 1a076eecb8..0000000000
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage \
-    --rootpath "${TARGET_DIR}" \
-    --tmppath "${GENIMAGE_TMP}" \
-    --inputpath "${BINARIES_DIR}" \
-    --outputpath "${BINARIES_DIR}" \
-    --config "${GENIMAGE_CFG}"
configs/grinn_liteboard_defconfig +2 -1
index d48dfde715..58f2a6b40d 100644
@@ -2,7 +2,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.23"
Signature · 6 lines
2.25.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'