Skip to content

Commit

Permalink
Make winrpm.sh preserve paths when extracting downloaded cpio
Browse files Browse the repository at this point in the history
[av skip]
  • Loading branch information
tkelman committed Jun 13, 2015
1 parent cb77276 commit f3a6461
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -537,15 +537,17 @@ 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 && \
7z x -y 7z920-x64.msi _7z.exe _7z.dll && \
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
Expand Down
2 changes: 1 addition & 1 deletion contrib/windows/winrpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f3a6461

Please sign in to comment.