README.md

@@ -50,6 +50,22 @@ Issues are being tracked
 * ps
 * tar
 
+## Relation to pmaports
+For pmbootstrap to be useful, it needs to maintain a local copy of the
+[pmaports](https://gitlab.com/postmarketOS/pmaports) repository where
+postmarketOS-specific packages are maintained. This is set up automatically, but
+the local copy of pmaports does not automatically get updated. To update it, you
+can run `$ pmbootstrap pull`.
+
+The latest pmbootstrap version works with currently
+[active postmarketOS releases](https://wiki.postmarketos.org/wiki/Releases).
+Attempting to use pmboostrap with old postmarketOS versions (old pmaports
+branches) may result in failures and is not supported. See
+`pmbootstrap_min_version` in
+[pmaports.cfg](https://wiki.postmarketos.org/wiki/Pmaports.cfg_reference) for
+the oldest supported pmbootstrap version for a given pmaports revision. The
+upper bound is not documented.
+
 ## Usage Examples
 Please refer to the [postmarketOS wiki](https://wiki.postmarketos.org) for
 in-depth coverage of topics such as

pmb/build/_package.py

@@ -490,7 +490,7 @@ def packages(
                 f"A binary package for {name} has a newer version ({index_data['version']})"
                 f" than the source ({pkgver}-{apkbuild['pkgrel']}). Please ensure your pmaports branch is up"
                 " to date and that you don't have a newer version of the package in your local"
-                f" binary repo ({context.config.work / 'packages' / channel / arch})."
+                f" binary repo ({context.config.work / 'packages' / channel / pkg_arch})."
             )
         build_queue.append(
             {

pmb/commands/__init__.py

@@ -10,6 +10,7 @@ from pmb.types import PmbArgs
 from pmb.helpers import frontend
 
 from .base import Command
+from .aportgen import Aportgen
 from .log import Log
 from .index import Index
 from .repo_bootstrap import RepoBootstrap
@@ -46,7 +47,6 @@ unmigrated_commands = [
     "chroot",
     "install",
     "checksum",
-    "aportgen",
     "build",
     "deviceinfo_parse",
     "apkbuild_parse",
@@ -64,6 +64,8 @@ def run_command(args: PmbArgs):
 
     command: Command
     match args.action:
+        case "aportgen":
+            command = Aportgen(args.packages, args.fork_alpine)
         case "log":
             command = Log(args.clear_log, args.lines)
         case "index":

pmb/commands/aportgen.py

+# Copyright 2024 Stefan Hansson
+# SPDX-License-Identifier: GPL-3.0-or-later
+from __future__ import annotations
+
+import pmb.aportgen
+from pmb import commands
+from pmb.helpers import logging
+
+
+class Aportgen(commands.Command):
+    def __init__(self, package_list: list[str], fork_alpine: bool) -> None:
+        self.package_list = package_list
+        self.fork_alpine = fork_alpine
+
+    def run(self) -> None:
+        for package in self.package_list:
+            logging.info(f"Generate aport: {package}")
+            pmb.aportgen.generate(package, self.fork_alpine)

pmb/config/__init__.py

@@ -570,8 +570,8 @@ git_repos = {
         "git@gitlab.alpinelinux.org:alpine/aports.git",
     ],
     "pmaports": [
-        "https://gitlab.com/postmarketOS/pmaports.git",
-        "git@gitlab.com:postmarketos/pmaports.git",
+        "https://gitlab.postmarketos.org/postmarketOS/pmaports.git",
+        "git@gitlab.postmarketos.org:postmarketOS/pmaports.git",
     ],
 }
 

pmb/helpers/frontend.py

@@ -102,12 +102,6 @@ def _install_ondev_verify_no_rootfs(device: str, ondev_cp: list[tuple[str, str]]
     )
 
 
-def aportgen(args: PmbArgs) -> None:
-    for package in args.packages:
-        logging.info("Generate aport: " + package)
-        pmb.aportgen.generate(package, args.fork_alpine)
-
-
 def build(args: PmbArgs) -> None:
     # Strict mode: zap everything
     if args.strict: