make xinit a essential dependency of XOrg

SVN-Revision: 8960

diff --git a/XOrg/app/common.mk b/XOrg/app/common.mk
index 1c98b1425c3412a291d4fb509009ba1bc013e6c2..89c1f6ec72a9ace2be64096b798573ff39e3b6c2 100644 (file)
--- 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 11e90dd653917bee2b0441b00553d27cb81c322a..14fbe571269a67926e553aa65ae99ab8d6833cb6 100644 (file)
--- 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 ff22ccd10ebf582b8ada4702a08f3d511d4dc1ed..c1956dcb9737a06a46aa8886026f30eeac151db3 100644 (file)
--- 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