fix: atombuild delayed copying resolv.conf

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

lib/atombuild.py

@@ -32,19 +32,32 @@ BASE_REQUIREMENTS = [
 
 
 def _prepare_build_env_base_files(root: str):
+    # Create root directory
     os.makedirs(root, exist_ok=True)
+
+    # Create var, run and tmp
     os.mkdir(f"{root}/var")
     os.mkdir(f"{root}/var/tmp")
     os.mkdir(f"{root}/var/run")
     os.mkdir(f"{root}/tmp")
     os.mkdir(f"{root}/run")
+
+    # Copy repository config files
     os.makedirs(f"{root}/var/db/packie")
     shutil.copytree("/var/config/packie/repos.d", f"{root}/var/config/packie/repos.d")
+
+    # Create directories for kernel pseudo filesystems
     os.mkdir(f"{root}/dev")
     os.mkdir(f"{root}/sys")
     os.mkdir(f"{root}/proc")
+
+    # Create home directory of root (some scripts may require it)
     os.makedirs(f"{root}/home/root")
 
+    # Copy DNS config
+    os.makedirs(f"{root}/etc", exist_ok=True)
+    shutil.copy2("/etc/resolv.conf", f"{root}/etc/resolv.conf")
+
 
 def prepare_build_env(root: str, extreq: list[str] = []):
     # Skip if the environment is already initialized
@@ -65,10 +78,6 @@ def prepare_build_env(root: str, extreq: list[str] = []):
     # Refresh certificates
     enter_build_env(root, ["certutil", "refresh"])
 
-    # Copy DNS config
-    os.makedirs(f"{root}/etc", exist_ok=True)
-    shutil.copy2("/etc/resolv.conf", f"{root}/etc/resolv.conf")
-
     # Create initialized tag
     with open(f"{root}/.INIT", "wt+") as file:
         file.write("OK")

packages/alsa-lib/pkgbuild.py

@@ -8,6 +8,7 @@ source_url("https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.16.1.tar.bz2
 
 builddep("shortcut/c")
 builddep("shortcut/autotools")
+builddep(f"linux-dev @{arch.get_target()}")
 
 
 def build():

packages/alsa-utils/pkgbuild.py

@@ -0,0 +1,35 @@
+from lib.make import *
+from lib import cpp
+
+version("1.2.16")
+source_url("https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.16.tar.bz2")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep("pkgconf")
+builddep(f"libncurses-dev @{arch.get_target()}")
+builddep(f"alsa-lib-dev @{arch.get_target()}")
+builddep(f"libintl-dev @{arch.get_target()}")
+builddep("gettext")
+
+def build():
+    cpp.configure([f"--prefix={get_prefix('alsa-utils')}", "--disable-nls"])
+    cpp.make()
+    cpp.make_install()
+
+on_build(build)
+
+
+def pack_alsa_utils(composer):
+    composer.add_dir("bin", "bin")
+    composer.add_dir("sbin", "bin", merge=True)
+    composer.add_dir("lib", "lib")
+    composer.makedir("share")
+    composer.add_dir("share/alsa", "share/alsa")
+    composer.add_dir("share/sounds", "share/sounds")
+
+package("alsa-utils")
+dep("semi-libc @same-arch")
+dep("alsa-lib @same-arch")
+dep("libncurses @same-arch")
+on_pack(pack_alsa_utils)

packages/kmod/pkgbuild.py

@@ -1,17 +1,30 @@
-import os
-
-import lib.cpp as cpp
+from lib import cpp, arch
 from lib.make import *
 
 version("1.34")
 source_url("https://github.com/kmod-project/kmod/archive/refs/tags/v34.tar.gz")
 
+builddep("shortcut/c")
+builddep("shortcut/meson")
+builddep(f"linux-dev @{arch.get_target()}")
+builddep(f"libzstd-dev @{arch.get_target()}")
+builddep(f"aws-lc-dev @{arch.get_target()}")
+builddep(f"liblzma-dev @{arch.get_target()}")
+builddep(f"libz-ng-dev @{arch.get_target()}")
+builddep("pkgconf")
+
 
 def build():
-    cpp.meson_setup()
+    cpp.meson_setup([
+        "-Dprefix=/",
+        f"-Ddistconfdir={get_prefix('libkmod')}/share",
+        "-Dmoduledir=/lib/lkm",
+        "-Dtools=true",
+        "-Ddlopen=all",
+        "-Dmanpages=false",
+    ])
     cpp.meson_compile()
     cpp.meson_install()
-    os.chdir("usr")
 
 
 on_build(build)
@@ -19,12 +32,20 @@ on_build(build)
 package("libkmod")
 cpp.use_auto_pack(["lib"])
 dep("semi-libc @same-arch")
-dep("libzstd @same-arch")
 dep("libcrypto @same-arch")
+recommend("libzstd @same-arch")
+recommend("libz @same-arch")
+recommend("liblzma @same-arch")
 
 package("kmod")
 cpp.use_auto_pack(["bin"])
 dep("libkmod (same)")
+link("bin/kmod", "/bin/depmod")
+link("bin/kmod", "/bin/insmod")
+link("bin/kmod", "/bin/lsmod")
+link("bin/kmod", "/bin/modinfo")
+link("bin/kmod", "/bin/modprobe")
+link("bin/kmod", "/bin/rmmod")
 
 package("libkmod-dev")
 cpp.use_auto_pack(["dev"])

packages/util-linux/pkgbuild.py

@@ -0,0 +1,323 @@
+import os
+
+from lib.make import *
+from lib import cpp
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep("gettext")
+builddep("bash")
+builddep(f"linux-dev @{arch.get_target()}")
+builddep(f"libintl-dev @{arch.get_target()}")
+builddep(f"libz-ng-dev @{arch.get_target()}")
+builddep(f"libncurses-dev @{arch.get_target()}")
+
+version("2.42.2")
+source_url("https://www.kernel.org/pub/linux/utils/util-linux/v2.42/util-linux-2.42.2.tar.xz")
+
+def build():
+    cpp.configure([
+        "--prefix=/",
+        "--enable-fs-paths-default=/bin",
+        "--disable-su",
+        "--disable-sulogin",
+        "--disable-chfn-chsh",
+        "--disable-login",
+        "--without-systemd",
+        "--disable-makeinstall-setuid",
+        "--disable-makeinstall-chown",
+        "--disable-makeinstall-tty-setgid",
+    ])
+    cpp.make()
+    cpp.make_install()
+
+on_build(build)
+
+
+def fix_pc(libname: str):
+    pkgname_lib = f"lib{libname}"
+    pkgname_dev = f"lib{libname}-dev"
+    pc_path = f"lib/pkgconfig/{libname}.pc"
+    with open(pc_path, "r") as file:
+        pc_content = file.read()
+    pc_content = pc_content.replace(
+        "libdir=//lib", f"libdir={get_prefix(pkgname_lib)}/lib"
+    ).replace(
+        "includedir=//include", f"includedir={get_prefix(pkgname_dev)}/include"
+    )
+    with open(pc_path, "wt") as file:
+        file.write(pc_content)
+
+
+def pack_lib(composer, name):
+    composer.makedir("lib")
+    for i in os.listdir("lib"):
+        if name in i and "so" in i:
+            composer.addfile(f"lib/{i}", f"lib/{i}")
+
+def pack_dev(composer, name):
+    fix_pc(name)
+    composer.makedir("lib")
+    for i in os.listdir("lib"):
+        if name in i and "so" not in i:
+            composer.addfile(f"lib/{i}", f"lib/{i}")
+    composer.makedir("lib/pkgconfig")
+    composer.addfile(f"lib/pkgconfig/{name}.pc", f"lib/pkgconfig/{name}.pc")
+    composer.makedir("include")
+    for i in os.listdir("include"):
+        if name in i:
+            composer.add_dir(f"include/{i}", f"include/{i}")
+
+def pack_bin(composer, list):
+    composer.makedir("bin")
+    for i in list:
+        if i.startswith("sbin/"):
+            i = i.replace("sbin/", "")
+            composer.addfile(f"sbin/{i}", f"bin/{i}")
+        else:
+            composer.addfile(f"bin/{i}", f"bin/{i}")
+
+package("libblkid")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_lib(composer, "blkid"))
+
+package("libblkid-dev")
+dep("libblkid (same)")
+on_pack(lambda composer: pack_dev(composer, "blkid"))
+
+package("libfdisk")
+dep("libuuid (same)")
+dep("libblkid (same)")
+on_pack(lambda composer: pack_lib(composer, "fdisk"))
+
+package("libfdisk-dev")
+dep("libfdisk (same)")
+on_pack(lambda composer: pack_dev(composer, "fdisk"))
+
+package("libmount")
+dep("libblkid (same)")
+on_pack(lambda composer: pack_lib(composer, "mount"))
+
+package("libmount-dev")
+dep("libmount (same)")
+on_pack(lambda composer: pack_dev(composer, "mount"))
+
+package("libsmartcols")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_lib(composer, "smartcols"))
+
+package("libsmartcols-dev")
+dep("libsmartcols (same)")
+on_pack(lambda composer: pack_dev(composer, "smartcols"))
+
+package("libuuid")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_lib(composer, "uuid"))
+
+package("libuuid-dev")
+dep("libuuid (same)")
+on_pack(lambda composer: pack_dev(composer, "uuid"))
+
+package("util-linux-swap")
+dep("libblkid (same)")
+dep("libmount (same)")
+dep("libsmartcols (same)")
+on_pack(lambda composer: pack_bin(composer, ["sbin/swaplabel", "sbin/swapoff", "sbin/swapon", "sbin/mkswap"]))
+
+package("util-linux-mount")
+provide("mount")
+dep("libmount (same)")
+on_pack(lambda composer: pack_bin(composer, ["mount", "umount"]))
+
+package("util-linux-fdisk")
+provide("fdisk")
+dep("libfdisk (same)")
+dep("libsmartcols (same)")
+dep("libncurses @same-arch")
+on_pack(lambda composer: pack_bin(composer, ["sbin/fdisk"]))
+
+package("util-linux-sfdisk")
+provide("sfdisk")
+dep("libfdisk (same)")
+dep("libsmartcols (same)")
+dep("libncurses @same-arch")
+on_pack(lambda composer: pack_bin(composer, ["sbin/sfdisk"]))
+
+package("util-linux-cfdisk")
+provide("cfdisk")
+dep("libfdisk (same)")
+dep("libsmartcols (same)")
+dep("libncurses @same-arch")
+on_pack(lambda composer: pack_bin(composer, ["sbin/cfdisk"]))
+
+package("util-linux-mkfs")
+dep("semi-libc @same-arch")
+dep("libz @same-arch")
+provide("mkfs")
+on_pack(lambda composer: pack_bin(composer, ["sbin/mkfs", "sbin/mkfs.bfs", "sbin/mkfs.cramfs", "sbin/mkfs.minix"]))
+
+package("util-linux-fsck")
+dep("libmount (same)")
+dep("libblkid (same)")
+dep("libz @same-arch")
+provide("fsck")
+on_pack(lambda composer: pack_bin(composer, ["sbin/fsck", "sbin/fsck.cramfs", "sbin/fsck.minix"]))
+
+package("util-linux-fs")
+dep("libblkid (same)")
+dep("libsmartcols (same)")
+dep("libmount (same)")
+on_pack(lambda composer: pack_bin(composer, [
+    "sbin/addpart",
+    "sbin/resizepart",
+    "sbin/delpart",
+    "sbin/partx",
+    "sbin/losetup",
+    "sbin/blkdiscard",
+    "sbin/blkid",
+    "sbin/blkpr",
+    "sbin/blkzone",
+    "sbin/blockdev",
+    "sbin/findfs",
+    "sbin/fsfreeze",
+    "sbin/fstrim",
+    "copyfilerange",
+    "exch",
+    "fadvise",
+    "fallocate",
+    "fincore",
+    "flock",
+    "getino",
+    "hardlink",
+    "mountpoint",
+    "namei",
+    "rename",
+    "whereis",
+    "sbin/pivot_root",
+    "sbin/switch_root",
+    "sbin/wipefs",
+    "sbin/zramctl",
+    "findmnt",
+]))
+
+package("util-linux-security")
+dep("libsmartcols (same)")
+dep("libmount (same)")
+on_pack(lambda composer: pack_bin(composer, [
+    "utmpdump",
+    "unshare",
+    "last",
+    "lastb",
+    "nsenter",
+    "lsns",
+    "sbin/nologin",
+]))
+
+package("util-linux-proc")
+dep("libsmartcols (same)")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_bin(composer, [
+    "uclampset",
+    "waitpid",
+    "setsid",
+    "setpgid",
+    "taskset",
+    "chrt",
+    "coresched",
+    "prlimit",
+    "renice",
+    "ionice",
+]))
+
+package("util-linux-text")
+dep("libncurses @same-arch")
+dep("libsmartcols (same)")
+on_pack(lambda composer: pack_bin(composer, [
+    "bits",
+    "cal",
+    "colcrt",
+    "colrm",
+    "column",
+    "getopt",
+    "hexdump",
+    "look",
+    "mcookie",
+    "rev",
+    "ul",
+]))
+
+package("util-linux-term")
+dep("libncurses @same-arch")
+on_pack(lambda composer: pack_bin(composer, [
+    "setterm",
+    "mesg",
+    "script",
+    "scriptlive",
+    "scriptreplay",
+    "wall",
+    "sbin/agetty",
+    "sbin/ldattach",
+]))
+
+package("util-linux-ipc")
+dep("libmount (same)")
+dep("libsmartcols (same)")
+on_pack(lambda composer: pack_bin(composer, [
+    "ipcmk",
+    "ipcrm",
+    "ipcs",
+    "lslocks",
+    "pipesz",
+    "dmesg",
+]))
+
+package("util-linux-hardware")
+dep("libsmartcols (same)")
+dep("libncurses @same-arch")
+on_pack(lambda composer: pack_bin(composer, [
+    "irqtop",
+    "lsirq",
+    "lsmem",
+    "wdctl",
+    "sbin/hwclock",
+    "sbin/readprofile",
+    "sbin/rfkill",
+    "sbin/rtcwake",
+]))
+
+package("isosize")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_bin(composer, ["isosize"]))
+
+package("util-linux-arch")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_bin(composer, ["setarch", "uname26", "linux32", "linux64"]))
+
+package("util-linux-uuid")
+dep("libuuid (same)")
+dep("libsmartcols (same)")
+on_pack(lambda composer: pack_bin(composer, [
+    "uuidgen",
+    "uuidparse",
+    "sbin/uuidd",
+]))
+
+package("util-linux")
+dep("util-linux-swap (same)")
+dep("util-linux-mount (same)")
+dep("util-linux-fdisk (same)")
+dep("util-linux-sfdisk (same)")
+dep("util-linux-cfdisk (same)")
+dep("util-linux-mkfs (same)")
+dep("util-linux-fsck (same)")
+dep("util-linux-fs (same)")
+dep("util-linux-security (same)")
+dep("util-linux-proc (same)")
+dep("util-linux-text (same)")
+dep("util-linux-term (same)")
+dep("util-linux-ipc (same)")
+dep("util-linux-hardware (same)")
+dep("isosize (same)")
+dep("util-linux-arch (same)")
+dep("util-linux-uuid (same)")
+on_pack(lambda _composer: None)