mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 12:59:03 +02:00
Merge pull request #54 from mickey-happygolucky/morty
modify to use xf86-input-libinput
This commit is contained in:
commit
a1311ee550
|
@ -1,40 +0,0 @@
|
|||
#
|
||||
# Catch-all evdev loader for udev-based systems
|
||||
# We don't simply match on any device since that also adds accelerometers
|
||||
# and other devices that we don't really want to use. The list below
|
||||
# matches everything but joysticks.
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "evdev pointer catchall"
|
||||
MatchIsPointer "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "evdev"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "evdev keyboard catchall"
|
||||
MatchIsKeyboard "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "evdev"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "evdev touchpad catchall"
|
||||
MatchIsTouchpad "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "evdev"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "evdev tablet catchall"
|
||||
MatchIsTablet "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "evdev"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "evdev touchscreen catchall"
|
||||
MatchIsTouchscreen "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "evdev"
|
||||
EndSection
|
|
@ -1,19 +1,17 @@
|
|||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \
|
||||
file://xorg.conf.d/98-pitft.conf \
|
||||
file://xorg.conf.d/99-calibration.conf \
|
||||
"
|
||||
SRC_URI_append_rpi = " \
|
||||
file://xorg.conf.d/98-pitft.conf \
|
||||
file://xorg.conf.d/99-calibration.conf \
|
||||
"
|
||||
|
||||
do_install_append_rpi () {
|
||||
install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
install -m 0644 ${WORKDIR}/xorg.conf.d/10-evdev.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
|
||||
PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
|
||||
if [ "${PITFT}" = "1" ]; then
|
||||
install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
fi
|
||||
PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
|
||||
if [ "${PITFT}" = "1" ]; then
|
||||
install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
|
||||
fi
|
||||
}
|
||||
|
||||
FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*"
|
||||
|
|
|
@ -7,3 +7,5 @@ PACKAGECONFIG_rpi ?= " \
|
|||
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \
|
||||
"
|
||||
|
||||
XSERVER_RRECOMMENDS_append = " xf86-input-libinput"
|
||||
|
|
Loading…
Reference in New Issue
Block a user