diff options
| -rw-r--r-- | include/inject.sh | 12 | ||||
| -rw-r--r-- | include/lib.sh | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/include/inject.sh b/include/inject.sh index 6caf8500..fa6ac095 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -49,9 +49,8 @@ download() readkconfig() { x_ rm -f "$xbmktmp/cbcfg" - cbcfg="`check_defconfig "$boarddir"`" || for cbc in $cv; do - grep "$cbc" "$cbcfg" 1>>"$xbmktmp/cbcfg" 2>/dev/null || : - done + fe_ scankconfig "$boarddir/config" -type f + eval "`setcfg "$xbmktmp/cbcfg" 1`" for c in $cvchk; do @@ -63,6 +62,13 @@ readkconfig() return 1 } +scankconfig() +{ + for cbc in $cv; do + grep "$cbc" "$1" 1>>"$xbmktmp/cbcfg" 2>/dev/null || : + done +} + bootstrap() { x_ ./mk -f coreboot ${cbdir##*/} diff --git a/include/lib.sh b/include/lib.sh index e6fa7e75..530ea170 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -105,14 +105,6 @@ mk() done; : } -check_defconfig() -{ - [ -d "$1" ] || err "Target '$1' not defined." - for x in "$1"/config/*; do - [ -f "$x" ] && printf "%s\n" "$x" && return 1 - done; : -} - setvars() { _setvars="" |