From 0f1bb2b676269747123c52602953b1b5a264b174 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 22 Sep 2007 21:58:32 +0000 Subject: [PATCH] make xinit a essential dependency of XOrg git-svn-id: svn://svn.openwrt.org/openwrt/packages@8960 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- XOrg/app/common.mk | 4 ++++ XOrg/meta/xorg-server-X11R7.2-essentials/Makefile | 1 + XOrg/server/xorg-server-X11R7.2/Makefile | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/XOrg/app/common.mk b/XOrg/app/common.mk index 1c98b1425..89c1f6ec7 100644 --- a/XOrg/app/common.mk +++ b/XOrg/app/common.mk @@ -9,7 +9,11 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app _CATEGORY:=app + +ifneq ($(PKG_NAME),xinit-X11R7.2) _DEPEND+=xorg-server-X11R7.2-essentials +endif + include ../../common.mk ifeq ($(PKG_NAME),xdm-X11R7.2) diff --git a/XOrg/meta/xorg-server-X11R7.2-essentials/Makefile b/XOrg/meta/xorg-server-X11R7.2-essentials/Makefile index 11e90dd65..14fbe5712 100644 --- a/XOrg/meta/xorg-server-X11R7.2-essentials/Makefile +++ b/XOrg/meta/xorg-server-X11R7.2-essentials/Makefile @@ -28,6 +28,7 @@ define Package/xorg-server-X11R7.2-essentials +xf86-video-vga-X11R7.1 \ +xf86-input-evdev-X11R7.1 \ +xf86-input-keyboard-X11R7.2 \ + +xinit-X11R7.2 \ @TARGET_x86 endef diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile index ff22ccd10..c1956dcb9 100644 --- a/XOrg/server/xorg-server-X11R7.2/Makefile +++ b/XOrg/server/xorg-server-X11R7.2/Makefile @@ -24,7 +24,6 @@ CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes define Package/xorg-server-X11R7.2/Default SECTION:=xorg-server CATEGORY:=Xorg - SUBMENU:=server URL:=http://xorg.freedesktop.org/ endef -- 2.11.0