Add preparedepends (#65)

* Add preparedepends

* Increment version

* Formatting

* Fix tests

* Use correct image for build and prepare

* Fix switch script

* Test that preparedepends runs

Author: Eeems

docs/recipe-format.md

@@ -209,6 +209,29 @@ For example, `build:autotools` and `libvncserver>=0.9.13` are valid dependency s
 
 **Dependencies declared in the `makedepends` field are only satisfied during the build process, not at install time** — see the [`installdepends`](#installdepends-field) below for declaring install-time dependencies.
 
+#### `preparedepends` field
+
+<table>
+    <tr>
+        <th>Required?</th>
+        <td>No, defaults to <code>()</code></th>
+    </tr>
+    <tr>
+        <th>Type</th>
+        <td>Array of dependency specifications (strings)</td>
+    </tr>
+</table>
+
+The list of Debian, Toltec or Entware packages that are needed to prepare this package.
+Dependency specifications have the following format: `[host:|build:]package-name`.
+For example, `build:autotools` and `libvncserver>=0.9.13` are valid dependency specifications.
+
+*Build-type dependencies* (prefixed with `build:`) are packages from Debian to install in the container’s root system before the recipe’s build script is executed.
+
+*Host-type dependencies* (prefixed with `host:`) are packages from Toltec or Entware to install in the container’s `$SYSROOT` before the recipe’s build script is executed. The packages are offline-installed (i.e., none of their [install scripts](#install-section) are executed).
+
+**Dependencies declared in the `preparedepends` field are only satisfied during the prepare process, not at install time** — see the [`installdepends`](#installdepends-field) below for declaring install-time dependencies.
+
 #### `pkgnames` field
 
 <table>

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toltecmk"
-version = "0.4.0"
+version = "0.5.0"
 authors = [
   { name="Mattéo Delabre", email="git.matteo@delab.re" },
   { name="Eeems", email="eeems@eeems.email" },

tests/fixtures/rmkit/package

@@ -24,8 +24,10 @@ sha256sums=(
     SKIP
     SKIP
 )
+preparedepends=(build:rsync)
 
 prepare() {
+    rsync --help > /dev/null
     patch -p1 -d"$srcdir" < "$srcdir"/patch-remux-duplicate-xochitl.diff
     patch -p1 -d"$srcdir" < "$srcdir"/patch-remux-start-xochitl.diff
     rm "$srcdir"/*.diff

tests/recipe_parsers/test_parser.py

@@ -80,6 +80,7 @@ def test_basic_recipe(self) -> None:
             },
         )
         self.assertEqual(recipe.makedepends, set())
+        self.assertEqual(recipe.preparedepends, set())
         self.assertEqual(recipe.maintainer, "None <none@example.org>")
         self.assertEqual(recipe.image, "base:v2.1")
         self.assertEqual(recipe.arch, "rmall")
@@ -94,6 +95,7 @@ def test_basic_recipe(self) -> None:
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -136,6 +138,7 @@ def test_basic_recipe(self) -> None:
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -383,6 +386,7 @@ def test_split_packages(self):
 
         self.assertEqual(recipe.path, rec_path)
         self.assertEqual(recipe.makedepends, set())
+        self.assertEqual(recipe.preparedepends, set())
         self.assertEqual(recipe.maintainer, "None <none@example.org>")
         self.assertEqual(recipe.image, "base:v2.1")
         self.assertEqual(recipe.arch, "rmall")
@@ -396,6 +400,7 @@ def test_split_packages(self):
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -417,6 +422,7 @@ def test_split_packages(self):
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -457,6 +463,7 @@ def test_split_packages(self):
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -505,6 +512,7 @@ def test_split_packages(self):
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -554,6 +562,7 @@ def test_split_packages(self):
 declare -a sha256sums=([0]=SKIP)
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.org>'
 declare -- image=base:v2.1
 declare -- arch=rmall
@@ -664,6 +673,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='Mattéo Delabre <spam@delab.re>'
 declare -- image=qt:v1.1
 declare -- arch=rm1
@@ -718,6 +728,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='Mattéo Delabre <spam@delab.re>'
 declare -- image=qt:v1.1
 declare -- arch=rm1
@@ -753,6 +764,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='Mattéo Delabre <spam@delab.re>'
 declare -- image=qt:v1.1
 declare -- arch=rm1
@@ -810,6 +822,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='Mattéo Delabre <spam@delab.re>'
 declare -- image=qt:v1.1
 declare -- arch=rm1
@@ -845,6 +858,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='Mattéo Delabre <spam@delab.re>'
 declare -- image=qt:v1.1
 declare -- arch=rm1
@@ -883,6 +897,7 @@ def test_split_archs(self):
         )
         self.assertEqual(rm2.sources, set())
         self.assertEqual(rm2.makedepends, set())
+        self.assertEqual(rm2.preparedepends, set())
         self.assertEqual(rm2.maintainer, "None <none@example.com>")
         self.assertEqual(rm2.image, "qt:v1.3")
         self.assertEqual(rm2.arch, "rm2")
@@ -897,6 +912,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.com>'
 declare -- image=qt:v1.3
 declare -- arch=rm2
@@ -954,6 +970,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.com>'
 declare -- image=qt:v1.3
 declare -- arch=rm2
@@ -989,6 +1006,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.com>'
 declare -- image=qt:v1.3
 declare -- arch=rm2
@@ -1049,6 +1067,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.com>'
 declare -- image=qt:v1.3
 declare -- arch=rm2
@@ -1084,6 +1103,7 @@ def test_split_archs(self):
 declare -a sha256sums=()
 declare -a noextract=()
 declare -a makedepends=()
+declare -a preparedepends=()
 declare -- maintainer='None <none@example.com>'
 declare -- image=qt:v1.3
 declare -- arch=rm2

tests/test_recipe.py

@@ -20,6 +20,7 @@ def test_derived_fields(self) -> None:
             timestamp=datetime.now(),
             sources=set(),
             makedepends=set(),
+            preparedepends=set(),
             maintainer="Test <test@example.com>",
             image="",
             arch="armv7-3.2",