bootstrap: Move kmscube to x11-apps.yml

managarm · Oct 24, 2024 · ab97e7e · ab97e7e
1 parent 50826a9
commit ab97e7e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 40 deletions.
diff --git a/bootstrap.d/x11-apps.yml b/bootstrap.d/x11-apps.yml
@@ -506,3 +506,42 @@ packages:
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
         quiet: true
+
+  - name: kmscube
+    source:
+      rolling_version: true
+      version: '0.0pl@ROLLING_ID@'
+      subdir: 'ports'
+      git: 'https://gitlab.freedesktop.org/mesa/kmscube.git'
+      branch: 'master'
+      commit: b235bae4c674b6ef4ac15a40b46000876bee9425
+      tools_required:
+        - host-autoconf-v2.69
+        - host-automake-v1.15
+        - host-pkg-config
+      regenerate:
+        - args: ['./autogen.sh']
+          environ:
+            'NOCONFIGURE': 'yes'
+    tools_required:
+      - host-pkg-config
+      - system-gcc
+    pkgs_required:
+      - mlibc
+      - mesa
+    revision: 9
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=@OPTION:arch-triple@'
+        - '--prefix=/usr'
+        environ:
+          CFLAGS: '-O0 -g -Wall -Wextra -std=c99 -fcommon'
+          PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
+          PKG_CONFIG_LIBDIR: '@BUILD_ROOT@/system-root/usr/lib/pkgconfig:@BUILD_ROOT@/system-root/usr/share/pkgconfig'
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
+        quiet: true
diff --git a/bootstrap.yml b/bootstrap.yml
@@ -81,43 +81,3 @@ declare_options:
     default: x86_64-managarm
   - name: mount-using
     default: guestfs
-
-packages:
-  - name: kmscube
-    source:
-      rolling_version: true
-      version: '0.0pl@ROLLING_ID@'
-      subdir: 'ports'
-      git: 'https://gitlab.freedesktop.org/mesa/kmscube.git'
-      branch: 'master'
-      commit: b235bae4c674b6ef4ac15a40b46000876bee9425
-      tools_required:
-        - host-autoconf-v2.69
-        - host-automake-v1.15
-        - host-pkg-config
-      regenerate:
-        - args: ['./autogen.sh']
-          environ:
-            'NOCONFIGURE': 'yes'
-    tools_required:
-      - host-pkg-config
-      - system-gcc
-    pkgs_required:
-      - mlibc
-      - mesa
-    revision: 9
-    configure:
-      - args:
-        - '@THIS_SOURCE_DIR@/configure'
-        - '--host=@OPTION:arch-triple@'
-        - '--prefix=/usr'
-        environ:
-          CFLAGS: '-O0 -g -Wall -Wextra -std=c99 -fcommon'
-          PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
-          PKG_CONFIG_LIBDIR: '@BUILD_ROOT@/system-root/usr/lib/pkgconfig:@BUILD_ROOT@/system-root/usr/share/pkgconfig'
-    build:
-      - args: ['make', '-j@PARALLELISM@']
-      - args: ['make', 'install']
-        environ:
-          DESTDIR: '@THIS_COLLECT_DIR@'
-        quiet: true