Przeglądaj źródła

build: make device-tree arg optional in mkits.sh

mkits.sh help currently shows dtb file as optional, but generates an
invalid its file when this option is unspecified.

We're fixing this problem by removing the use of the sed command and
just including variables instead.

Signed-off-by: Mathieu Olivari <[email protected]>

SVN-Revision: 45659
Felix Fietkau 10 lat temu
rodzic
commit
a37814faa7
1 zmienionych plików z 21 dodań i 19 usunięć
  1. 21 19
      scripts/mkits.sh

+ 21 - 19
scripts/mkits.sh

@@ -55,6 +55,25 @@ fi
 
 
 ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
 ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
 
 
+# Conditionally create fdt information
+if [ -n "${DTB}" ]; then
+	FDT="
+		fdt@1 {
+			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
+			data = /incbin/(\"${DTB}\");
+			type = \"flat_dt\";
+			arch = \"${ARCH}\";
+			compression = \"none\";
+			hash@1 {
+				algo = \"crc32\";
+			};
+			hash@2 {
+				algo = \"sha1\";
+			};
+		};
+"
+fi
+
 # Create a default, fully populated DTS file
 # Create a default, fully populated DTS file
 DATA="/dts-v1/;
 DATA="/dts-v1/;
 
 
@@ -80,19 +99,8 @@ DATA="/dts-v1/;
 			};
 			};
 		};
 		};
 
 
-		fdt@1 {
-			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
-			data = /incbin/(\"${DTB}\");
-			type = \"flat_dt\";
-			arch = \"${ARCH}\";
-			compression = \"none\";
-			hash@1 {
-				algo = \"crc32\";
-			};
-			hash@2 {
-				algo = \"sha1\";
-			};
-		};
+${FDT}
+
 	};
 	};
 
 
 	configurations {
 	configurations {
@@ -105,11 +113,5 @@ DATA="/dts-v1/;
 	};
 	};
 };"
 };"
 
 
-# Conditionally strip fdt information out of tree
-if [ -z "${DTB}" ]; then
-	DATA=`echo "$DATA" | sed '/start fdt/,/end fdt/d'`
-	DATA=`echo "$DATA" | sed '/fdt/d'`
-fi
-
 # Write .its file to disk
 # Write .its file to disk
 echo "$DATA" > ${OUTPUT}
 echo "$DATA" > ${OUTPUT}