| Message ID | 20220720084442.2940187-10-alex@linutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/51] sato-icon-theme: check for new commits rather than tags | expand |
Hello, On 20/07/2022 10:44:01+0200, Alexander Kanavin wrote: > It has been superseded by libinput/evdev on Linux, and upstream specifically > errors out on Linux in latest release: > https://github.com/freedesktop/xorg-xf86-input-keyboard/commit/7e366936d7b7d6c3b4d9c1554908ad20eef74a27 > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > .../conf/distro/include/poky-floating-revisions.inc | 2 -- > meta/conf/distro/include/maintainers.inc | 1 - > .../xorg-driver/xf86-input-keyboard_1.9.0.bb | 13 ------------- > 3 files changed, 16 deletions(-) > delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb > > diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc > index 6f473de88c..0cc4e005b9 100644 > --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc > +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc > @@ -43,8 +43,6 @@ SRCREV:pn-xf86-input-evdev = "${AUTOREV}" > #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" > SRCREV:pn-xf86-input-mouse = "${AUTOREV}" > #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" > -SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" > -#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" > SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" > #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" This patch doesn't apply because of this hunk. > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc > index ac1a1ea1a7..e20275c674 100644 > --- a/meta/conf/distro/include/maintainers.inc > +++ b/meta/conf/distro/include/maintainers.inc > @@ -841,7 +841,6 @@ RECIPE_MAINTAINER:pn-xdpyinfo = "Unassigned <unassigned@yoctoproject.org>" > RECIPE_MAINTAINER:pn-xev = "Unassigned <unassigned@yoctoproject.org>" > RECIPE_MAINTAINER:pn-xeyes = "Unassigned <unassigned@yoctoproject.org>" > RECIPE_MAINTAINER:pn-xf86-input-evdev = "Unassigned <unassigned@yoctoproject.org>" > -RECIPE_MAINTAINER:pn-xf86-input-keyboard = "Unassigned <unassigned@yoctoproject.org>" > RECIPE_MAINTAINER:pn-xf86-input-libinput = "Unassigned <unassigned@yoctoproject.org>" > RECIPE_MAINTAINER:pn-xf86-input-mouse = "Unassigned <unassigned@yoctoproject.org>" > RECIPE_MAINTAINER:pn-xf86-input-synaptics = "Unassigned <unassigned@yoctoproject.org>" > diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb > deleted file mode 100644 > index 1896fff9f9..0000000000 > --- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb > +++ /dev/null > @@ -1,13 +0,0 @@ > -require xorg-driver-input.inc > - > -SUMMARY = "X.Org X server -- keyboard input driver" > - > -DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ > -driver supports the standard OS-provided keyboard interface. The driver \ > -functions as a keyboard input device, and may be used as the X server's \ > -core keyboard." > - > -LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10" > - > -SRC_URI[md5sum] = "a3a3f0dd32361dcdbd406e894dafe090" > -SRC_URI[sha256sum] = "f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388" > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#168304): https://lists.openembedded.org/g/openembedded-core/message/168304 > Mute This Topic: https://lists.openembedded.org/mt/92500539/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, 20 Jul 2022 at 11:58, Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc > > index 6f473de88c..0cc4e005b9 100644 > > --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc > > +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc > > @@ -43,8 +43,6 @@ SRCREV:pn-xf86-input-evdev = "${AUTOREV}" > > #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" > > SRCREV:pn-xf86-input-mouse = "${AUTOREV}" > > #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" > > -SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" > > -#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" > > SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" > > #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" > > This patch doesn't apply because of this hunk. Can you cherry-pick from https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/package-version-updates instead? Alex
On 20/07/2022 12:09:20+0200, Alexander Kanavin wrote: > On Wed, 20 Jul 2022 at 11:58, Alexandre Belloni > <alexandre.belloni@bootlin.com> wrote: > > > diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc > > > index 6f473de88c..0cc4e005b9 100644 > > > --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc > > > +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc > > > @@ -43,8 +43,6 @@ SRCREV:pn-xf86-input-evdev = "${AUTOREV}" > > > #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" > > > SRCREV:pn-xf86-input-mouse = "${AUTOREV}" > > > #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" > > > -SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" > > > -#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" > > > SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" > > > #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" > > > > This patch doesn't apply because of this hunk. > > Can you cherry-pick from > https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/package-version-updates > instead? > I can but it doesn't change that the whole patch can't be applied because a hunk is for meta-yocto and the others are for oe-core so this has to be split as we are not applying patches on poky directly.
On Wed, 20 Jul 2022 at 14:11, Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > I can but it doesn't change that the whole patch can't be applied > because a hunk is for meta-yocto and the others are for oe-core so this > has to be split as we are not applying patches on poky directly. Right, I misunderstood what the problem was. I split the patch and sent the core bit here, and the poky bit to poky list. Alex
diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc index 6f473de88c..0cc4e005b9 100644 --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -43,8 +43,6 @@ SRCREV:pn-xf86-input-evdev = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" SRCREV:pn-xf86-input-mouse = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" -SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index ac1a1ea1a7..e20275c674 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -841,7 +841,6 @@ RECIPE_MAINTAINER:pn-xdpyinfo = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-xev = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-xeyes = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-xf86-input-evdev = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER:pn-xf86-input-keyboard = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-xf86-input-libinput = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-xf86-input-mouse = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-xf86-input-synaptics = "Unassigned <unassigned@yoctoproject.org>" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb deleted file mode 100644 index 1896fff9f9..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- keyboard input driver" - -DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ -driver supports the standard OS-provided keyboard interface. The driver \ -functions as a keyboard input device, and may be used as the X server's \ -core keyboard." - -LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10" - -SRC_URI[md5sum] = "a3a3f0dd32361dcdbd406e894dafe090" -SRC_URI[sha256sum] = "f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388"
It has been superseded by libinput/evdev on Linux, and upstream specifically errors out on Linux in latest release: https://github.com/freedesktop/xorg-xf86-input-keyboard/commit/7e366936d7b7d6c3b4d9c1554908ad20eef74a27 Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../conf/distro/include/poky-floating-revisions.inc | 2 -- meta/conf/distro/include/maintainers.inc | 1 - .../xorg-driver/xf86-input-keyboard_1.9.0.bb | 13 ------------- 3 files changed, 16 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb