matchbox-wm: Remove x-session-manager handling
Windows manager should be independent on session manager, especially when we have multiple session manager like mini-x and matchbox session. This commit remove session-manager stuff in matchbox-wm, as matchbox-session already has duplicated code. Also adjust alternative priority for mini-X to make it higher priority over matchbox-session. (From OE-Core rev: c3400040fdce8c049b51a8acb06eb2e92f9426d1) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
198f2ac06e
commit
c226ccb906
|
@ -2,7 +2,7 @@ SECTION = "x11/wm"
|
||||||
DESCRIPTION = "Matchbox window manager"
|
DESCRIPTION = "Matchbox window manager"
|
||||||
LICENSE = "GPLv2.0+"
|
LICENSE = "GPLv2.0+"
|
||||||
DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
|
DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
|
||||||
PR = "r4"
|
PR = "r5"
|
||||||
|
|
||||||
SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
|
SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
|
||||||
file://configure_fix.patch \
|
file://configure_fix.patch \
|
||||||
|
@ -11,7 +11,7 @@ SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/match
|
||||||
|
|
||||||
S = "${WORKDIR}/matchbox-window-manager-${PV}"
|
S = "${WORKDIR}/matchbox-window-manager-${PV}"
|
||||||
|
|
||||||
inherit autotools pkgconfig update-alternatives
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
FILES_${PN} = "${bindir}/* \
|
FILES_${PN} = "${bindir}/* \
|
||||||
${datadir}/matchbox \
|
${datadir}/matchbox \
|
||||||
|
@ -20,11 +20,6 @@ FILES_${PN} = "${bindir}/* \
|
||||||
${datadir}/themes/Default/matchbox \
|
${datadir}/themes/Default/matchbox \
|
||||||
${datadir}/themes/MBOpus/matchbox"
|
${datadir}/themes/MBOpus/matchbox"
|
||||||
|
|
||||||
ALTERNATIVE_NAME = "x-session-manager"
|
|
||||||
ALTERNATIVE_LINK = "${bindir}/x-session-manager"
|
|
||||||
ALTERNATIVE_PATH = "${bindir}/matchbox-session"
|
|
||||||
ALTERNATIVE_PRIORITY = "10"
|
|
||||||
|
|
||||||
EXTRA_OECONF = " --enable-startup-notification \
|
EXTRA_OECONF = " --enable-startup-notification \
|
||||||
--disable-xrm \
|
--disable-xrm \
|
||||||
--enable-expat \
|
--enable-expat \
|
||||||
|
|
|
@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
|
||||||
|
|
||||||
SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3"
|
SRCREV = "f4394eaed475de6e627d373c5b35ee2cf87072e3"
|
||||||
PV = "1.2+git${SRCPV}"
|
PV = "1.2+git${SRCPV}"
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
|
SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
|
||||||
file://configure_fix.patch;maxrev=1818 \
|
file://configure_fix.patch;maxrev=1818 \
|
||||||
|
@ -20,12 +20,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=git \
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit autotools pkgconfig update-alternatives
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
ALTERNATIVE_NAME = "x-session-manager"
|
|
||||||
ALTERNATIVE_LINK = "${bindir}/x-session-manager"
|
|
||||||
ALTERNATIVE_PATH = "${bindir}/matchbox-session"
|
|
||||||
ALTERNATIVE_PRIORITY = "10"
|
|
||||||
|
|
||||||
FILES_${PN} = "${bindir}/* \
|
FILES_${PN} = "${bindir}/* \
|
||||||
${datadir}/matchbox \
|
${datadir}/matchbox \
|
||||||
|
|
|
@ -16,7 +16,7 @@ inherit update-alternatives
|
||||||
ALTERNATIVE_NAME = "x-session-manager"
|
ALTERNATIVE_NAME = "x-session-manager"
|
||||||
ALTERNATIVE_LINK = "${bindir}/x-session-manager"
|
ALTERNATIVE_LINK = "${bindir}/x-session-manager"
|
||||||
ALTERNATIVE_PATH = "${bindir}/mini-x-session"
|
ALTERNATIVE_PATH = "${bindir}/mini-x-session"
|
||||||
ALTERNATIVE_PRIORITY = "10"
|
ALTERNATIVE_PRIORITY = "50"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}/${bindir}
|
install -d ${D}/${bindir}
|
||||||
|
|
Loading…
Reference in New Issue