tAdd variables to allow skipping root overlay copying. - arm-sdk - os build toolkit for various embedded devices
HTML git clone https://git.parazyd.org/arm-sdk
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 994ac84e167f6906305fa8c0445ecf70bcff65b5
DIR parent adde9b80ad8ce0bed926552092915c8efaac0540
HTML Author: parazyd <parazyd@dyne.org>
Date: Mon, 15 Jun 2020 16:37:33 +0200
Add variables to allow skipping root overlay copying.
Diffstat:
M lib/helpers | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
---
DIR diff --git a/lib/helpers b/lib/helpers
t@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2017 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
t@@ -94,20 +94,27 @@ copy-kernel-config() {
$R/tmp/kernels/$device_name/${device_name}-linux/.config
}
+vars+=(skip_arm_generic_root skip_arm_device_root)
copy-root-overlay() {
fn copy-root-overlay
req=(strapdir device_name R)
ckreq || return 1
- [[ -d $R/extra/generic-root ]] && \
- notice "copying generic-root" && \
- sudo cp -rfv $R/extra/generic-root/* $strapdir
+ if [ -z "$skip_arm_generic_root" ]; then
+ if [ -d "$R/extra/generic-root" ]; then
+ notice "copying generic-root"
+ sudo cp -rfv "$R/extra/generic-root"/* "$strapdir"
+ fi
+ fi
- sudo sed -e "s/{{{BOOTFS}}}/$bootfs/" -i "$strapdir/etc/fstab"
+ if [ -z "$skip_arm_device_root" ]; then
+ if [ -d "$R/extra/$device_name" ]; then
+ notice "copyring ${device_name}-root"
+ sudo cp -rfv "$R/extra/$device_name"/* "$strapdir"
+ fi
+ fi
- [[ -d $R/extra/$device_name ]] && \
- notice "copying ${device_name}-root" && \
- sudo cp -rfv $R/extra/$device_name/* $strapdir
+ sudo sed -e "s/{{{BOOTFS}}}/$bootfs/" -i "$strapdir/etc/fstab"
return 0
}