aboutsummaryrefslogtreecommitdiffstats
path: root/OSX
diff options
context:
space:
mode:
Diffstat (limited to 'OSX')
-rw-r--r--OSX/README.txt84
-rwxr-xr-xOSX/heimdall.kext/Contents/Info.plist18
-rw-r--r--OSX/heimdall.kext/Contents/_CodeSignature/CodeDirectorybin0 -> 183 bytes
-rw-r--r--OSX/heimdall.kext/Contents/_CodeSignature/CodeRequirementsbin0 -> 200 bytes
-rw-r--r--OSX/heimdall.kext/Contents/_CodeSignature/CodeResources105
-rw-r--r--OSX/heimdall.kext/Contents/_CodeSignature/CodeSignaturebin0 -> 8578 bytes
-rwxr-xr-xOSX/install-kext.sh4
7 files changed, 130 insertions, 81 deletions
diff --git a/OSX/README.txt b/OSX/README.txt
index 3b33cd4..8c368b5 100644
--- a/OSX/README.txt
+++ b/OSX/README.txt
@@ -1,4 +1,4 @@
-Heimdall (c) 2010-2013 Benjamin Dobell, Glass Echidna
+Heimdall (c) 2010-2014 Benjamin Dobell, Glass Echidna
http://www.glassechidna.com.au/products/heimdall/
DISCLAIMER:
@@ -151,7 +151,7 @@ Performing a Custom Flash with Heimdall Frontend:
clicking the "Remove" button. Removing a partition from the list doesn't
remove it from your device, it simply means it will not be flashed.
- 10. Repeat steps 7-9 as often as needed to specify all the partions/files
+ 10. Repeat steps 7-9 as often as needed to specify all the partitions/files
that you wish to flash.
11. Now you can chose whether you would like to repartition your device as
@@ -477,79 +477,15 @@ be included.
-Appendix B - Installing Heimdall from Source:
+Appendix B - Installing Heimdall Suite from Source
- PREREQUISITES:
-
- Heimdall requires C++11 (aka C++0x) functionality in order to compile.
- Unfortunately, XCode includes an old version of GCC which does not
- include support for C++11. XCode does include clang, which does
- support C++11. However, clang's C++11 can only target OS X 10.7 or
- newer. There are also slight compatibility issues between clang and
- Qt, which is required in order to compile Heimdall Frontend. As such
- these instructions will utilise GCC 4.7 installed via Homebrew.
-
- Xcode can be downloaded through the App store or from Apple's
- developer website:
-
- https://developer.apple.com/xcode/
-
- Homebrew install instructions are available at:
-
- http://mxcl.github.io/homebrew/
-
- 1. First make sure you have installed XCode and Homebrew (see above). Then
- open a terminal and install GCC 4.7, pkgconfig and libusbx via Homebrew:
-
- brew tap homebrew/versions
- brew install gcc47 pkgconfig libusbx
-
- NOTE: Installing GCC 4.7 will take a long time.
+ 1. Open Terminal and install dependencies using Homebrew (http://brew.sh)
- 2. In a terminal navigate to the directory you downloaded (or extracted)
- Heimdall to.
+ brew install libusb qt5 cmake
- 3. Enter the following commands to compile libpit.
+ 2. Build Heimdall & Heimdall Frontend
- cd libpit
- ./configure CC=gcc-4.7 CXX=g++-4.7
- make
- cd ..
-
- NOTE: There is no need to run "sudo make install".
-
- 4. Enter the following commands to compile and install Heimdall:
-
- cd heimdall
- ./configure CC=gcc-4.7 CXX=g++-4.7
- make
- sudo make install
- cd ..
-
- 5. If you haven't installed the driver before, do the following:
-
- cd OSX
- sudo ./install-kext.sh
-
- 6. Done
-
-
-
-Appendix C - Installing Heimdall Frontend from Source:
-
- 1. Compile and install Heimdall, see Appendix B.
-
- 2. Heimdall Frontend requires Qt (4.7 or later, but prior to 5.0), available
- from:
-
- http://qt-project.org/downloads
-
- 3. Open a terminal and navigate to the directory you extracted Heimdall to.
-
- 4. Enter the following commands to compile and install Heimdall Frontend:
-
- cd heimdall-frontend
- qmake -spec macx-g++ QMAKE_CC=gcc-4.7 QMAKE_CXX=g++-4.7
- make
-
- 5. Done
+ mkdir build
+ cd build
+ cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DQt5Widgets_DIR=/usr/local/opt/qt5/lib/cmake/Qt5Widgets ..
+ make
diff --git a/OSX/heimdall.kext/Contents/Info.plist b/OSX/heimdall.kext/Contents/Info.plist
index 47c63c3..def713e 100755
--- a/OSX/heimdall.kext/Contents/Info.plist
+++ b/OSX/heimdall.kext/Contents/Info.plist
@@ -3,38 +3,44 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key> <string>English</string>
- <key>CFBundleGetInfoString</key> <string>Galaxy S Download Mode (Heimdall)</string>
- <key>CFBundleIdentifier</key> <string>au.com.glassechidna.heimdall_usb_shield</string>
+ <key>CFBundleGetInfoString</key> <string>Heimdall Download Mode</string>
+ <key>CFBundleIdentifier</key> <string>au.com.glassechidna.heimdall.usb_shield</string>
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
- <key>CFBundleName</key> <string>Galaxy S Download Mode (Heimdall)</string>
+ <key>CFBundleName</key> <string>Heimdall Download Mode</string>
<key>CFBundlePackageType</key> <string>KEXT</string>
<key>CFBundleSignature</key> <string>????</string>
<key>CFBundleVersion</key> <string>6.0</string>
<key>IOKitPersonalities</key>
<dict>
- <key>GalaxyS</key>
+ <key>0x6001</key>
<dict>
<key>CFBundleIdentifier</key> <string>com.apple.driver.AppleUSBComposite</string>
<key>IOClass</key> <string>AppleUSBComposite</string>
+ <key>IOProbeScore</key> <integer>300000</integer>
<key>IOProviderClass</key> <string>IOUSBDevice</string>
<key>idVendor</key> <integer>1256</integer>
<key>idProduct</key> <integer>26113</integer>
+ <key>bcdDevice</key> <integer>256</integer>
</dict>
- <key>GalaxyS2</key>
+ <key>0x685D</key>
<dict>
<key>CFBundleIdentifier</key> <string>com.apple.driver.AppleUSBComposite</string>
<key>IOClass</key> <string>AppleUSBComposite</string>
+ <key>IOProbeScore</key> <integer>300000</integer>
<key>IOProviderClass</key> <string>IOUSBDevice</string>
<key>idVendor</key> <integer>1256</integer>
<key>idProduct</key> <integer>26717</integer>
+ <key>bcdDevice</key> <integer>256</integer>
</dict>
- <key>DroidCharge</key>
+ <key>0x68C3</key>
<dict>
<key>CFBundleIdentifier</key> <string>com.apple.driver.AppleUSBComposite</string>
<key>IOClass</key> <string>AppleUSBComposite</string>
+ <key>IOProbeScore</key> <integer>300000</integer>
<key>IOProviderClass</key> <string>IOUSBDevice</string>
<key>idVendor</key> <integer>1256</integer>
<key>idProduct</key> <integer>26819</integer>
+ <key>bcdDevice</key> <integer>256</integer>
</dict>
</dict>
<key>OSBundleCompatibleVersion</key> <string>1.8</string>
diff --git a/OSX/heimdall.kext/Contents/_CodeSignature/CodeDirectory b/OSX/heimdall.kext/Contents/_CodeSignature/CodeDirectory
new file mode 100644
index 0000000..6b80ad8
--- /dev/null
+++ b/OSX/heimdall.kext/Contents/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/OSX/heimdall.kext/Contents/_CodeSignature/CodeRequirements b/OSX/heimdall.kext/Contents/_CodeSignature/CodeRequirements
new file mode 100644
index 0000000..e264e6c
--- /dev/null
+++ b/OSX/heimdall.kext/Contents/_CodeSignature/CodeRequirements
Binary files differ
diff --git a/OSX/heimdall.kext/Contents/_CodeSignature/CodeResources b/OSX/heimdall.kext/Contents/_CodeSignature/CodeResources
new file mode 100644
index 0000000..0710b40
--- /dev/null
+++ b/OSX/heimdall.kext/Contents/_CodeSignature/CodeResources
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>files</key>
+ <dict/>
+ <key>files2</key>
+ <dict/>
+ <key>rules</key>
+ <dict>
+ <key>^Resources/</key>
+ <true/>
+ <key>^Resources/.*\.lproj/</key>
+ <dict>
+ <key>optional</key>
+ <true/>
+ <key>weight</key>
+ <real>1000</real>
+ </dict>
+ <key>^Resources/.*\.lproj/locversion.plist$</key>
+ <dict>
+ <key>omit</key>
+ <true/>
+ <key>weight</key>
+ <real>1100</real>
+ </dict>
+ <key>^version.plist$</key>
+ <true/>
+ </dict>
+ <key>rules2</key>
+ <dict>
+ <key>.*\.dSYM($|/)</key>
+ <dict>
+ <key>weight</key>
+ <real>11</real>
+ </dict>
+ <key>^(.*/)?\.DS_Store$</key>
+ <dict>
+ <key>omit</key>
+ <true/>
+ <key>weight</key>
+ <real>2000</real>
+ </dict>
+ <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+ <dict>
+ <key>nested</key>
+ <true/>
+ <key>weight</key>
+ <real>10</real>
+ </dict>
+ <key>^.*</key>
+ <true/>
+ <key>^Info\.plist$</key>
+ <dict>
+ <key>omit</key>
+ <true/>
+ <key>weight</key>
+ <real>20</real>
+ </dict>
+ <key>^PkgInfo$</key>
+ <dict>
+ <key>omit</key>
+ <true/>
+ <key>weight</key>
+ <real>20</real>
+ </dict>
+ <key>^Resources/</key>
+ <dict>
+ <key>weight</key>
+ <real>20</real>
+ </dict>
+ <key>^Resources/.*\.lproj/</key>
+ <dict>
+ <key>optional</key>
+ <true/>
+ <key>weight</key>
+ <real>1000</real>
+ </dict>
+ <key>^Resources/.*\.lproj/locversion.plist$</key>
+ <dict>
+ <key>omit</key>
+ <true/>
+ <key>weight</key>
+ <real>1100</real>
+ </dict>
+ <key>^[^/]+$</key>
+ <dict>
+ <key>nested</key>
+ <true/>
+ <key>weight</key>
+ <real>10</real>
+ </dict>
+ <key>^embedded\.provisionprofile$</key>
+ <dict>
+ <key>weight</key>
+ <real>20</real>
+ </dict>
+ <key>^version\.plist$</key>
+ <dict>
+ <key>weight</key>
+ <real>20</real>
+ </dict>
+ </dict>
+</dict>
+</plist>
diff --git a/OSX/heimdall.kext/Contents/_CodeSignature/CodeSignature b/OSX/heimdall.kext/Contents/_CodeSignature/CodeSignature
new file mode 100644
index 0000000..ce34d55
--- /dev/null
+++ b/OSX/heimdall.kext/Contents/_CodeSignature/CodeSignature
Binary files differ
diff --git a/OSX/install-kext.sh b/OSX/install-kext.sh
index 4379aec..3eaed99 100755
--- a/OSX/install-kext.sh
+++ b/OSX/install-kext.sh
@@ -1,5 +1,7 @@
+#!/bin/bash
+BASEDIR=$(dirname $0)
echo 'Installing Driver...'
-sudo cp -R heimdall.kext /System/Library/Extensions
+sudo cp -R "$BASEDIR/heimdall.kext" /System/Library/Extensions
sudo chmod -R 755 /System/Library/Extensions/heimdall.kext
sudo chown -R root:wheel /System/Library/Extensions/heimdall.kext
sudo kextload /System/Library/Extensions/heimdall.kext