diff options
6 files changed, 47 insertions, 4 deletions
diff --git a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend index 8ffc61c2..7b759f69 100644 --- a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend +++ b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend @@ -1,3 +1,3 @@ -DRM_LEASE_DEVICE ??= "card0-HDMI-A-1" +DRM_LEASE_DEVICE ??= "lease0" AGL_COMPOSITOR_ARGS:append = " --drm-lease=${DRM_LEASE_DEVICE}" diff --git a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bb b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bb new file mode 100644 index 00000000..6a31c4b0 --- /dev/null +++ b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bb @@ -0,0 +1,18 @@ +SUMMARY = "Configuration file for drm-lease-manager" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI = "file://drm-lease-manager.ini" + +DRM_LEASE_MANAGER_CONF_DIR := "${sysconfdir}/xdg/drm-lease-manager" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}${DRM_LEASE_MANAGER_CONF_DIR} + install -m644 ${WORKDIR}/drm-lease-manager.ini ${D}/${DRM_LEASE_MANAGER_CONF_DIR}/drm-lease-manager.ini +} + +RDEPENDS:${PN} = "drm-lease-manager" diff --git a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini new file mode 100644 index 00000000..3403b0ac --- /dev/null +++ b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini @@ -0,0 +1,3 @@ +[[lease]] +name="lease0" +connectors=["Virtual-1"] diff --git a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager/drm-lease-manager.service b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager/drm-lease-manager.service index 5dea28f9..bac6391d 100644 --- a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager/drm-lease-manager.service +++ b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager/drm-lease-manager.service @@ -4,7 +4,7 @@ After=basic.target [Service] Type=simple -ExecStart=drm-lease-manager +ExecStart=drm-lease-manager --config=/etc/xdg/drm-lease-manager/drm-lease-manager.ini Group=video UMask=0007 RuntimeDirectory=drm-lease-manager diff --git a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb index 6a79ec2e..9eaa76ed 100644 --- a/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb +++ b/meta-agl-drm-lease/recipes-graphics/drm-lease-manager/drm-lease-manager_git.bb @@ -7,7 +7,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/drm-lease-manager;protoco " PV = "0.1+git${SRCPV}" -SRCREV = "43feb8701361e43ef43460ae16b3837e97b174ed" +SRCREV = "53f4fe700dee88cc9840a91f2f297aacf05e08d4" S = "${WORKDIR}/git" @@ -15,7 +15,7 @@ inherit meson inherit systemd inherit ptest -DEPENDS = "libdrm libcheck fff" +DEPENDS = "libdrm libcheck fff tomlc99" do_install:append() { install -d ${D}/${systemd_unitdir}/system @@ -24,6 +24,7 @@ do_install:append() { } SYSTEMD_SERVICE:${PN} = "drm-lease-manager.service" +RDEPENDS:${PN} = "drm-lease-manager-init" EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Denable-tests=true', '', d)}" RDEPENDS:${PN}-ptest = "libcheck" diff --git a/meta-agl-drm-lease/recipes-support/tomlc99/tomlc99_git.bb b/meta-agl-drm-lease/recipes-support/tomlc99/tomlc99_git.bb new file mode 100644 index 00000000..6df5ae5d --- /dev/null +++ b/meta-agl-drm-lease/recipes-support/tomlc99/tomlc99_git.bb @@ -0,0 +1,21 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=95bbe2f9180443b5dcef3fb959804a65" + +SRC_URI = "git://github.com/cktan/tomlc99;protocol=https;branch=master" + +PV = "1.0+git${SRCPV}" +SRCREV = "034b23ed3e4e5ee5345040eabed470f204d7f668" + +S = "${WORKDIR}/git" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + oe_runmake install prefix=${D}/${prefix} + + ln -rs ${D}/${prefix}/lib/libtoml.so.0.0 ${D}${prefix}/lib/libtoml.so + + sed 's:^prefix=.*:prefix=${prefix}:' ${S}/libtoml.pc.sample > libtoml.pc + install -d ${D}${prefix}/lib/pkgconfig + install libtoml.pc ${D}${prefix}/lib/pkgconfig/ +} |