From f3a6461215ba2f8ce4a7ace7923503aa6f8f6ecb Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Sat, 13 Jun 2015 09:45:17 -0700 Subject: [PATCH] Make winrpm.sh preserve paths when extracting downloaded cpio [av skip] --- Makefile | 6 ++++-- contrib/windows/winrpm.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e5a7fe8eb85a6..8d6b01678038d 100644 --- a/Makefile +++ b/Makefile @@ -537,7 +537,8 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686)) $(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z920.exe && \ 7z x -y 7z920.exe 7z.exe 7z.dll && \ ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1 \ - "mingw32-libexpat1 mingw32-zlib1" + "mingw32-libexpat1 mingw32-zlib1" && \ + cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll . else ifeq ($(ARCH),x86_64) cd dist-extras && \ $(JLDOWNLOAD) 7z920-x64.msi http://downloads.sourceforge.net/sevenzip/7z920-x64.msi && \ @@ -545,7 +546,8 @@ else ifeq ($(ARCH),x86_64) mv _7z.dll 7z.dll && \ mv _7z.exe 7z.exe && \ ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1 \ - "mingw64-libexpat1 mingw64-zlib1" + "mingw64-libexpat1 mingw64-zlib1" && \ + cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll . else $(error no win-extras target for ARCH=$(ARCH)) endif diff --git a/contrib/windows/winrpm.sh b/contrib/windows/winrpm.sh index b383c4465db93..82aab3681088a 100755 --- a/contrib/windows/winrpm.sh +++ b/contrib/windows/winrpm.sh @@ -90,7 +90,7 @@ for i in $toinstall; do 7z x -y $href cpiofile=$(basename $href | sed 's/.rpm$/.cpio/') rm $href - 7z e -y $cpiofile + 7z x -y $cpiofile rm $cpiofile done rmdir --ignore-fail-on-non-empty noarch