diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-01 10:27:11 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:39 -0400 |
commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 (patch) | |
tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 /import-layers/yocto-poky/meta/recipes-graphics/packagegroups | |
parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 (diff) | |
download | talos-openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.tar.gz talos-openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.zip |
Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/packagegroups')
2 files changed, 7 insertions, 4 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index 6b5002856..97dcac5f7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb @@ -11,7 +11,7 @@ inherit packagegroup distro_features_check # rdepends on XSERVER REQUIRED_DISTRO_FEATURES = "x11" -XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" +XSERVER ?= "xserver-xorg xf86-video-fbdev" XSERVERCODECS ?= "" RDEPENDS_${PN} = "\ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 42914246d..001db9e5e 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -5,13 +5,12 @@ PR = "r40" inherit packagegroup distro_features_check -# rdepends on x11-common REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-utils" -# xserver-common, x11-common -VIRTUAL-RUNTIME_xserver_common ?= "x11-common" +# backwards compatibility for xserver-common +VIRTUAL-RUNTIME_xserver_common ?= "" # elsa, xserver-nodm-init VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" @@ -30,4 +29,8 @@ RDEPENDS_${PN}-utils = "\ xhost \ xset \ xrandr \ + xmodmap \ + xdpyinfo \ + xinput-calibrator \ + dbus-x11 \ " |