Completed transition to new ipkg method (ipkg.def), successfully booting after stage 1

[hvlinux.git] / functions-ac

diff --git a/functions-ac b/functions-ac
index d4b3fbf..618c47f 100644 (file)
--- a/functions-ac
+++ b/functions-ac
@@ -11,8 +11,8 @@ function_exists()
     return $?
 }
 
-unset -f hvconfig_cache
 unset -f hvconfig_pre
+unset -f hvconfig_cache
 unset -f hvconfig_post
 unset -f hvbuild_post
 
@@ -44,9 +44,6 @@ ipkg_decompress_package()
 # Default configure function
 hvconfig()
 {
-    echo "Running configure with options:"
-    echo "  <${CONFIGURE_OPTS}>"
-
     if [ "x${IPKG_MODE}" = "xacnb" ]; then
         # Broken autoconf package that must build in source dir
         cd ${LFS_TMP}/${PACKAGE}
@@ -113,19 +110,22 @@ ipkg_script()
 
     hvpatch
 
+    # Execute pre-configure function if applicable
+    if function_exists hvconfig_pre ; then
+        echo "Running configure pre-script"
+        hvconfig_pre
+    fi
+
     # Execute config-cache function if applicable
     if function_exists hvconfig_cache ; then
         echo "Running configure cache script"
         hvconfig_cache
-
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache"
+        CONFIGURE_OPTS="\
+            ${CONFIGURE_OPTS} \
+            --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache"
     fi
 
-    # Execute pre-configure function if applicable
-    if function_exists hvconfig_pre ; then
-        echo "Running configure pre-script"
-        hvconfig_pre
-    fi
+    ipkg_display_build_infos
 
     if [ "x${IPKG_MODE}" = "xnoac" ]; then
         echo "Not calling configure because ${PACKAGE} has no configure script"
@@ -146,4 +146,6 @@ ipkg_script()
         echo "Running build post-script"
         hvbuild_post
     fi
+
+    ipkg_finish
 }