-Completed transition to new ipkg method (ipkg.def), but still problem with eglibc...

[hvlinux.git] / stage3 / cis-unzip

diff --git a/stage3/cis-unzip b/stage3/cis-unzip
index d3562cf..24295b2 100755 (executable)
--- a/stage3/cis-unzip
+++ b/stage3/cis-unzip
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -6,13 +8,24 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
+
+case "${HVL_TARGET}" in
+    "x86_64")
+        UNZIP_TARGET=linux_noasm
+        ;;
+    *)
+        UNZIP_TARGET=linux
+esac
 
-cd ${LFS_TMP}/${1} &&
-make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux &&
-make prefix=/usr install &&
+cd ${LFS_TMP}/${PACKAGE}
+make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 ${UNZIP_TARGET}
+make prefix=/usr install
 ldconfig
 
-# Return last error
 exit $?