carl9170 firmware: update version to 1.9.5

[carl9170fw.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d61418c7999d10453f4c91c7adb382e6931f84f3..729041e6e537656566a9b8035f5a3aee9a4bff51 100755 (executable)
--- 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,22 +24,18 @@ 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 "Apply miniboot..."
-                               tools/src/miniboot a $tmpfwfile minifw/miniboot.fw
-                       fi
-
-                       sudo install $tmpfwfile /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
-                       rm $tmpfwfile
-                       echo "done."
+               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
                fi
+
+               sudo install -m 644 carlfw/carl9170.fw \
+                       /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+               echo "done."
        ;;
 
        *)