make xinit a essential dependency of XOrg

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8960 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-09-22 21:58:32 +00:00 · 2007-09-22 21:58:32 +00:00 · 0f1bb2b676
commit 0f1bb2b676
parent 4fedeb4f31
3 changed files with 5 additions and 1 deletions
--- 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)
--- 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

--- 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