Remove old utility scripts

Author: sharpenedblade

t2linux-config/firmware.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
-# https://github.com/t2linux/wiki/blob/master/docs/tools/firmware.sh
 # Copyright (C) 2022 Aditya Garg <gargaditya08@live.com>
 # Copyright (C) 2022 Orlando Chamberlain <redecorating@protonmail.com>
 #
@@ -50,24 +49,24 @@ case "$os" in
 		echo "Unmounting the EFI partition"
 		sudo diskutil unmount disk0s1
 		echo
-		echo -e "Run the following commands or run this script itself in Linux now to set up Wi-Fi :-\n\nsudo umount /dev/nvme0n1p1\nsudo mkdir /tmp/apple-wifi-efi\nsudo mount /dev/nvme0n1p1 /tmp/apple-wifi-efi\nbash /tmp/apple-wifi-efi/firmware.sh\n"
+		echo -e "Run the following commands or run this script itself in Linux now to set up Wi-Fi :-\n\nsudo umount /dev/nvme0n1p1\nsudo mkdir -p /tmp/apple-wifi-efi\nsudo mount /dev/nvme0n1p1 /tmp/apple-wifi-efi\nbash /tmp/apple-wifi-efi/firmware.sh\n"
 		;;
 	(Linux)
 		echo "Detected Linux"
 		echo "Re-mounting the EFI partition"
 		if [[ ${1-default} = -v ]]
 		then
 			sudo umount -v /dev/nvme0n1p1 || true
-			sudo mkdir -v /tmp/apple-wifi-efi || true
+			sudo mkdir -p -v /tmp/apple-wifi-efi || true
 			sudo mount -v /dev/nvme0n1p1 /tmp/apple-wifi-efi || true
 		else
 			sudo umount /dev/nvme0n1p1 2>/dev/null || true
-			sudo mkdir /tmp/apple-wifi-efi 2>/dev/null || true
+			sudo mkdir -p /tmp/apple-wifi-efi 2>/dev/null || true
 			sudo mount /dev/nvme0n1p1 /tmp/apple-wifi-efi 2>/dev/null || true
 		fi
 		mountpoint=$(findmnt -n -o TARGET /dev/nvme0n1p1)
 		echo "Getting Wi-Fi and Bluetooth firmware"
-		sudo mkdir /tmp/apple-wifi-fw
+		sudo mkdir -p /tmp/apple-wifi-fw
 		cd /tmp/apple-wifi-fw
 		if [[ ${1-default} = -v ]]
 		then
@@ -134,14 +133,20 @@ case "$os" in
 esac
 exit 0
 """
+
 # SPDX-License-Identifier: MIT
 import logging, os, os.path, re, sys
 from collections import namedtuple, defaultdict
+
 #from .core import FWFile
+
 log = logging.getLogger("asahi_firmware.bluetooth")
+
 BluetoothChip = namedtuple(
     "BluetoothChip", ("chip", "stepping", "board_type", "vendor")
 )
+
+
 class BluetoothFWCollection(object):
     VENDORMAP = {
         "MUR": "m",
@@ -151,12 +156,15 @@ class BluetoothFWCollection(object):
     STRIP_SUFFIXES = [
         "ES2"
     ]
+
     def __init__(self, source_path):
         self.fwfiles = defaultdict(lambda: [None, None])
         self.load(source_path)
+
     def load(self, source_path):
         for fname in os.listdir(source_path):
             root, ext = os.path.splitext(fname)
+
             # index for bin and ptb inside self.fwfiles
             if ext == ".bin":
                 idx = 0
@@ -165,39 +173,49 @@ class BluetoothFWCollection(object):
             else:
                 # skip firmware for older (UART) chips
                 continue
+
             # skip T2 _DEV firmware
             if "_DEV" in root:
                 continue
+
             chip = self.parse_fname(root)
             if chip is None:
                 continue
+
             if self.fwfiles[chip][idx] is not None:
                 log.warning(f"duplicate entry for {chip}: {self.fwfiles[chip][idx].name} and now {fname + ext}")
                 continue
+
             path = os.path.join(source_path, fname)
             with open(path, "rb") as f:
                 data = f.read()
+
             self.fwfiles[chip][idx] = FWFile(fname, data)
+
     def parse_fname(self, fname):
         fname = fname.split("_")
+
         match = re.fullmatch("bcm(43[0-9]{2})([a-z][0-9])", fname[0].lower())
         if not match:
             log.warning(f"Unexpected firmware file: {fname}")
             return None
         chip, stepping = match.groups()
+
         # board type is either preceeded by PCIE_macOS or by PCIE
         try:
             pcie_offset = fname.index("PCIE")
         except:
             log.warning(f"Can't find board type in {fname}")
             return None
+
         if fname[pcie_offset + 1] == "macOS":
             board_type = fname[pcie_offset + 2]
         else:
             board_type = fname[pcie_offset + 1]
         for i in self.STRIP_SUFFIXES:
             board_type = board_type.rstrip(i)
         board_type = "apple," + board_type.lower()
+
         # make sure we can identify exactly one vendor
         otp_values = set()
         for vendor, otp_value in self.VENDORMAP.items():
@@ -207,44 +225,57 @@ class BluetoothFWCollection(object):
             log.warning(f"Unable to determine vendor ({otp_values}) in {fname}")
             return None
         vendor = otp_values.pop()
+
         return BluetoothChip(
             chip=chip, stepping=stepping, board_type=board_type, vendor=vendor
         )
+
     def files(self):
         for chip, (bin, ptb) in self.fwfiles.items():
             fname_base = f"brcm/brcmbt{chip.chip}{chip.stepping}-{chip.board_type}"
             if chip.vendor is not None:
                 fname_base += f"-{chip.vendor}"
+
             if bin is None:
                 log.warning(f"no bin for {chip}")
                 continue
             else:
                 yield fname_base + ".bin", bin
+
             if ptb is None:
                 log.warning(f"no ptb for {chip}")
                 continue
             else:
                 yield fname_base + ".ptb", ptb
+
+
 # SPDX-License-Identifier: MIT
 import sys, os, os.path, pprint, statistics, logging
 #from .core import FWFile
+
 log = logging.getLogger("asahi_firmware.wifi")
+
 class FWNode(object):
     def __init__(self, this=None, leaves=None):
         if leaves is None:
             leaves = {}
         self.this = this
         self.leaves = leaves
+
     def __eq__(self, other):
         return self.this == other.this and self.leaves == other.leaves
+
     def __hash__(self):
         return hash((self.this, tuple(self.leaves.items())))
+
     def __repr__(self):
         return f"FWNode({self.this!r}, {self.leaves!r})"
+
     def print(self, depth=0, tag=""):
         print(f"{'  ' * depth} * {tag}: {self.this or ''} ({hash(self)})")
         for k, v in self.leaves.items():
             v.print(depth + 1, k)
+
 class WiFiFWCollection(object):
     EXTMAP = {
         "trx": "bin",
@@ -257,8 +288,11 @@ class WiFiFWCollection(object):
         self.root = FWNode()
         self.load(source_path)
         self.prune()
+
     def load(self, source_path):
+        included_folders = ["C-4355__s-C1", "C-4364__s-B2", "C-4364__s-B3", "C-4377__s-B3"]
         for dirpath, dirnames, filenames in os.walk(source_path):
+            dirnames[:] = [d for d in dirnames if d in included_folders]
             if "perf" in dirnames:
                 dirnames.remove("perf")
             if "assert" in dirnames:
@@ -288,46 +322,58 @@ class WiFiFWCollection(object):
                     if dim in props:
                         ident.append(props.pop(dim))
                 assert not props
+
                 node = self.root
                 for k in ident:
                     node = node.leaves.setdefault(k, FWNode())
                 with open(path, "rb") as fd:
                     data = fd.read()
+
                 if name.endswith(".txt"):
                     data = self.process_nvram(data)
+
                 node.this = FWFile(relpath, data)
+
     def prune(self, node=None, depth=0):
         if node is None:
             node = self.root
+
         for i in node.leaves.values():
             self.prune(i, depth + 1)
+
         if node.this is None and node.leaves and depth > 3:
             first = next(iter(node.leaves.values()))
             if all(i == first for i in node.leaves.values()):
                 node.this = first.this
+
         for i in node.leaves.values():
             if not i.this or not node.this:
                 break
             if i.this != node.this:
                 break
         else:
             node.leaves = {}
+
     def _walk_files(self, node, ident):
         if node.this is not None:
             yield ident, node.this
         for k, subnode in node.leaves.items():
             yield from self._walk_files(subnode, ident + [k])
+
     def files(self):
         for ident, fwfile in self._walk_files(self.root, []):
             (ext, chip, rev), rest = ident[:3], ident[3:]
             rev = rev.lower()
             ext = self.EXTMAP[ext]
+
             if rest:
                 rest = "," + "-".join(rest)
             else:
                 rest = ""
             filename = f"brcm/brcmfmac{chip}{rev}-pcie.apple{rest}.{ext}"
+
             yield filename, fwfile
+
     def process_nvram(self, data):
         data = data.decode("ascii")
         keys = {}
@@ -339,33 +385,43 @@ class WiFiFWCollection(object):
             keys[key] = value
             # Clean up spurious whitespace that Linux does not like
             lines.append(f"{key.strip()}={value}\n")
+
         return "".join(lines).encode("ascii")
+
     def print(self):
         self.root.print()
+
 # SPDX-License-Identifier: MIT
 import tarfile, io, logging
 from hashlib import sha256
+
 class FWFile(object):
     def __init__(self, name, data):
         self.name = name
         self.data = data
         self.sha = sha256(data).hexdigest()
+
     def __repr__(self):
         return f"FWFile({self.name!r}, <{self.sha[:16]}>)"
+
     def __eq__(self, other):
         if other is None:
             return False
         return self.sha == other.sha
+
     def __hash__(self):
         return hash(self.sha)
+
 class FWPackage(object):
     def __init__(self, target):
         self.path = target
         self.tarfile = tarfile.open(target, mode="w")
         self.hashes = {}
         self.manifest = []
+
     def close(self):
         self.tarfile.close()
+
     def add_file(self, name, data):
         ti = tarfile.TarInfo(name)
         fd = None
@@ -379,20 +435,28 @@ class FWPackage(object):
             fd = io.BytesIO(data.data)
             self.hashes[data.sha] = name
             self.manifest.append(f"FILE {name} SHA256 {data.sha}")
+
         logging.info(f"+ {self.manifest[-1]}")
         self.tarfile.addfile(ti, fd)
+
     def add_files(self, it):
         for name, data in it:
             self.add_file(name, data)
+
     def save_manifest(self, filename):
         with open(filename, "w") as fd:
             for i in self.manifest:
                 fd.write(i + "\n")
+
     def __del__(self):
         self.tarfile.close()
+
+
+
+
 pkg = FWPackage("firmware.tar")
 col = WiFiFWCollection(sys.argv[1]+"/wifi")
 pkg.add_files(sorted(col.files()))
 col = BluetoothFWCollection(sys.argv[1]+"/bluetooth")
 pkg.add_files(sorted(col.files()))
-pkg.close()
+pkg.close()

t2linux-config/t2linux-config.spec

@@ -9,7 +9,6 @@ Requires: rust-tiny-dfr
 
 URL: https://t2linux.org
 
-Source0: touchbar.sh
 Source1: firmware.sh
 
 %description
@@ -23,7 +22,6 @@ echo -e 'add_drivers+=" apple_bce snd_seq "' > t2linux-modules-install.conf
 
 %install
 
-install -D -m 755 %{SOURCE0} %{buildroot}/%{_bindir}/touchbar.sh
 install -D -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/firmware.sh
 
 install -D -m 644 t2linux-modules-install.conf %{buildroot}/etc/dracut.conf.d/t2linux-modules-install.conf
@@ -37,4 +35,3 @@ grubby --args="intel_iommu=on iommu=pt pcie_ports=compat" --update-kernel=ALL
 /etc/modules-load.d/t2linux-modules.conf
 /etc/dracut.conf.d/t2linux-modules-install.conf
 %{_bindir}/firmware.sh
-%{_bindir}/touchbar.sh