zen_custom -> zen_lib, don't include, add i801_smbus kmod_ingore

Signed-off-by: Zen <[email protected]>

Author: desultory

setup.py

@@ -11,6 +11,7 @@
         "ugrd": ["*/*.toml",
                  "include/gen_init_cpio.c"]
     },
+    install_requires=['zenlib>=1.0.0'],
     entry_points={
         "console_scripts": [
             "ugrd = ugrd.main:main"

ugrd/initramfs_dict.py

@@ -5,7 +5,8 @@
 from tomllib import load, TOMLDecodeError
 from pathlib import Path
 
-from ugrd.zen_custom import loggify, handle_plural, NoDupFlatList, pretty_print
+from zenlib.logging import loggify
+from zenlib.util import handle_plural, pretty_print, NoDupFlatList
 
 
 @loggify

ugrd/initramfs_generator.py

@@ -7,7 +7,9 @@
 from pathlib import Path
 from subprocess import run, CompletedProcess
 
-from ugrd.zen_custom import loggify, pretty_print
+from zenlib.logging import loggify
+from zenlib.util import pretty_print
+
 from ugrd.initramfs_dict import InitramfsConfigDict
 
 

ugrd/kmod/kmod.toml

@@ -1,7 +1,7 @@
 binaries = [ "modprobe", "lsmod" ]
 
 # Ignore this because it's only builtin
-kmod_ignore = ['pcieport', 'piix4_smbus']
+kmod_ignore = ['pcieport', 'piix4_smbus', 'i801_smbus']
 
 kmod_pull_firmware = true
 

ugrd/main.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from ugrd.initramfs_generator import InitramfsGenerator
-from ugrd.zen_custom import ColorLognameFormatter
+from zenlib.logging import ColorLognameFormatter
 
 from argparse import ArgumentParser
 import logging