Roll back to Houdini 6

woachk · Nov 21, 2018 · 238f081 · 238f081
1 parent f573b9a
commit 238f081
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/build.sh b/build.sh
@@ -17,19 +17,19 @@ mkdir armv7_x86
 
 # Uncompress & copy
 
-unsquashfs houdini-7_z.sfs
+unsquashfs houdini-6_z.sfs
 cp squashfs-root/houdini64 arm64_x64/
 cp squashfs-root/cpuinfo arm64_x64/
 cp squashfs-root/linker64 arm64_x64/
 rm -rf squashfs-root
 
-unsquashfs houdini-7_y.sfs
+unsquashfs houdini-6_y.sfs
 cp squashfs-root/houdini armv7_x64/
 cp squashfs-root/cpuinfo armv7_x64/
 cp squashfs-root/linker armv7_x64/
 rm -rf squashfs-root
 
-unsquashfs houdini-7_x.sfs
+unsquashfs houdini-6_x.sfs
 cp squashfs-root/houdini armv7_x86/
 cp squashfs-root/cpuinfo armv7_x86/
 cp squashfs-root/linker armv7_x86/

diff --git a/download.sh b/download.sh
@@ -7,13 +7,13 @@
 #
 
 # Houdini 6 - ARMv8 on x86_64
-#wget -O houdini-6_z.sfs http://dl.android-x86.org/houdini/6_z/houdini.sfs 
+wget -O houdini-6_z.sfs http://dl.android-x86.org/houdini/6_z/houdini.sfs 
 
 # Houdini 6 - ARMv7 on x86_64
-#wget -O houdini-6_y.sfs http://dl.android-x86.org/houdini/6_y/houdini.sfs
+wget -O houdini-6_y.sfs http://dl.android-x86.org/houdini/6_y/houdini.sfs
 
 # Houdini 6 - ARMv7 on x86_32
-#wget -O houdini-6_x.sfs http://dl.android-x86.org/houdini/6_x/houdini.sfs
+wget -O houdini-6_x.sfs http://dl.android-x86.org/houdini/6_x/houdini.sfs
 
 #
 ### Houdini 7

diff --git a/houdini.spec b/houdini.spec
@@ -1,13 +1,13 @@
 Name: houdini 
-Version: 7
+Version: 6
 Release: 1%{?dist}
 Summary: Intel ARM-on-x86 Just-In-Time Compiler 
 BuildArch: x86_64
 
 License: Intel
 
 BuildRequires: squashfs-tools 
-Source0: houdini-7.tar
+Source0: houdini-6.tar
 %description
 
 Intel ARM/ARM64-on-x64 dynamic binary translator.

diff --git a/rhbuild.sh b/rhbuild.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-mkdir -p houdini-7
-cp -r *.sfs houdini.conf build.sh install64.sh patch.sh houdini-7/
-tar cvf houdini-7.tar houdini-7
-cp houdini-7.tar $HOME/rpmbuild/SOURCES/houdini-7.tar
+mkdir -p houdini-6
+cp -r *.sfs houdini.conf build.sh install64.sh patch.sh houdini-6/
+tar cvf houdini-6.tar houdini-6
+cp houdini-6.tar $HOME/rpmbuild/SOURCES/houdini-6.tar
 rpmbuild -bb houdini.spec
-rm -rf houdini-7
-rm -rf houdini-7.tar
+rm -rf houdini-6
+rm -rf houdini-6.tar