Merge pull request #64 from desultory/nokmod

separate kconfig code from kmod code, add more sound/network masks

Author: desultory

src/ugrd/kmod/kconfig.py

@@ -0,0 +1,46 @@
+__author__ = 'desultory'
+__version__ = '0.1.0'
+
+from zenlib.util import contains
+
+
+def _normalize_kconfig_option(self, option: str) -> str:
+    """ Normalizes a kernel config option. """
+    option = option.upper()
+    if not option.startswith('CONFIG_'):
+        option = 'CONFIG_' + option
+    return option
+
+
+@contains('kernel_config_file', "Cannot check config, kernel config file not found.")
+def _check_kernel_config(self, option: str):
+    """
+    Checks if an option is set in the kernel config file.
+    Checks that the line starts with the option, and is set to 'y' or 'm'.
+    If a match is found, return the line, otherwise return None
+    """
+    option = _normalize_kconfig_option(self, option)
+    with open(self['kernel_config_file'], 'r') as f:
+        for line in f.readlines():
+            if line.startswith(option):
+                if line.split('=')[1].strip()[0] in ['y', 'm']:
+                    self.logger.debug("Kernel config option is set: %s" % option)
+                    return line
+                else:
+                    return self.logger.debug("Kernel config option is not set: %s" % option)
+    self.logger.debug("Kernel config option not found: %s" % option)
+
+
+def find_kernel_config(self) -> None:
+    """ Tries to find the kernel config file associated with the current kernel version. """
+    build_dir = self['_kmod_dir'] / 'build'
+    source_dir = self['_kmod_dir'] / 'source'
+    for d in [build_dir, source_dir]:
+        if d.exists():
+            config_file = d / '.config'
+            if config_file.exists():
+                self.logger.info("Found kernel config file: %s" % config_file)
+                self['kernel_config_file'] = config_file
+                break
+    else:
+        self.logger.warning("Kernel config file not found.")

src/ugrd/kmod/kconfig.toml

@@ -0,0 +1,5 @@
+[custom_parameters]
+kernel_config_file = "Path"  # Path to the kernel configuration file
+
+[imports.build_pre]
+"ugrd.kmod.kmod" = [ "find_kernel_config" ]

src/ugrd/kmod/kmod.py

@@ -153,48 +153,6 @@ def autodetect_modules(self) -> None:
         self.logger.warning("No kernel modules were autodetected.")
 
 
-def _normalize_kconfig_option(self, option: str) -> str:
-    """ Normalizes a kernel config option. """
-    option = option.upper()
-    if not option.startswith('CONFIG_'):
-        option = 'CONFIG_' + option
-    return option
-
-
-@contains('_kernel_config_file', "Cannot check config, kernel config file not found.")
-def _check_kernel_config(self, option: str):
-    """
-    Checks if an option is set in the kernel config file.
-    Checks that the line starts with the option, and is set to 'y' or 'm'.
-    If a match is found, return the line, otherwise return None
-    """
-    option = _normalize_kconfig_option(self, option)
-    with open(self['_kernel_config_file'], 'r') as f:
-        for line in f.readlines():
-            if line.startswith(option):
-                if line.split('=')[1].strip()[0] in ['y', 'm']:
-                    self.logger.debug("Kernel config option is set: %s" % option)
-                    return line
-                else:
-                    return self.logger.debug("Kernel config option is not set: %s" % option)
-    self.logger.debug("Kernel config option not found: %s" % option)
-
-
-def find_kernel_config(self) -> None:
-    """ Tries to find the kernel config file associated with the current kernel version. """
-    build_dir = self['_kmod_dir'] / 'build'
-    source_dir = self['_kmod_dir'] / 'source'
-    for d in [build_dir, source_dir]:
-        if d.exists():
-            config_file = d / '.config'
-            if config_file.exists():
-                self.logger.info("Found kernel config file: %s" % config_file)
-                self['_kernel_config_file'] = config_file
-                break
-    else:
-        self.logger.warning("Kernel config file not found.")
-
-
 def get_kernel_metadata(self) -> None:
     """ Gets metadata for all kernel modules. """
     if not self.get('kernel_version'):
@@ -212,7 +170,6 @@ def get_kernel_metadata(self) -> None:
             self.logger.warning("Kernel module directory does not exist, but no_kmod is set.")
         else:
             raise DependencyResolutionError(f"Kernel module directory does not exist for kernel: {self['kernel_version']}")
-    find_kernel_config(self)  # Used to check kernel config options
 
 
 @contains('kmod_init', "kmod_init is empty, skipping.")

src/ugrd/kmod/nonetwork.toml

@@ -1,11 +1,14 @@
 kmod_ignore = [
 'rfkill', 'bluetooth', 'cfg80211', 'mac80211', # Wireless
 'iwlwifi', 'iwlmvm', 'btusb', 'btintel', 'btrtl', 'btbcm', 'btmtk',  # wireless vendor
-'cdc_ether', 'stp', '8021q', 'llc', 'garp', 'mrp', 'bridge', 'bonding',  # Ethernet
+'mt76', 'mt76x2_common', 'mt7921_common', 'mt76x0_common', 'mt76_usb', 'mt76x02_lib',  # mediatek
+'cdc_acm', 'cdc_ncm', 'cdc_wdm', 'cdc_ether',  # USB CDC
+'stp', '8021q', 'llc', 'garp', 'mrp', 'bridge', 'bonding',  # Ethernet
 'r8169', 'r8152', 'r8153_ecm', 'igb', 'ixgbe', 'tg3', 'e1000e', 'e1000',  # Ethernet cards
 'tun', 'tap', 'wireguard', 'udp_tunnel', 'ip6_udp_tunnel',  # Tunnels
 'net_failover', 'failover','vhost_net','usbnet',  # Misc
 'tls', 'sctp',  # Misc protocols
+'rtl2832', 'r820t', 'dvb_usb_rtl28xxu', 'dvb_core', 'dvb_usb_v2',  # SDR
 'grace', 'nfs_acl', 'nfsd', 'lockd', 'sunrpc', 'auth_rpcgss', 'nfs', 'netfs',  # NFS
 'nf_nat', 'nfnetlink', 'nfnetlink_queue', 'nfnetlink_log',  # Netfilter base
 'nf_conntrack', 'nf_conntrack_netlink',  # Netfilter conntrack

src/ugrd/kmod/nosound.toml

@@ -3,12 +3,13 @@ kmod_ignore = [
 'snd_timer', 'snd_hrtimer',  # alsa
 'snd_pcm', 'snd_rawmidi', 'snd_seq_device', 'snd_seq', 'snd_seq_dummy', 'snd_ump', # subtypes
 'snd_usb_audio', 'snd_usbmidi_lib',  # usb
-'snd_soc_core', 'snd_soc_acpi',  # soc
+'snd_soc_core', 'snd_soc_acpi', 'snd_acp_config',  # soc
 'snd_soc_acpi_intel_match',  # intel soc
-'snd_sof_utils', 'snd_sof_pci',  # sof
+'snd_sof', 'snd_sof_utils', 'snd_sof_pci', 'snd_sof_xtensa_dsp',  # sof
 'snd_sof_intel_hda', # intel sof
 'snd_hda_intel', 'snd_intel_sdw_acpi', 'snd_intel_dspcfg',  # intel
+'ac97_bus', 'snd_rpl_pci_acp6x', 'snd_rn_pci_acp3x', 'snd_pci_acp3x',  # AMD
 'snd_hda_codec_hdmi',  # hdmi
 'soundwire_cadence', 'soundwire_bus', 'soundwire_generic_allocation',  # soundwire
-'ledtrig_audio',  # misc
+'ledtrig_audio', 'ac97_bus', # misc
 ]