* Merge weston-config into weston-init * Drop local overrides * Avoid machine-specific changes
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/arago.conf | 1 - .../recipes-graphics/wayland/weston-conf_8.0.0.bb | 21 --------------------- .../recipes-graphics/wayland/weston-init.bbappend | 13 +++++++++---- .../{weston-conf => weston-init}/ti43x/weston.ini | 0 .../{weston-conf => weston-init}/wayland_env.sh | 0 .../wayland/{weston-conf => weston-init}/weston.ini | 0 .../recipes-graphics/wayland/weston_8.0.0.bbappend | 8 +------- .../wayland/wayland-protocols_%.bbappend | 11 +++++------ 8 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston-conf_8.0.0.bb rename meta-arago-distro/recipes-graphics/wayland/{weston-conf => weston-init}/ti43x/weston.ini (100%) rename meta-arago-distro/recipes-graphics/wayland/{weston-conf => weston-init}/wayland_env.sh (100%) rename meta-arago-distro/recipes-graphics/wayland/{weston-conf => weston-init}/weston.ini (100%) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index ac20a83..3215fe7 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -95,7 +95,6 @@ DISTRO_FEATURES_append = "${@[""," systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}" QT_PROVIDER ?= "qt5" # Distro-specific package configuration -PACKAGECONFIG_pn-weston = "egl kms launch clients" PACKAGECONFIG_append_pn-systemd = " coredump" # Configure Qt5 flags (GLES is still required for qtdeclarative and qtwebkit) diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-conf_8.0.0.bb b/meta-arago-distro/recipes-graphics/wayland/weston-conf_8.0.0.bb deleted file mode 100644 index 16cac2b..0000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston-conf_8.0.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Weston configuration files" -HOMEPAGE = "http://wayland.freedesktop.org"; -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PR = "r2" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://wayland_env.sh \ - file://weston.ini \ -" - -# Add custom Arago Wayland Environment script file -do_install () { - install -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/wayland_env.sh ${D}${sysconfdir}/profile.d/ -} - -FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini" diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend index cbe0fe3..55b191e 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend @@ -1,15 +1,20 @@ -PR_append = ".arago9" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PR_append = ".arago10" + SRC_URI_append = " \ file://runWeston \ + file://wayland_env.sh \ + file://weston.ini \ " do_install_append() { install -d ${D}${bindir} install -m 755 ${WORKDIR}/runWeston ${D}${bindir} - rm -rf ${D}${systemd_system_unitdir} + + install -d ${D}${sysconfdir}/profile.d + install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/wayland_env.sh ${D}${sysconfdir}/profile.d/ } -SYSTEMD_SERVICE_${PN} = "" +FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini" diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-conf/ti43x/weston.ini b/meta-arago-distro/recipes-graphics/wayland/weston-init/ti43x/weston.ini similarity index 100% rename from meta-arago-distro/recipes-graphics/wayland/weston-conf/ti43x/weston.ini rename to meta-arago-distro/recipes-graphics/wayland/weston-init/ti43x/weston.ini diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-conf/wayland_env.sh b/meta-arago-distro/recipes-graphics/wayland/weston-init/wayland_env.sh similarity index 100% rename from meta-arago-distro/recipes-graphics/wayland/weston-conf/wayland_env.sh rename to meta-arago-distro/recipes-graphics/wayland/weston-init/wayland_env.sh diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-conf/weston.ini b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini similarity index 100% rename from meta-arago-distro/recipes-graphics/wayland/weston-conf/weston.ini rename to meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_8.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_8.0.0.bbappend index 7a937f0..006579b 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_8.0.0.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_8.0.0.bbappend @@ -1,10 +1,6 @@ -PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/libgbm mtdev" - -PR_append = ".arago2" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN} += "weston-conf" +PR_append = ".arago3" # file://0002-weston-Allow-visual_id-to-be-0.patch SRC_URI += " \ @@ -12,5 +8,3 @@ SRC_URI += " \ file://0004-weston-Fix-touch-screen-crash-issue.patch \ file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \ " - -INHIBIT_PACKAGE_STRIP = "1" diff --git a/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend b/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend index 7edd850..c7803c3 100644 --- a/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend +++ b/meta-arago-extras/recipes-graphics/wayland/wayland-protocols_%.bbappend @@ -1,12 +1,11 @@ -PR_append = ".arago1" - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-wayland-drm-Add-wayland-drm-protocol-to-stable.patch \ - " +PR_append = ".arago2" -SRC_URI_append_j7-evm = "file://0002-wayland-drm-Update-to-version-2.patch" +SRC_URI += " \ + file://0001-wayland-drm-Add-wayland-drm-protocol-to-stable.patch \ + file://0002-wayland-drm-Update-to-version-2.patch \ +" do_install_append() { install -d ${D}${datadir}/wayland-protocols/stable/wayland-drm -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
