Merge pull request #1382 from eric-ch/vglass

vglass: replace surfman/input-server with vglass

Author: jandryuk

conf/layer.conf

@@ -42,4 +42,5 @@ LAYERDEPENDS_xenclient-oe = " \
     meta-python \
     openembedded-layer \
     core \
+    vglass \
 "

conf/machine/xenclient-dom0.conf

@@ -11,8 +11,6 @@ PREFERRED_PROVIDER_libgl1 = "nvidia-lib"
 MACHINE_FEATURES = "screen keyboard ethernet pci usbhost acpi ext2 x86"
 MACHINE_FEATURES += "rtc"
 
-module_conf_i915 = "options i915 enable_psr=0"
-
 KERNEL_MODULE_PROBECONF += " \
     i915 \
 "
@@ -22,3 +20,5 @@ KERNEL_MODULE_AUTOLOAD += " \
     hid-multitouch \
     txt \
 "
+
+PREFERRED_PROVIDER_virtual/libivc = "libivc2"

conf/machine/xenclient-stubdomain.conf

@@ -9,3 +9,5 @@ require xenclient-common.conf
 MACHINE_FEATURES = "screen keyboard ethernet pci acpi ext2 x86"
 
 USE_VT = "0"
+
+PREFERRED_PROVIDER_virtual/libivc = "libivc"

conf/machine/xenclient-uivm.conf

@@ -9,3 +9,8 @@ require xenclient-common.conf
 MACHINE_FEATURES = "screen keyboard ethernet pci acpi ext2 x86"
 
 USE_VT = "0"
+
+module_conf_xen-fbfront = "blacklist xen-fbfront"
+KERNEL_MODULE_PROBECONF += " \
+    xen-fbfront \
+"

recipes-core/images/xenclient-dom0-image.bb

@@ -31,6 +31,7 @@ BAD_RECOMMENDATIONS += " \
     avahi-daemon \
     avahi-autoipd \
     ${@bb.utils.contains('IMAGE_FEATURES', 'web-certificates', '', 'ca-certificates', d)} \
+    libivc \
 "
 
 IMAGE_INSTALL += "\

recipes-core/images/xenclient-stubdomain-initramfs-image.bb

@@ -10,6 +10,10 @@ IMAGE_FSTYPES = "cpio.gz"
 
 COMPATIBLE_MACHINE = "(xenclient-stubdomain)"
 
+BAD_RECOMMENDATIONS += " \
+    libivc2 \
+"
+
 IMAGE_INSTALL = " \
     busybox \
     bridge-utils \

recipes-core/images/xenclient-uivm-image.bb

@@ -45,8 +45,8 @@ XSERVER = " \
     xserver-xorg \
     xf86-input-evdev \
     xf86-input-mouse \
-    xf86-video-fbdev \
     xf86-input-keyboard \
+    xf86-video-openxtfb \
 "
 
 IMAGE_INSTALL += "\
@@ -55,7 +55,6 @@ IMAGE_INSTALL += "\
     packagegroup-xenclient-xfce-minimal \
     openssh \
     packagegroup-base \
-    xenfb2 \
     kernel-modules \
     argo-module \
     libargo \
@@ -89,7 +88,6 @@ IMAGE_INSTALL += "\
     glibc-gconv-libjis \
     glibc-gconv-euc-jp \
     mobile-broadband-provider-info \
-    shutdown-screen \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
     uim \
@@ -98,6 +96,7 @@ IMAGE_INSTALL += "\
     anthy \
     matchbox-keyboard \
     matchbox-keyboard-im \
+    kernel-module-openxtfb \
 "
 
 require xenclient-version.inc

recipes-core/initrdscripts/initramfs-stubdomain/init.sh

@@ -33,10 +33,6 @@ exec 0< /dev/hvc0
 exec 1> /dev/hvc0
 exec 2> /dev/hvc0
 
-## the modprobe of busybox-static is broken
-## so we have to use insmod directly
-insmod /lib/modules/`uname -r`/extra/xen-argo.ko
-
 sync
 mkdir -p /proc /sys /mnt /tmp
 mount -t proc proc /proc
@@ -52,6 +48,9 @@ for arg in $KERNEL_CMDLINE; do
     esac
 done
 
+modprobe xen-argo
+modprobe ivc
+
 if [ "${LOGLVL}" = "debug" ]; then
     cut -f1,2,3,4,5 -d ' ' /proc/modules
 fi

recipes-core/packagegroups/packagegroup-xenclient-dom0.bb

@@ -40,7 +40,6 @@ RDEPENDS_${PN} = " \
     ovmf-firmware \
     xcpmd \
     xen-vif-scripts-dom0 \
-    xenclient-input-daemon \
     xenclient-dom0-tweaks \
     xenclient-splash-images \
     xenclient-config-access \
@@ -94,16 +93,13 @@ RDEPENDS_${PN} = " \
     libicbinn-server \
     screen \
     xenclient-pcrdiff \
-    drm-surfman-plugin \
     eject \
     linux-input \
     iputils-ping \
     vusb-daemon \
     xenmgr-data \
     updatemgr \
     uid \
-    surfman \
-    linuxfb-surfman-plugin \
     xenmgr \
     xen-tools-xenstore \
     tpm2-tss \
@@ -112,6 +108,8 @@ RDEPENDS_${PN} = " \
     pesign \
     ipxe \
     udev-extraconf-dom0 \
+    vglass \
+    disman \
 "
 
 # OE upgrade - temporarly disabled:

recipes-extended/qemu-dm/qemu-dm.inc

@@ -10,7 +10,6 @@ DEPENDS = " \
     libargo \
     zlib \
     libcap-ng \
-    libdmbus \
     pixman \
 "
 
@@ -43,15 +42,9 @@ SRC_URI += "file://0001-configure-use-valid-args-testing-sem_timedwait.patch \
             file://generic-xenstore-extensions.patch \
             file://readonly-ide.patch \
             file://hvm-param-dm-domain.patch \
-            file://dmbus.patch \
-            file://switcher.patch \
             file://acpi.patch \
-            file://xenmou.patch \
+            file://argo-configure.patch \
             file://atapi-pass-through.patch \
-            file://vbe-xt-extensions.patch \
-            file://vga-spinlock.patch \
-            file://vga-shadow-bda.patch \
-            file://surfman-dcl.patch \
             file://audio-policy.patch \
             file://msix-cap-disable.patch \
             file://openxtaudio.patch \
@@ -62,7 +55,6 @@ SRC_URI += "file://0001-configure-use-valid-args-testing-sem_timedwait.patch \
             file://acpi-wakeup.patch \
             file://openxt-misc-fixes.patch \
             file://qmp-argo-char-driver.patch \
-            file://exit-mainloop-on-reset.patch \
             file://write-acpi-state-to-xenstore.patch \
             file://set-blockdev-ro.patch \
             file://block-remove-unused-block-format-support.patch \
@@ -77,6 +69,8 @@ S = "${WORKDIR}/qemu-${PV}"
 
 inherit autotools-brokensep pkgconfig python3native
 
+require recipes-extended/qemu-dm/qemu-dm-vglass.inc
+
 # Include a minimal amount of blobs by default.
 FILES_${PN} += "/usr/share/qemu/keymaps/en-us       \
                 /usr/share/qemu/keymaps/commons     \
@@ -127,7 +121,6 @@ EXTRA_OECONF += " \
     --disable-tpm \
     --enable-pie \
     --enable-werror \
-    --enable-surfman \
     --enable-atapi-pt \
     --enable-atapi-pt-argo \
     --enable-readonly-ide \