minor fixes for qemu x86_64 and X11

mk/image.mk

@@ -55,6 +55,7 @@ ifeq ($(ADK_LINUX_X86_64),y)
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
+	mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)

package/libgcc/Makefile

@@ -24,7 +24,7 @@ INSTALL_STYLE:=		manual
 do-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
-	${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+	${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
 ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/lib32

package/xinit/Makefile

@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xinit
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		7ad82221ebd6600a8d33712ec3b62efb
 PKG_DESCR:=		X Window System initializer
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		xorg-server mcookie xauth xset
+PKG_DEPENDS:=		xorg-server mcookie xauth xset xterm
 PKG_BUILDDEP:=		xorg-server
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/

target/linux/config/Config.in.input

@@ -4,6 +4,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH
 config ADK_KERNEL_INPUT
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -45,6 +46,7 @@ config ADK_KERNEL_INPUT_EVDEV
 config ADK_KERNEL_INPUT_KEYBOARD
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -61,6 +63,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 config ADK_KERNEL_KEYBOARD_ATKBD
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -76,6 +79,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 config ADK_KERNEL_INPUT_MOUSE
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -92,6 +96,7 @@ config ADK_KERNEL_INPUT_MOUSE
 config ADK_KERNEL_INPUT_MOUSEDEV
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40