Merge branch 'master' into flip-map-foreach

2019-08-18 18:00:25 +03:00
parent 29ba0a0adf 2ca09a94be
commit d80cd26ff9
1062 changed files with 25715 additions and 18328 deletions
@@ -75,9 +75,8 @@ addEntry() {

    copyToKernelsDir "$path/kernel"; kernel=$result
    copyToKernelsDir "$path/initrd"; initrd=$result
-    # XXX UGLY: maybe the system config should have a top-level "dtbs" entry?
-    dtbDir=$(readlink -m "$path/kernel/../dtbs")
-    if [ -d "$dtbDir" ]; then
+    dtbDir=$(readlink -m "$path/dtbs")
+    if [ -e "$dtbDir" ]; then
        copyToKernelsDir "$dtbDir"; dtbs=$result
    fi