From e2b37c86613b94afa9e5b42f6d00373b362be168 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 3 Apr 2018 18:49:16 -0700 Subject: xorgproto: Replace individual depreciated xorg proto recipes with xorgproto Xorg upstream have replaced the individual xorg proto repositories with one master repository. This converts to the new system. The only one not included is calibrateproto which was depreciated entirely and replaced be xinput. We can drop this entirely. (From OE-Core rev: 460a2b27af8d023b27703b491331c8cbe7aad0ff) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 30 +----------------------------- meta/conf/distro/include/maintainers.inc | 28 +--------------------------- 2 files changed, 2 insertions(+), 56 deletions(-) (limited to 'meta/conf/distro/include') diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 13c7e652bc..536605d1d0 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -15,7 +15,6 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk" DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT" -DISTRO_PN_ALIAS_pn-bigreqsproto = "Meego=xorg-x11-proto-bigreqsproto" DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debina=bjam" DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez" @@ -25,7 +24,6 @@ DISTRO_PN_ALIAS_pn-build-appliance-image = "OSPDT" DISTRO_PN_ALIAS_pn-build-compare = "Opensuse=build-compare Fedora=build-compare" DISTRO_PN_ALIAS_pn-builder = "OE-Core" DISTRO_PN_ALIAS_pn-buildtools-tarball = "OE-Core" -DISTRO_PN_ALIAS_pn-calibrateproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/calibrateproto" DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT" DISTRO_PN_ALIAS_pn-chkconfig-alternatives = "Mandriva=chkconfig Debian=chkconfig" DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter" @@ -37,7 +35,6 @@ DISTRO_PN_ALIAS_pn-clutter-gtk-1.0 = "Debian=clutter-gtk Ubuntu=clutter-gtk Fedo DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk" DISTRO_PN_ALIAS_pn-cogl-1.0 = "Debian=cogl Ubuntu=cogl Fedora=cogl" DISTRO_PN_ALIAS_pn-cogl = "Fedora=cogl OpenSuse=cogl Ubuntu=cogl Mandriva=cogl Debian=cogl" -DISTRO_PN_ALIAS_pn-compositeproto = "Meego=xorg-x11-proto-compositeproto" DISTRO_PN_ALIAS_pn-connman = "Meego=connman" DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core" DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" @@ -68,14 +65,12 @@ DISTRO_PN_ALIAS_pn-cryptodev-linux = "OE-Core" DISTRO_PN_ALIAS_pn-cryptodev-module = "OE-Core" DISTRO_PN_ALIAS_pn-cryptodev-tests = "OE-Core" DISTRO_PN_ALIAS_pn-cwautomacros = "OSPDT upstream=http://cwautomacros.berlios.de/" -DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto" DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1" DISTRO_PN_ALIAS_pn-dbus-test = "Fedora=dbus Ubuntu=dbus" DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand" DISTRO_PN_ALIAS_pn-depmodwrapper-cross = "OE-Core" DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc" DISTRO_PN_ALIAS_pn-distcc-config = "OpenedHand" -DISTRO_PN_ALIAS_pn-dmxproto = "Meego=xorg-x11-proto-dmxproto Ubuntu=x11proto-dmx Debian=x11proto-dmx" DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheets = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl" DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-3.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd31-sgml" DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd41-sgml" @@ -83,18 +78,13 @@ DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.5 = "Fedora=docbook-dtds Mandriva=docbook- DISTRO_PN_ALIAS_pn-docbook-xml-dtd4 = "Ubuntu=docbook-xml Fedora=docbook-dtds" DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = "Ubuntu=docbook-xml Fedora=docbook-dtds" DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets" -DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto" -DISTRO_PN_ALIAS_pn-dri3proto = "Fedora=dri3proto Opensuse=dri3proto-devel" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" DISTRO_PN_ALIAS_pn-eee-acpi-scripts = "Debian=eeepc-acpi-scripts Ubuntu=eeepc-acpi-scripts" DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" -DISTRO_PN_ALIAS_pn-fixesproto = "Meego=xorg-x11-proto-fixesproto" DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" -DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto" -DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" @@ -114,7 +104,6 @@ DISTRO_PN_ALIAS_pn-glib-2.0 = "Meego=glib2 Fedora=glib2 OpenSuSE=glib2 Ubuntu=gl DISTRO_PN_ALIAS_pn-glibc-locale = "OpenSuSE=glibc-locale Fedora=glibc-devel" DISTRO_PN_ALIAS_pn-glibc-mtrace = "Fedora=glibc-utils Ubuntu=libc-dev-bin" DISTRO_PN_ALIAS_pn-glibc-scripts = "Fedora=glibc Ubuntu=libc-bin" -DISTRO_PN_ALIAS_pn-glproto = "Meego=xorg-x11-proto-glproto" DISTRO_PN_ALIAS_pn-gnome-desktop-testing = "Debian=gnome-desktop-testing Fedora=gnome-desktop-testing" DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-gptfdisk = "Fedora=gdisk Ubuntu=gdisk" @@ -149,10 +138,8 @@ DISTRO_PN_ALIAS_pn-initramfs-live-install-efi = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-efi-testfs = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-testfs = "OE-Core" DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandravia=initscripts" -DISTRO_PN_ALIAS_pn-inputproto = "Meego=xorg-x11-proto-inputproto" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" -DISTRO_PN_ALIAS_pn-kbproto = "Meego=xorg-x11-proto-kbproto Ubuntu=x11proto-kb-dev Debian=x11proto-kb-dev" DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark" DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver" @@ -315,7 +302,6 @@ DISTRO_PN_ALIAS_pn-pong-clock = "OpenedHand" DISTRO_PN_ALIAS_pn-portmap = "Debian=rpcbind Fedora=rpcbind" DISTRO_PN_ALIAS_pn-powertop = "Meego=powertop Fedora=powertop Debian=powertop OpenSuSE=powertop Mandriva=powertop" DISTRO_PN_ALIAS_pn-ppp-dialin = "OE-Core" -DISTRO_PN_ALIAS_pn-presentproto = "Debian=x11proto-present-dev Fedora=xorg-x11-proto-devel" DISTRO_PN_ALIAS_pn-pseudo = "Windriver" DISTRO_PN_ALIAS_pn-psplash = "OpenedHand" DISTRO_PN_ALIAS_pn-ptest-runner = "OE-Core" @@ -341,12 +327,8 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" -DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" -DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" DISTRO_PN_ALIAS_pn-remake = "Mandriva=remake Debian=remake" -DISTRO_PN_ALIAS_pn-renderproto = "Meego=xorg-x11-proto-renderproto" -DISTRO_PN_ALIAS_pn-resourceproto = "Meego=xorg-x11-proto-resourceproto" DISTRO_PN_ALIAS_pn-rgb = "Fedora=xorg-X11-server-utils Debian=x11-xserver-utils" DISTRO_PN_ALIAS_pn-rpmresolve = "OSPDT" DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests" @@ -355,7 +337,6 @@ DISTRO_PN_ALIAS_pn-sato-icon-theme = "OpenedHand" DISTRO_PN_ALIAS_pn-sato-screenshot = "OpenedHand" DISTRO_PN_ALIAS_pn-sbc = "Fedora=sbc Debian=libsbc1" DISTRO_PN_ALIAS_pn-screenshot = "OpenedHand" -DISTRO_PN_ALIAS_pn-scrnsaverproto = "Meego=xorg-x11-proto-scrnsaverproto Ubuntu=x11proto-scrnsaver-dev Debian=x11proto-scrnsaver-dev" DISTRO_PN_ALIAS_pn-settings-daemon = "OpenedHand" DISTRO_PN_ALIAS_pn-sgml-common = "OpenSuSE=sgml-common Fedora=sgml-common" DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl" @@ -392,7 +373,6 @@ DISTRO_PN_ALIAS_pn-update-rc.d = "OE-Core" DISTRO_PN_ALIAS_pn-usbinit = "OE-Core" DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros" DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d" -DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto" DISTRO_PN_ALIAS_pn-waffle = "OE-Core" DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog" DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit" @@ -404,21 +384,15 @@ DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util" -DISTRO_PN_ALIAS_pn-xcmiscproto = "Meego=xorg-x11-proto-xcmiscproto" DISTRO_PN_ALIAS_pn-xcursor-transparent-theme = "OpenedHand" DISTRO_PN_ALIAS_pn-xdpyinfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils" DISTRO_PN_ALIAS_pn-xev = "Fedora=xorg-x11-utils Ubuntu=x11-utils" -DISTRO_PN_ALIAS_pn-xextproto = "Meego=xorg-x11-proto-xextproto" DISTRO_PN_ALIAS_pn-xeyes = "Ubuntu=x11-apps Fedora=xorg-x11-apps" -DISTRO_PN_ALIAS_pn-xf86bigfontproto = "Meego=xorg-x11-proto-xf86bigfontproto" -DISTRO_PN_ALIAS_pn-xf86dgaproto = "Meego=xorg-x11-proto-xf86dgaproto" -DISTRO_PN_ALIAS_pn-xf86driproto = "Meego=xorg-x11-proto-xf86driproto" DISTRO_PN_ALIAS_pn-xf86-input-evdev = "Ubuntu=xserver-xorg-input-evdev Mandriva=x11-driver-input-evdev Debian=xserver-xorg-input-evdev Fedora=xorg-x11-drv-evdev Meego=xorg-x11-drv-evdev" DISTRO_PN_ALIAS_pn-xf86-input-keyboard = "Meego=xorg-x11-drv-keyboard Fedora=xorg-x11-drv-keyboard Mandriva=x11-driver-input-keyboard Debian=xserver-xorg-input-keyboard" DISTRO_PN_ALIAS_pn-xf86-input-mouse = "Ubuntu=xserver-xorg-input-mouse Mandriva=x11-driver-input-mouse Debian=xserver-xorg-input-mouse" DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics" DISTRO_PN_ALIAS_pn-xf86-input-vmmouse = "Fedora=xorg-x11-drv-vmmouse Ubuntu=xserver-xorg-input-vmmouse Mandriva=x11-driver-input-vmmouse Debian=xserver-xorg-input-vmmouse" -DISTRO_PN_ALIAS_pn-xf86miscproto = "Meego=xorg-x11-proto-xf86miscproto" DISTRO_PN_ALIAS_pn-xf86-video-cirrus = "Opensuse=xf86-video-cirrus Debian=xserver-xorg-video-cirrus" DISTRO_PN_ALIAS_pn-xf86-video-fbdev = "Ubuntu=xserver-xorg-video-fbdev Debian=xserver-xorg-video-fbdev" DISTRO_PN_ALIAS_pn-xf86-video-intel = "Debian=xserver-xorg-video-intel Fedora=xorg-x11-drv-intel Mandriva=x11-driver-video-intel Meego=xorg-x11-drv-intel Ubuntu=xserver-xorg-video-intel" @@ -427,15 +401,13 @@ DISTRO_PN_ALIAS_pn-xf86-video-omap = "Ubuntu=xf86-video-omap Debian=xf86-video-o DISTRO_PN_ALIAS_pn-xf86-video-omapfb = "OSPDT" DISTRO_PN_ALIAS_pn-xf86-video-vesa = "Debian=xserver-xorg-video-vesa Fedora=xorg-x11-drv-vesa Mandriva=x11-driver-video-vesa Ubuntu=xserver-xorg-video-vesa" DISTRO_PN_ALIAS_pn-xf86-video-vmware = "Debian=xserver-xorg-video-vmware Fedora=xorg-x11-drv-vmware Mandriva=x11-driver-video-vmware Ubuntu=xserver-xorg-video-vmware" -DISTRO_PN_ALIAS_pn-xf86vidmodeproto = "Meego=xorg-x11-proto-xf86vidmodeproto Ubuntu=x11proto-xf86vidmode Debian=x11proto-xf86vidmode" DISTRO_PN_ALIAS_pn-xhost = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils" -DISTRO_PN_ALIAS_pn-xineramaproto = "Meego=xorg-x11-proto-xineramaproto Ubuntu=x11proto-xinerama Debian=x11proto-xinerama" DISTRO_PN_ALIAS_pn-xinput-calibrator = "Fedora=xinput-calibrator Mandravia=xinput-calibrator Ubuntu=xinput-calibrator" DISTRO_PN_ALIAS_pn-xkbcomp = "Ubuntu=x11-xkb-utils Fedora=xorg-x11-xkb-utils" DISTRO_PN_ALIAS_pn-xmodmap = "Meego=xorg-x11-utils-xmodmap Fedora=xorg-x11-server-utils Ubuntu=x11-xserver-utils" DISTRO_PN_ALIAS_pn-xorg-minimal-fonts = "Ubuntu=xfonts-base Fedora=xorg-x11-fonts-base" +DISTRO_PN_ALIAS_pn-xorgproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/xorgproto" DISTRO_PN_ALIAS_pn-xprop = "Meego=xorg-x11-utils-xprop Fedora=xorg-x11-utils Ubuntu=x11-utils" -DISTRO_PN_ALIAS_pn-xproto = "Meego=xorg-x11-proto-xproto Fedora=xorg-x11-proto-devel Ubuntu=x11proto-core-dev Debian=x11proto-core-dev Opensuse=xorg-x11-proto-devel Mandriva=x11-proto-devel" DISTRO_PN_ALIAS_pn-xproxymanagementprotocol = "Meego=xorg-x11-proto-xproxymanagementprotocol" DISTRO_PN_ALIAS_pn-xrandr = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils" DISTRO_PN_ALIAS_pn-xrdb = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 48aff9537e..dc6b863fea 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -66,7 +66,6 @@ RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin " RECIPE_MAINTAINER_pn-initramfs-live-install-testfs = "Chang Rebecca Swee Fun " RECIPE_MAINTAINER_pn-initscripts = "Chang Rebecca Swee Fun " -RECIPE_MAINTAINER_pn-inputproto = "Armin Kuster " RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin " RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae " RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae " @@ -293,7 +282,6 @@ RECIPE_MAINTAINER_pn-libjpeg-turbo = "Maxin B. John " RECIPE_MAINTAINER_pn-json-c = "Yi Zhao " RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao " RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-kbproto = "Armin Kuster " RECIPE_MAINTAINER_pn-kconfig-frontends = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " RECIPE_MAINTAINER_pn-kernelshark = "Alexander Kanavin " @@ -583,7 +571,6 @@ RECIPE_MAINTAINER_pn-powertop = "Alexander Kanavin RECIPE_MAINTAINER_pn-ppp = "Hongxu Jia " RECIPE_MAINTAINER_pn-ppp-dialin = "Hongxu Jia " RECIPE_MAINTAINER_pn-prelink = "Mark Hatle " -RECIPE_MAINTAINER_pn-presentproto = "Armin Kuster " RECIPE_MAINTAINER_pn-procps = "Alexander Kanavin " RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle " RECIPE_MAINTAINER_pn-psmisc = "Alexander Kanavin " @@ -622,14 +609,10 @@ RECIPE_MAINTAINER_pn-qemuwrapper-cross = "Juro Bystricky