author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-12 17:54:50 UTC |
committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-12 17:54:50 UTC |
parent | 1d811907261d5b7fb9f864e9da410d7c3bd8c5df |
.gitignore | +1 | -0 |
bs-spawn64.sh | +2 | -0 |
bsbot.py | +7 | -2 |
diff --git a/.gitignore b/.gitignore index 4f4cfa2..c5235ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Every directory. Yes. */ +partial-order diff --git a/bs-spawn64.sh b/bs-spawn64.sh new file mode 100755 index 0000000..a58caa8 --- /dev/null +++ b/bs-spawn64.sh @@ -0,0 +1,2 @@ +#!/bin/bash +setarch aarch64 systemd-nspawn -a -M bootstrap64 -D /bootstrap64 --bind=/sources --chdir=$(pwd) /bin/bash diff --git a/bsbot.py b/bsbot.py index b7ded68..3377d4a 100755 --- a/bsbot.py +++ b/bsbot.py @@ -77,12 +77,16 @@ def pre_rm(pkg): x = sub(cmd, stdin=DEVNULL, stderr=STDOUT, stdout=DEVNULL) print(f"Result: {str(x)}") +is_64bits = sys.maxsize > 2**32 -bspkg = "/sources/pkg-bootstrapper" +chost = "aarch64" if is_64bits else "armv7h" + +bspkg = f"/sources/pkg/{chost}/bootstrap" try: os.stat(bspkg) except FileNotFoundError: - bspkg = "/sources/pkg-core" + bspkg = f"/sources/pkg/{chost}/core" + def pkgbuild_check_sums(): with open('PKGBUILD', 'r') as f: @@ -140,6 +144,7 @@ for pkgline in pkgs: repo_pkgs.append(e.name) # Do a single pacman-U call so that inter-pkg dependencies are resolved if len(pacu_pkgs): + #subc(["pacman", "-Udd", "--noconfirm", '--overwrite', '*'] + pacu_pkgs) subc(["pacman", "-U", "--noconfirm"] + pacu_pkgs) for rp in repo_pkgs: subc(["mv", rp, bspkg + '/'])