CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after 32387e00

[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / process_files.sh

diff --git a/CryptoPkg/Library/OpensslLib/process_files.sh b/CryptoPkg/Library/OpensslLib/process_files.sh
index bb33c8ae3f5b2845e5265bb78310dc14f35d604e..6f069ce264ac07a1095e75987aaae8808546d534 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.sh
+++ b/CryptoPkg/Library/OpensslLib/process_files.sh
@@ -42,7 +42,6 @@ fi
        no-locking \
        no-mdc2 \
        no-posix-io \
-       no-pqueue \
        no-rc2 \
        no-rcs \
        no-rfc3779 \
@@ -77,13 +76,11 @@ function filelist ()
                ;;
            LIBSRC=*)
                LIBSRC=$(echo "$LINE" | sed s/^LIBSRC=//)
-               if [ "$RELATIVE_DIRECTORY" != "ssl" ]; then
-                   for FILE in $LIBSRC; do
+               for FILE in $LIBSRC; do
                        if [ "$FILE" != "b_print.c" ]; then
                            echo -e '  $(OPENSSL_PATH)/'$RELATIVE_DIRECTORY/$FILE\\r\\
                        fi
-                   done
-               fi
+               done
                ;;
        esac
     done
@@ -93,5 +90,6 @@ function filelist ()
 filelist < "${OPENSSL_PATH}/MINFO" |  sed -n -f - -i OpensslLib.inf
 
 # We can tell Windows users to put this back manually if they can't run
-# Configure.
-cp "${OPENSSL_PATH}/crypto/opensslconf.h" .
+# Configure. For now, until the git repository is fixed to store things
+# sanely, also convert to DOS line-endings
+unix2dos -n "${OPENSSL_PATH}/crypto/opensslconf.h" opensslconf.h