From 1c83105ac5593a367b85ce4e7a10cfa51c731d03 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 13 Feb 2024 08:25:47 +0100 Subject: [PATCH] wlroots: rename tinywl - rename tinywl-0.16 and tinywl-0.17 to allow install of multiple wlroots versions into the same rootfs --- recipes-wlroots/wlroots/wlroots-0.16.bb | 2 +- recipes-wlroots/wlroots/wlroots-0.17.bb | 2 +- recipes-wlroots/wlroots/wlroots_git.bb | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-wlroots/wlroots/wlroots-0.16.bb b/recipes-wlroots/wlroots/wlroots-0.16.bb index 2ac1394..d4e7440 100644 --- a/recipes-wlroots/wlroots/wlroots-0.16.bb +++ b/recipes-wlroots/wlroots/wlroots-0.16.bb @@ -49,5 +49,5 @@ EXTRA_OEMESON += "--buildtype release" do_install:append() { install -d ${D}${bindir} - install -m 0755 ${B}/tinywl/tinywl ${D}${bindir} + install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-0.16 } diff --git a/recipes-wlroots/wlroots/wlroots-0.17.bb b/recipes-wlroots/wlroots/wlroots-0.17.bb index 9721a64..035e641 100644 --- a/recipes-wlroots/wlroots/wlroots-0.17.bb +++ b/recipes-wlroots/wlroots/wlroots-0.17.bb @@ -51,5 +51,5 @@ EXTRA_OEMESON += "--buildtype release" do_install:append() { install -d ${D}${bindir} - install -m 0755 ${B}/tinywl/tinywl ${D}${bindir} + install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}/tinywl-0.17 } diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb index 53dfaf6..27c2cdf 100644 --- a/recipes-wlroots/wlroots/wlroots_git.bb +++ b/recipes-wlroots/wlroots/wlroots_git.bb @@ -44,7 +44,6 @@ PV = "0.18.0-dev" S = "${WORKDIR}/git" - inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release"