From 28db5ce99e119171f788dfb3d810382be98e815b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 28 Jan 2012 11:03:40 -0800 Subject: [PATCH] task-xserver: Remove the recipe in favor of one from meta-oe meta-oe also has a recipe task-x11-server_1.0.bb which provides task-xserver as well and they are exactly same see the diff below. This fixes the duplicate provider problem when building systemd-gnome-image -DESCRIPTION = "Task for a GNOME based image" +DESCRIPTION = "Task for an image with Xserver" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +PR = "r9" inherit task +# for backwards compatibility +RPROVIDES_${PN} += "task-xserver" + XSERVER ?= "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ @@ -17,4 +21,3 @@ " PACKAGE_ARCH = "${MACHINE_ARCH}" - Signed-off-by: Khem Raj Signed-off-by: Koen Kooi --- recipes-angstrom/tasks/task-xserver.bb | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 recipes-angstrom/tasks/task-xserver.bb diff --git a/recipes-angstrom/tasks/task-xserver.bb b/recipes-angstrom/tasks/task-xserver.bb deleted file mode 100644 index 866fd66..0000000 --- a/recipes-angstrom/tasks/task-xserver.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Task for a GNOME based image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -inherit task - -XSERVER ?= "xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-fbdev \ - xf86-input-keyboard \ -" - - -RDEPENDS_${PN} = " \ - ${XSERVER} \ -" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -