mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
weston-init: fix the mixed indentation
I know my text editor is going to get angry at me if this continues. (From OE-Core rev: 24fd8549273c08693078afe17a539e461a898deb) Signed-off-by: Randolph Sapp <rs@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit da6e01517336694911f5aea53d637e9c0ad72c9b) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
a3ff30cf6b
commit
916b3ccee1
@@ -25,19 +25,19 @@ DEFAULTBACKEND ??= ""
|
|||||||
DEFAULTBACKEND:qemuall ?= "drm"
|
DEFAULTBACKEND:qemuall ?= "drm"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
|
if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
|
||||||
install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
|
install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
|
||||||
sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston
|
sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston
|
||||||
fi
|
fi
|
||||||
install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
|
install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
|
||||||
install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston
|
install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston
|
||||||
|
|
||||||
# Install Weston systemd service and accompanying udev rule
|
# Install Weston systemd service and accompanying udev rule
|
||||||
install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service
|
install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service
|
||||||
install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket
|
install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket
|
||||||
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
|
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
|
||||||
install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin
|
install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin
|
||||||
fi
|
fi
|
||||||
sed -i -e s:/etc:${sysconfdir}:g \
|
sed -i -e s:/etc:${sysconfdir}:g \
|
||||||
-e s:/usr/bin:${bindir}:g \
|
-e s:/usr/bin:${bindir}:g \
|
||||||
-e s:/var:${localstatedir}:g \
|
-e s:/var:${localstatedir}:g \
|
||||||
@@ -46,7 +46,7 @@ do_install() {
|
|||||||
install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start
|
install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start
|
||||||
sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
|
sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
|
||||||
sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
|
sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
|
||||||
if [ -n "${DEFAULTBACKEND}" ]; then
|
if [ -n "${DEFAULTBACKEND}" ]; then
|
||||||
sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini
|
sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user