X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=autogen.sh;h=a360065b8b4a467c9c051f75d1ce98b57a6e1677;hp=d61418c7999d10453f4c91c7adb382e6931f84f3;hb=bf909cc9605bfd77ab60b9dfead00c92af2852d2;hpb=549126ff5628df58264f157bc3339f1c4e828823

diff --git a/autogen.sh b/autogen.sh
index d61418c..a360065 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 case "$1" in
 	config)
 		echo "Configuring..."
-		make -C config
-		config/conf Kconfig
+		pushd config
+		cmake .
+		make
+		popd
+		shift 1
+		config/conf Kconfig "$@"
 		cmake .
 	;;
 
 	compile)
 		echo "Compile time..."
 		make
-
 	;;
 
 	install)
@@ -22,26 +25,27 @@ case "$1" in
 		fi
 
 		. ./.config
+		make
 
-
-		if [ "$CONFIG_CARL9170FW_MAKE_RELEASE" = "y" ]; then
-			echo -n "Installing firmware..."
-			tmpfwfile=`mktemp`
-			cat carlfw/carl9170.fw carlfw/carl9170.dsc > $tmpfwfile
-			if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ] &&
-			   [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
+		echo -n "Installing firmware..."
+		if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
+			if [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
 				echo -n "Apply miniboot..."
-				tools/src/miniboot a $tmpfwfile minifw/miniboot.fw
+				# 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
-
-			sudo install $tmpfwfile /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
-			rm $tmpfwfile
-			echo "done."
 		fi
+
+		install -m 644 carlfw/carl9170.fw \
+			../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+		echo "done."
 	;;
 
 	*)
-		$0 config
+		$0 config "$@"
 		$0 compile
 	;;