Move src/firmware -> asahi_firmware

Prepare for this to be a Python package that can be installed
stand-alone

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

asahi_firmware/__init__.py

@@ -2,7 +2,7 @@
 import logging, os, os.path, re, sys
 from collections import namedtuple, defaultdict
 
-from . import FWFile
+from .core import FWFile
 
 BluetoothChip = namedtuple(
     "BluetoothChip", ("chip", "stepping", "board_type", "vendor")

src/firmware/bluetooth.py asahi_firmware/bluetooth.pysrc/firmware/bluetooth.py renamed to asahi_firmware/bluetooth.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-import tarfile, io, os, logging
+import tarfile, io, logging
 from hashlib import sha256
 
 class FWFile(object):

src/firmware/__init__.py asahi_firmware/core.pysrc/firmware/__init__.py renamed to asahi_firmware/core.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 import sys, os, os.path, pprint, statistics, logging
 
-from . import FWFile
+from .core import FWFile
 
 class FWNode(object):
     def __init__(self, this=None, leaves=None):

src/firmware/wifi.py asahi_firmware/wifi.pysrc/firmware/wifi.py renamed to asahi_firmware/wifi.py

@@ -50,6 +50,7 @@ make -C "$M1N1" RELEASE=1 CHAINLOADING=1 -j4
 echo "Copying files..."
 
 cp -r "$SRC"/* "$PACKAGE/"
+cp -r asahi_firmware "$PACKAGE/"
 cp "$ARTWORK/logos/icns/AsahiLinux_logomark.icns" "$PACKAGE/logo.icns"
 mkdir -p "$PACKAGE/boot"
 cp "$M1N1/build/m1n1.bin" "$PACKAGE/boot"

build.sh

@@ -0,0 +1 @@
+../asahi_firmware

src/asahi_firmware

@@ -3,7 +3,7 @@
 import os, os.path, shlex, subprocess, sys, time, termios, json, getpass
 from dataclasses import dataclass
 
-import system, osenum, stub, diskutil, osinstall, firmware
+import system, osenum, stub, diskutil, osinstall, asahi_firmware
 from util import *
 
 PART_ALIGN = psize("1MiB")
@@ -297,7 +297,7 @@ def do_install(self, total_size=None):
 
         pkg = None
         if self.osins.needs_firmware:
-            pkg = firmware.FWPackage("firmware.tar")
+            pkg = asahi_firmware.core.FWPackage("firmware.tar")
             self.ins.collect_firmware(pkg)
             pkg.close()
             self.osins.firmware_package = pkg

src/main.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-import os, shutil, sys, stat, subprocess, urlcache, zipfile, logging, firmware
+import os, shutil, sys, stat, subprocess, urlcache, zipfile, logging
 
 from util import *
 

src/osinstall.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 import os, os.path, plistlib, shutil, sys, stat, subprocess, urlcache, zipfile, logging, json
-import osenum, firmware.wifi, firmware.bluetooth
+import osenum, asahi_firmware.wifi, asahi_firmware.bluetooth
 from util import *
 
 class StubInstaller(PackageInstaller):
@@ -322,10 +322,10 @@ def collect_firmware(self, pkg):
         subprocess.run(["hdiutil", "attach", "-quiet", "-readonly", "-mountpoint", "recovery", img],
                        check=True)
         logging.info("Collecting WiFi firmware")
-        col = firmware.wifi.WiFiFWCollection("recovery/usr/share/firmware/wifi/")
+        col = asahi_firmware.wifi.WiFiFWCollection("recovery/usr/share/firmware/wifi/")
         pkg.add_files(sorted(col.files()))
         logging.info("Collecting Bluetooth firmware")
-        col = firmware.bluetooth.BluetoothFWCollection("recovery/usr/share/firmware/bluetooth/")
+        col = asahi_firmware.bluetooth.BluetoothFWCollection("recovery/usr/share/firmware/bluetooth/")
         pkg.add_files(sorted(col.files()))
         logging.info("Making fallback firmware archive")
         subprocess.run(["tar", "czf", "all_firmware.tar.gz",

src/stub.py

@@ -20,6 +20,7 @@ git describe --tags --always --dirty > /tmp/asahi-install/version.tag
 
 cd /tmp/asahi-install
 ln -sf "$base/src"/* .
+ln -sf "$base/asahi_firmware" .
 mkdir -p boot
 ln -sf "$base/m1n1/build/m1n1.bin" boot/m1n1.bin
 ln -sf "$base/artwork/logos/icns/AsahiLinux_logomark.icns" logo.icns