amass/Docker-OSX
1
0
Fork 0
mirror of https://github.com/sickcodes/Docker-OSX.git synced 2024-11-26 04:01:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove cmd to install kernel in pod runtime as it has been migrated to Dockerfile

Browse Source
This commit is contained in:
peter 2021-01-23 20:40:47 -08:00
parent 5561b08e6a
commit 2567054805
2 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
helm/templates/configmap.yaml
View File

@ -377,8 +377,8 @@ data:
<key>PlistPath</key> <key>PlistPath</key>
<string>Contents/Info.plist</string> <string>Contents/Info.plist</string>
</dict> </dict>
{{- if .Values.kexts.add }} {{- if .Values.macos.kexts.add }}
{{- range .Values.kexts.kextsToAdd }} {{- range .Values.macos.kexts.kextsToAdd }}
<dict> <dict>
<key>Arch</key> <key>Arch</key>
<string>Any</string> <string>Any</string>
@ -744,7 +744,7 @@ data:
<key>TakeoffDelay</key> <key>TakeoffDelay</key>
<integer>0</integer> <integer>0</integer>
<key>Timeout</key> <key>Timeout</key>
<integer>{{ .Values.openCore.boot.timeout }}</integer> <integer>{{ .Values.macos.openCore.boot.timeout }}</integer>
</dict> </dict>
<key>Debug</key> <key>Debug</key>
<dict> <dict>
@ -851,7 +851,7 @@ data:
<key>SystemAudioVolume</key> <key>SystemAudioVolume</key>
<data>Rg==</data> <data>Rg==</data>
<key>boot-args</key> <key>boot-args</key>
<string>{{ .Values.configPlist.bootArgs }}</string> <string>{{ .Values.macos.configPlist.bootArgs }}</string>
<key>run-efi-updater</key> <key>run-efi-updater</key>
<string>No</string> <string>No</string>
<key>csr-active-config</key> <key>csr-active-config</key>
@ -918,7 +918,7 @@ data:
<key>AdviseWindows</key> <key>AdviseWindows</key>
<false/> <false/>
<key>MLB</key> <key>MLB</key>
<string>{{ .Values.configPlist.MLB }}</string> <string>{{ .Values.macos.configPlist.MLB }}</string>
<key>ROM</key> <key>ROM</key>
<data> <data>
m7zhIYfl m7zhIYfl
@ -926,11 +926,11 @@ data:
<key>SpoofVendor</key> <key>SpoofVendor</key>
<true/> <true/>
<key>SystemProductName</key> <key>SystemProductName</key>
<string>{{ .Values.configPlist.SystemProductName }}</string> <string>{{ .Values.macos.configPlist.SystemProductName }}</string>
<key>SystemSerialNumber</key> <key>SystemSerialNumber</key>
<string>{{ .Values.configPlist.SystemSerialNumber }}</string> <string>{{ .Values.macos.configPlist.SystemSerialNumber }}</string>
<key>SystemUUID</key> <key>SystemUUID</key>
<string>{{ .Values.configPlist.SystemUUID }}</string> <string>{{ .Values.macos.configPlist.SystemUUID }}</string>
</dict> </dict>
<key>UpdateDataHub</key> <key>UpdateDataHub</key>
<true/> <true/>
@ -1103,21 +1103,20 @@ data:
#/bin/sh #/bin/sh
# Add extra kexts to EFI/OC/kexts # Add extra kexts to EFI/OC/kexts
{{- if .Values.kexts.add }} {{- if .Values.macos.kexts.add }}
{{- range .Values.kexts.kextsToAdd }} {{- range .Values.macos.kexts.kextsToAdd }}
{{- $rangeItem := . -}} {{- $rangeItem := . -}}
{{- with $ }} {{- with $ }}
echo 'Installing kext {{ $rangeItem.name }}..' echo 'Installing kext {{ $rangeItem.name }}..'
cp -r "{{ .Values.kexts.path }}/{{ $rangeItem.name }}" /home/{{ .Values.image.userName }}/OSX-KVM/OpenCore-Catalina/EFI/OC/Kexts/ cp -r "{{ .Values.macos.kexts.path }}/{{ $rangeItem.name }}" /home/{{ .Values.image.userName }}/OSX-KVM/OpenCore-Catalina/EFI/OC/Kexts/
sudo chmod 755 /home/{{ .Values.image.userName }}/OSX-KVM/OpenCore-Catalina/EFI/OC/Kexts/{{ $rangeItem.name }} sudo chmod 755 /home/{{ .Values.image.userName }}/OSX-KVM/OpenCore-Catalina/EFI/OC/Kexts/{{ $rangeItem.name }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
# Rebuild Opencore.qcow2 after making changes to config.plist and etc.. # Rebuild Opencore.qcow2 after making changes to config.plist and etc..
{{- if .Values.openCore.rebuild }} {{- if .Values.macos.openCore.rebuild }}
echo 'Building new Opencore.qcow2..' echo 'Building new Opencore.qcow2..'
sudo apt install {{ .Values.openCore.kernel }} -y
pushd OpenCore-Catalina/ pushd OpenCore-Catalina/
mkdir -p EFI/OC/Resources mkdir -p EFI/OC/Resources
rm -f OpenCore.qcow2 rm -f OpenCore.qcow2
@ -1128,8 +1127,8 @@ data:
popd popd
{{- end }} {{- end }}
if ! [ -d "{{ .Values.qemu.systemInstaller.path }}" ]; then if ! [ -d "{{ .Values.macos.installerSettings.path }}" ]; then
mkdir -p {{ .Values.qemu.systemInstaller.path }} mkdir -p {{ .Values.macos.installerSettings.path }}
fi fi
if ! [ -d "/system_image/{{ .Values.serverName }}" ]; then if ! [ -d "/system_image/{{ .Values.serverName }}" ]; then
@ -1137,11 +1136,11 @@ data:
fi fi
# Download and build installer image if no system drive found.. # Download and build installer image if no system drive found..
if ! [ -f "{{ .Values.qemu.systemInstaller.path }}/BaseSystem{{ .Values.qemu.systemInstaller.version }}.img" ]; then if ! [ -f "{{ .Values.macos.installerSettings.path }}/BaseSystem{{ .Values.macos.installerSettings.version }}.img" ]; then
echo "Downloading {{ .Values.qemu.systemInstaller.version }} base image.." echo "Downloading {{ .Values.macos.installerSettings.version }} base image.."
python fetch-macOS.py --version {{ .Values.qemu.systemInstaller.version }} python fetch-macOS.py --version {{ .Values.macos.installerSettings.version }}
echo 'Converting downloaded BaseSystem.dmg into BaseSystem{{ .Values.qemu.systemInstaller.version }}.img and saving in {{ .Values.qemu.systemInstaller.path }}' echo 'Converting downloaded BaseSystem.dmg into BaseSystem{{ .Values.macos.installerSettings.version }}.img and saving in {{ .Values.qemu.systemInstaller.path }}'
qemu-img convert BaseSystem.dmg -O qcow2 -p -c {{ .Values.qemu.systemInstaller.path }}/BaseSystem{{ .Values.qemu.systemInstaller.version }}.img qemu-img convert BaseSystem.dmg -O qcow2 -p -c {{ .Values.macos.installerSettings.path }}/BaseSystem{{ .Values.qemu.systemInstaller.version }}.img
rm -f BaseSystem.dmg rm -f BaseSystem.dmg
else else
echo 'Base Image downloaded and converted into img already..' echo 'Base Image downloaded and converted into img already..'
@ -1221,7 +1220,7 @@ data:
-device ide-hd,bus=sata.2,drive=OpenCoreBoot \ -device ide-hd,bus=sata.2,drive=OpenCoreBoot \
{{- if .Values.qemu.systemInstaller.enabled }} {{- if .Values.qemu.systemInstaller.enabled }}
-device ide-hd,bus=sata.3,drive=InstallMedia \ -device ide-hd,bus=sata.3,drive=InstallMedia \
-drive id=InstallMedia,if=none,file={{ .Values.qemu.systemInstaller.path }}/BaseSystem{{ .Values.qemu.systemInstaller.version }}.img,format=qcow2 \ -drive id=InstallMedia,if=none,file={{ .Values.macos.installerSettings.path }}/BaseSystem{{ .Values.macos.installerSettings.version }}.img,format=qcow2 \
{{- end }} {{- end }}
-drive id=MacHDD,if=none,file=/system_image/{{ .Values.serverName }}/mac_hdd_ng.img,format=qcow2 \ -drive id=MacHDD,if=none,file=/system_image/{{ .Values.serverName }}/mac_hdd_ng.img,format=qcow2 \
-device ide-hd,bus=sata.4,drive=MacHDD \ -device ide-hd,bus=sata.4,drive=MacHDD \

68
helm/values.yaml
View File

@ -12,37 +12,41 @@ image:
# Please note, this must be a directory name within `/system_image` mounted at the bottom in extraVolumeMounts # Please note, this must be a directory name within `/system_image` mounted at the bottom in extraVolumeMounts
serverName: server serverName: server
# add kexts to EFI/OC/kexts and update config.plist macos:
# make sure your kexts are in kexts.path # add kexts to EFI/OC/kexts and update config.plist
kexts: # make sure your kexts are in kexts.path
add: false kexts:
path: /system_image/kexts add: false
kextsToAdd: {} path: /system_image/kexts
# - name: BrcmBluetoothInjector.kext kextsToAdd: {}
# executablePath: Contents/MacOS/BrcmBluetoothInjector # - name: BrcmBluetoothInjector.kext
# plistPath: Contents/Info.plist # executablePath: Contents/MacOS/BrcmBluetoothInjector
# - name: BrcmFirmwareData.kext # plistPath: Contents/Info.plist
# executablePath: Contents/MacOS/BrcmFirmwareData # - name: BrcmFirmwareData.kext
# plistPath: Contents/Info.plist # executablePath: Contents/MacOS/BrcmFirmwareData
# - name: BrcmPatchRAM3.kext # plistPath: Contents/Info.plist
# executablePath: Contents/MacOS/BrcmPatchRAM3 # - name: BrcmPatchRAM3.kext
# plistPath: Contents/Info.plist # executablePath: Contents/MacOS/BrcmPatchRAM3
# plistPath: Contents/Info.plist
# SMBIOS settings # SMBIOS settings
configPlist: configPlist:
SystemProductName: iMacPro1,1 SystemProductName: iMacPro1,1
MLB: D25338500GUF8YLJA MLB: D25338500GUF8YLJA
SystemSerialNumber: D25LF7ZEF8JC SystemSerialNumber: D25LF7ZEF8JC
SystemUUID: 139C94D6-A533-47D2-874F-D365BFD8B047 SystemUUID: 139C94D6-A533-47D2-874F-D365BFD8B047
bootArgs: '-v keepsyms=1 tlbto_us=0 vti=9 -wegoff agdpmod=pikera' bootArgs: '-v keepsyms=1 tlbto_us=0 vti=9 -wegoff agdpmod=pikera'
openCore:
openCore: # Rebuild OpenCore.qcow2: this can be disabled if none of the above parameters in kexts, configPlist changes, and changing the
# Rebuild OpenCore.qcow2: this can be disabled if none of the above parameters in kexts, configPlist changes, and changing the # resolution are not desired, utilizing gpu passthrough and a few other things. Disabling is not recommended
# resolution are not desired, utilizing gpu passthrough and a few other things. Disabling is not recommended rebuild: true
rebuild: true boot:
boot: # set to zero to have OpenCore stay at boot menu
# set to zero to have OpenCore stay at boot menu timeout: 0
timeout: 0 installerSettings:
# if using more than one deployment, a write lock will be put on the system installer dmg, so this will need to be disabled
# for other pods
version: 10.15.7
path: /system_image/installers
# This section defines QEMU and virtlo parameters # This section defines QEMU and virtlo parameters
# #
@ -75,8 +79,6 @@ qemu:
# if using more than one deployment, a write lock will be put on the system installer dmg, so this will need to be disabled # if using more than one deployment, a write lock will be put on the system installer dmg, so this will need to be disabled
# for other pods # for other pods
enabled: false enabled: false
version: 10.15.7
path: /system_image/installers
downloadDelay: 15 downloadDelay: 15
# can be `writethrough`, `writeback`, or `none` # can be `writethrough`, `writeback`, or `none`
cache: none cache: none