Merge pull request #133 from jkloetzke/prj-blueprint

Adaptations to get xorg and weston running on x86

Author: jkloetzke

classes/init.yaml

@@ -1,3 +1,11 @@
+Config:
+    CONFIG_INIT:
+        type: choice
+        choice:
+            systemd:
+            sysvinit/sysv:
+            sysvinit/busybox:
+
 buildVars: [CONFIG_INIT]
 buildSetup: |
     # Checks if the init system is the sysv sysvinit variant.
@@ -17,3 +25,9 @@ buildSetup: |
     {
         [[ ${CONFIG_INIT:-} == "sysvinit" ]] || initIsSysvinitSysv || initIsSysvinitBusybox
     }
+
+    # Check if the init system is systemd
+    initIsSystemd()
+    {
+        [[ ${CONFIG_INIT:-} == systemd ]]
+    }

classes/xorg/font-util.yaml

@@ -0,0 +1,10 @@
+depends:
+    - tools:
+          target-toolchain: host-compat-toolchain
+      use: [tools]
+      depends:
+          - graphics::fonts::font-util
+
+buildTools: [fontUtil]
+buildScript: |
+    PKG_CONFIG_LIBDIR+=":${BOB_TOOL_PATHS[fontUtil]}/../lib/pkgconfig"

recipes/core/dbus.yaml

@@ -1,4 +1,4 @@
-inherit: [meson]
+inherit: [meson, init]
 
 metaEnvironment:
     PKG_DESCRIPTION: "D-Bus is a simple system for interprocess communication and coordination."
@@ -13,6 +13,12 @@ depends:
           - libs::expat-tgt
           - libs::glib-tgt
 
+    - if: "$(eq,${CONFIG_INIT:-},systemd)"
+      depends:
+          - core::systemd-libsystemd-dev
+          - use: []
+            name: core::systemd-libsystemd-tgt
+
 checkoutSCM:
     scm: url
     url: https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_VERSION}.tar.xz
@@ -27,8 +33,6 @@ Config:
 buildVars: [DBUS_DEBUG]
 buildScript: |
     CONFIG_OPTS=(\
-        "-Ddatadir=/etc"        \
-        "-Dsysconfdir=/legacy" \
         "-Dinotify=enabled"        \
         "-Dxml_docs=disabled"      \
         "-Ddoxygen_docs=disabled"  \
@@ -43,12 +47,34 @@ buildScript: |
     else
         CONFIG_OPTS+=("-Dstats=false")
     fi
+
+    if initIsSystemd ; then
+        CONFIG_OPTS+=(
+            -Dsystemd=enabled
+            -Dsystemd_system_unitdir=/usr/lib/systemd/system
+            -Dsystemd_user_unitdir=/usr/lib/systemd/user
+        )
+    else
+        CONFIG_OPTS+=( -Dsystemd=disabled )
+    fi
+
     mesonBuild $1 ${CONFIG_OPTS[@]}
 
 multiPackage:
+    "":
+        depends:
+            - use: []
+              name: core::dbus-tgt
+        packageScript: |
+            mesonPackageBin
+            mkdir -p .bob
+            cat >.bob/dbus.user-table <<EOF
+            messagebus -1 messagebus -1 * /run/dbus - dbus DBus messagebus user
+            EOF
+        provideDeps: [ "*-tgt" ]
     dev:
         provideDeps: ['*-dev']
         packageScript: mesonPackageDev $1 "/usr/lib/dbus-1.0/***"
     tgt:
         provideDeps: ['*-tgt']
-        packageScript: mesonPackageTgt
+        packageScript: mesonPackageLib

recipes/core/seatd.yaml

@@ -1,21 +1,32 @@
 inherit: [meson, init]
 
 metaEnvironment:
-    PKG_VERSION: "0.8.0"
+    PKG_VERSION: "0.9.1"
     PKG_LICENSE: "MIT"
 
+depends:
+    - if: "$(eq,${CONFIG_INIT:-}-${SYSTEMD_LOGIND:-},systemd-1)"
+      depends:
+          - core::systemd-libsystemd-dev
+          - use: []
+            name: core::systemd-libsystemd-tgt
+
+privateEnvironment:
+    ENABLE_LOGIND: "$(if-then-else,$(eq,${CONFIG_INIT:-}-${SYSTEMD_LOGIND:-},systemd-1),systemd,disabled)"
+
 checkoutSCM:
     scm: url
     url: https://git.sr.ht/~kennylevinsen/seatd/archive/${PKG_VERSION}.tar.gz
-    digestSHA1: e33c99d9b0dce48f82618de2849ef3128305d28a
+    digestSHA1: cde15ad79adf2de055c717ea31b1e1e8ba230b6b
     stripComponents: 1
 
+buildVars: [ENABLE_LOGIND]
 buildScript: |
     mesonBuild $1 \
         -Dman-pages=disabled \
         -Dexamples=disabled \
         -Dwerror=false \
-        -Dlibseat-logind=disabled \
+        -Dlibseat-logind=$ENABLE_LOGIND \
         -Dlibseat-builtin=enabled
 
     # add init script
@@ -32,9 +43,10 @@ multiPackage:
         multiPackage:
             dev:
                 packageScript: mesonPackageDev
+                provideDeps: [ "core::systemd-libsystemd-dev" ]
             tgt:
                 depends:
                     - name: core::seatd
                       use: []
                 packageScript: mesonPackageLib
-                provideDeps: [ "core::seatd" ]
+                provideDeps: [ "core::seatd", "core::systemd-libsystemd-tgt" ]

recipes/core/systemd.yaml

@@ -48,9 +48,15 @@ depends:
           - kernel::kmod-lib-tgt
           - libs::libxcrypt-tgt
 
+    - if: "$SYSTEMD_LOGIND"
+      depends:
+          - core::linux-pam-dev
+          - use: []
+            name: core::linux-pam-tgt
+
 checkoutSCM:
     scm: url
-    url: https://github.com/systemd/systemd/archive/refs/tags/${PKG_VERSION}.tar.gz
+    url: ${GITHUB_MIRROR}/systemd/systemd/archive/refs/tags/${PKG_VERSION}.tar.gz
     digestSHA1: 508c4cae4a78fb84d2daf0fe31412cc5c6177460
     stripComponents: 1
 
@@ -86,6 +92,7 @@ buildScript: |
         -Dnologin-path=/usr/sbin/nologin
 
         # Feature switches
+        -Dpam=${BOOL[$SYSTEMD_LOGIND]}
         -Danalyze=${BOOL[$SYSTEMD_ANALYZE]}
         -Dcoredump=${BOOL[$SYSTEMD_COREDUMP]}
         -Dhwdb=${BOOL[$SYSTEMD_HWDB]}

recipes/graphics/fonts/font-util.yaml

@@ -16,17 +16,18 @@ checkoutSCM:
 buildScript: |
     autotoolsBuild $1
 
-multiPackage:
-    dev:
-        packageScript: autotoolsPackageDev $1 "/usr/share/***"
+packageScript: |
+    # The tools need to be accompanied by the .pc-file and other data...
+    autotoolsPackageDev
+    autotoolsPackageTgt
 
-    tgt:
-        packageScript: autotoolsPackageTgt $1 "/usr/share/***"
-    "":
-        depends:
-            - name: graphics::fonts::font-util-tgt
-              use: []
-        provideDeps: ['*-tgt']
-        packageScript: autotoolsPackageBin $1
-        provideTools:
-            fontUtil: "usr/bin"
+    # Workaround so that 'fontrootdir' is not affected by pc-file
+    # relocation.
+    sed -i -e '/^prefix=/c prefix=/dummy' \
+           -e '/^libdir=/c libdir=${prefix}/lib' \
+           -e '/^datarootdir=/c datarootdir=/usr/share' \
+           -e '/^mapdir=/c mapdir=/dummy/share/fonts/X11/util' \
+        usr/lib/pkgconfig/fontutil.pc
+
+provideTools:
+    fontUtil: "usr/bin"

recipes/graphics/fonts/xorg/alias.yaml

@@ -0,0 +1,29 @@
+inherit: [autotools, "xorg::font-util"]
+
+metaEnvironment:
+    PKG_VERSION: "1.0.5"
+    PKG_LICENSE: LicenseRef-xorg-font-alias
+    PKG_LICENSE_PATH: |
+        xorg-font-alias:COPYING
+
+checkoutSCM:
+    scm: url
+    url: https://xorg.freedesktop.org/releases/individual/font/font-alias-${PKG_VERSION}.tar.xz
+    digestSHA256: 9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e
+    stripComponents: 1
+
+depends:
+    - tools:
+          target-toolchain: host-compat-toolchain
+      use: [tools]
+      depends:
+          - graphics::xorg::utils::bdftopcf
+
+    - graphics::xorg::utils::util-macros-dev
+
+buildTools: [bdftopcf]
+buildScript: |
+    autotoolsBuild "$1"
+
+packageScript: |
+    autotoolsPackageTgt

recipes/graphics/fonts/xorg/cursor-misc.yaml

@@ -0,0 +1,29 @@
+inherit: [autotools, "xorg::font-util"]
+
+metaEnvironment:
+    PKG_VERSION: "1.0.4"
+    PKG_LICENSE: LicenseRef-xorg-font-cursor-misc
+    PKG_LICENSE_PATH: |
+        xorg-font-cursor-misc:COPYING
+
+checkoutSCM:
+    scm: url
+    url: https://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-${PKG_VERSION}.tar.xz
+    digestSHA256: 25d9c9595013cb8ca08420509993a6434c917e53ca1fec3f63acd45a19d4f982
+    stripComponents: 1
+
+depends:
+    - tools:
+          target-toolchain: host-compat-toolchain
+      use: [tools]
+      depends:
+          - graphics::xorg::utils::bdftopcf
+
+    - graphics::xorg::utils::util-macros-dev
+
+buildTools: [bdftopcf]
+buildScript: |
+    autotoolsBuild "$1"
+
+packageScript: |
+    autotoolsPackageTgt

recipes/graphics/fonts/xorg/misc-misc.yaml

@@ -0,0 +1,29 @@
+inherit: [autotools, "xorg::font-util"]
+
+metaEnvironment:
+    PKG_VERSION: "1.1.3"
+    PKG_LICENSE: LicenseRef-xorg-font-misc-misc
+    PKG_LICENSE_PATH: |
+        xorg-font-misc-misc:COPYING
+
+checkoutSCM:
+    scm: url
+    url: https://xorg.freedesktop.org/releases/individual/font/font-misc-misc-${PKG_VERSION}.tar.xz
+    digestSHA256: 79abe361f58bb21ade9f565898e486300ce1cc621d5285bec26e14b6a8618fed
+    stripComponents: 1
+
+depends:
+    - tools:
+          target-toolchain: host-compat-toolchain
+      use: [tools]
+      depends:
+          - graphics::xorg::utils::bdftopcf
+
+    - graphics::xorg::utils::util-macros-dev
+
+buildTools: [bdftopcf]
+buildScript: |
+    autotoolsBuild "$1"
+
+packageScript: |
+    autotoolsPackageTgt

recipes/graphics/wayland/weston.yaml

@@ -68,12 +68,11 @@ buildScript: |
         -Dbackend-drm=true \
         -Drenderer-gl=true
 
-        # install profile file
-        install -D -m 0644 $<@weston/weston.sh@> \
-            install/etc/profile.d/weston.sh
-
         # add init script
         if initIsAnySysvinit; then
+            # install profile file
+            install -D -m 0644 $<@weston/weston.sh@> \
+                install/etc/profile.d/weston.sh
             install -D -m 0755 $<@weston/S80weston.sh@> \
                 install/etc/init.d/S80weston.sh
         fi