Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make output of fetch-macOS-v2 more clear. #243

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OpenCore/config.plist
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@
<key>PasswordSalt</key>
<data></data>
<key>ScanPolicy</key>
<integer>0</integer>
<integer>17761027</integer>
<key>SecureBootModel</key>
<string>Disabled</string>
<key>Vault</key>
Expand Down Expand Up @@ -1795,7 +1795,7 @@
<key>ReplaceTabWithSpace</key>
<false/>
<key>Resolution</key>
<string>1344x840@32</string>
<string>1920x1080@32</string>
<key>SanitiseClearScreen</key>
<false/>
<key>TextRenderer</key>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ processors work just fine (even for macOS Sonoma).
```
sudo apt-get install qemu uml-utilities virt-manager git \
wget libguestfs-tools p7zip-full make dmg2img tesseract-ocr \
tesseract-ocr-eng genisoimage -y
tesseract-ocr-eng genisoimage vim net-tools screen -y
```

This step may need to be adapted for your Linux distribution.
Expand Down
12 changes: 6 additions & 6 deletions fetch-macOS-v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,17 @@ def save_image(url, sess, filename='', directory=''):
if filename.find('/') >= 0 or filename == '':
raise RuntimeError('Invalid save path ' + filename)

print(f'Saving {url} to {directory}/{filename}...')
print(f'\nSaving {url} to {directory}/{filename}...')

with open(os.path.join(directory, filename), 'wb') as fh:
response = run_query(url, headers, raw=True)
total_size = int(response.headers['content-length']) / float(2 ** 20)
# print(total_size)
if total_size < 1:
total_size = response.headers['content-length']
print("Note: The total download size is %s bytes" % total_size)
print("\nNote: The total download size is %s bytes" % total_size)
else:
print("Note: The total download size is %0.2f MB" % total_size)
print("\nNote: The total download size is %0.2f MB" % total_size)
size = 0
while True:
chunk = response.read(2**20)
Expand All @@ -241,13 +241,13 @@ def save_image(url, sess, filename='', directory=''):
size += len(chunk)
print(f'\r{size / (2**20)} MBs downloaded...', end='')
sys.stdout.flush()
print('\rDownload complete!\t\t\t\t\t')
print('\rDownload complete!' + ' ' * 20)

return os.path.join(directory, os.path.basename(filename))


def verify_image(dmgpath, cnkpath):
print('Verifying image with chunklist...')
print('\nVerifying image with chunklist...')

with open(dmgpath, 'rb') as dmgf:
cnkcount = 0
Expand Down Expand Up @@ -297,7 +297,7 @@ def action_download(args):
info = get_image_info(session, bid=args.board_id, mlb=args.mlb, diag=args.diagnostics, os_type=args.os_type)
if args.verbose:
print(info)
print(f'Downloading {info[INFO_PRODUCT]}...')
print(f'\nDownloading {info[INFO_PRODUCT]}...')
dmgname = '' if args.basename == '' else args.basename + '.dmg'
dmgpath = save_image(info[INFO_IMAGE_LINK], info[INFO_IMAGE_SESS], dmgname, args.outdir)
cnkname = '' if args.basename == '' else args.basename + '.chunklist'
Expand Down
7 changes: 4 additions & 3 deletions notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ These steps will need to be adapted for your particular setup. A host machine
with IOMMU support is required. Consult [this Arch Wiki article](https://wiki.archlinux.org/title/PCI_passthrough_via_OVMF)
for general-purpose guidance and details.

I am running Ubuntu 20.04.2 LTS on Intel i5-6500 + ASUS Z170-AR motherboard +
AMD RX 570 GPU (May 2021).
I am running Ubuntu 22.04.4 LTS on Intel i5-6500 + ASUS Z170-AR motherboard +
AMD RX 6600 GPU (April 2024).

- Blacklist the required kernel modules.

Expand Down Expand Up @@ -213,7 +213,8 @@ to dump the AMD GPU bios, and pass on to QEMU. This is especially required if
your AMD GPU is not starting up properly (resulting in "no signal" on the
monitor).

Tested GPUs: ZOTAC GeForce GT 710 DDR3 (<= Big Sur), Sapphire Radeon RX 570.
Tested GPUs: Sapphire AMD RX 6600 (RECOMMENDED!), ZOTAC GeForce GT 710 DDR3 (<=
Big Sur), Sapphire Radeon RX 570.

UPDATE: Project sponsors get access to the `Private OSX-KVM repository`, and
direct support. This private repository has a playbook to automate 95% of this
Expand Down