* This is required when configuration files differ between machines to keep the weston package from becoming machine-specific.
Signed-off-by: Jacob Stiffler <[email protected]> --- .../wayland/{weston => weston-conf}/wayland_env.sh | 0 .../wayland/{weston => weston-conf}/weston.ini | 0 ...{weston_1.9.0.bbappend => weston-conf_1.9.0.bb} | 22 ++++++++-------------- .../recipes-graphics/wayland/weston_1.9.0.bbappend | 18 ++---------------- 4 files changed, 10 insertions(+), 30 deletions(-) rename meta-arago-distro/recipes-graphics/wayland/{weston => weston-conf}/wayland_env.sh (100%) rename meta-arago-distro/recipes-graphics/wayland/{weston => weston-conf}/weston.ini (100%) copy meta-arago-distro/recipes-graphics/wayland/{weston_1.9.0.bbappend => weston-conf_1.9.0.bb} (29%) diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh b/meta-arago-distro/recipes-graphics/wayland/weston-conf/wayland_env.sh similarity index 100% rename from meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh rename to meta-arago-distro/recipes-graphics/wayland/weston-conf/wayland_env.sh diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/weston.ini b/meta-arago-distro/recipes-graphics/wayland/weston-conf/weston.ini similarity index 100% rename from meta-arago-distro/recipes-graphics/wayland/weston/weston.ini rename to meta-arago-distro/recipes-graphics/wayland/weston-conf/weston.ini diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-conf_1.9.0.bb similarity index 29% copy from meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend copy to meta-arago-distro/recipes-graphics/wayland/weston-conf_1.9.0.bb index 4aff58d..7c22282 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston-conf_1.9.0.bb @@ -1,23 +1,17 @@ -# When configured for fbdev compositor, make it the default -PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev" +SUMMARY = "Weston configuration files" +HOMEPAGE = "http://wayland.freedesktop.org"; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR_append = "-arago0" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://wayland_env.sh \ - file://weston.ini \ +SRC_URI = "file://wayland_env.sh \ + file://weston.ini \ " # Add custom Arago Wayland Environment script file -do_install_append () { +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/ } -PACKAGES += "${PN}-conf" - -FILES_${PN}-conf += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini" -RDEPENDS_${PN} += "${PN}-conf" +FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini" diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend index 4aff58d..92c143d 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.9.0.bbappend @@ -2,22 +2,8 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev" -PR_append = "-arago0" +PR_append = "-arago1" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://wayland_env.sh \ - file://weston.ini \ -" - -# Add custom Arago Wayland Environment script file -do_install_append () { - 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/ -} - -PACKAGES += "${PN}-conf" - -FILES_${PN}-conf += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini" -RDEPENDS_${PN} += "${PN}-conf" +RDEPENDS_${PN} += "weston-conf" -- 1.9.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
