X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=autogen.sh;h=287d7a2cd476e37ae7f27c53ab8e252357588ee7;hp=56b8101642fa66c0b902bb9be30375bdda4a3f0f;hb=058f9461c8e84851f7d8207e792fa1285377e85a;hpb=bced9f962079f977b1e6d4e5f176bc9fb0dfc13f

diff --git a/autogen.sh b/autogen.sh
index 56b8101..287d7a2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 case "$1" in
 	config)
 		echo "Configuring..."
-		make -C config
+		pushd config
+		cmake .
+		make
+		popd
 		config/conf Kconfig
 		cmake .
 	;;
@@ -13,7 +16,6 @@ case "$1" in
 	compile)
 		echo "Compile time..."
 		make
-
 	;;
 
 	install)
@@ -22,15 +24,22 @@ case "$1" in
 		fi
 
 		. ./.config
+		make
 
 		echo -n "Installing firmware..."
-		if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ] &&
-		   [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
-			echo -n "Apply miniboot..."
-			tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
+		if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
+			if [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
+				echo -n "Apply miniboot..."
+				# also adds checksum
+				tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
+			else
+				echo -n "Add checksum..."
+				tools/src/checksum carlfw/carl9170.fw
+			fi
 		fi
 
-		sudo install carlfw/carl9170.fw /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+		install -m 644 carlfw/carl9170.fw \
+			../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
 		echo "done."
 	;;