From 9b70352c2224bab37b0ea71bfea8ef7b2250d9b7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 3 Jan 2015 14:31:37 -0600
Subject: allow static build of nfsroot for lemote

---
 package/e2fsprogs/Makefile                   | 79 +++++++++++++++-------------
 package/libpthread/Makefile                  |  4 +-
 package/lvm/Makefile                         |  6 ++-
 package/parted/Makefile                      | 27 ++++++----
 package/parted/patches/patch-lib_config_h_in | 10 ++--
 package/util-linux/Makefile                  |  3 +-
 target/linux/config/Config.in.input          | 70 +++++++++++-------------
 7 files changed, 106 insertions(+), 93 deletions(-)

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 2b0697f64..976bb3e51 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		e2fsprogs
 PKG_VERSION:=		1.42.10
@@ -12,11 +12,11 @@ PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=e2fsprogs/)
 PKG_OPTS:=		dev
 PKG_NOPARALLEL:=	1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SUBPKGS:=		LIBE2FS LIBCOM_ERR LIBSS
 PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
@@ -39,64 +39,71 @@ PKGSD_MKE2FS:=		ext2/3/4 filesystem creation utility
 PKGSC_MKE2FS:=		sys/fs
 PKGSS_MKE2FS:=		libe2fs libcom-err libblkid libuuid libncurses
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
-$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
-$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
-$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
-$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
-$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS}))
-$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
+$(eval $(call PKG_template,LIBE2FS,libe2fs,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBE2FS),$(PKGSC_LIBE2FS),$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBCOM_ERR),$(PKGSC_LIBCOM_ERR),$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBSS,libss,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBSS),$(PKGSC_LIBSS),$(PKG_OPTS)))
+$(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_TUNE2FS),$(PKGSD_TUNE2FS),$(PKGSC_TUNE2FS)))
+$(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS)))
+$(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS)))
+$(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK)))
 
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+CONFIGURE_ARGS+=	--disable-elf-shlibs \
+			--enable-libblkid
+else
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
-			--disable-rpath \
+			--disable-libblkid 
+endif
+
+CONFIGURE_ARGS+=	--disable-rpath \
 			--disable-libuuid \
-			--disable-libblkid \
+			--disable-testio-debug \
 			--disable-debugfs \
 			--disable-defrag
 TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
-MAKE_FLAGS+=		BUILD_CC="${HOST_CC}" \
-			BUILD_CFLAGS="${HOST_CFLAGS} ${HOST_CPPFLAGS} -I${WRKSRC}/lib -I." \
-			BUILD_LDFLAGS="${HOST_LDFLAGS}"
+MAKE_FLAGS+=		BUILD_CC="$(HOST_CC)" \
+			BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \
+			BUILD_LDFLAGS="$(HOST_LDFLAGS)"
 
 libe2fs-install:
-	${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
-	${INSTALL_DATA} ${WRKBUILD}/misc/mke2fs.conf ${IDIR_LIBE2FS}/etc
-	${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
-		${IDIR_LIBE2FS}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBE2FS)/etc
+	$(INSTALL_DATA) $(WRKBUILD)/misc/mke2fs.conf $(IDIR_LIBE2FS)/etc
+	$(INSTALL_DIR) $(IDIR_LIBE2FS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/lib(e2p,ext2fs).so.* \
+		$(IDIR_LIBE2FS)/usr/lib
 
 e2fsck-install:
-	${INSTALL_DIR} ${IDIR_E2FSCK}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSCK}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_E2FSCK)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/e2fsck $(IDIR_E2FSCK)/usr/sbin
 	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext2
 	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext3
 	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext4
 
 mke2fs-install:
-	${INSTALL_DIR} ${IDIR_MKE2FS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_MKE2FS}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_MKE2FS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/mke2fs $(IDIR_MKE2FS)/usr/sbin
 	cd $(IDIR_MKE2FS)/usr/sbin && ln -sf mke2fs mkfs.ext2
 	cd $(IDIR_MKE2FS)/usr/sbin && ln -sf mke2fs mkfs.ext3
 	cd $(IDIR_MKE2FS)/usr/sbin && ln -sf mke2fs mkfs.ext4
 
 tune2fs-install:
-	${INSTALL_DIR} ${IDIR_TUNE2FS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_TUNE2FS}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_TUNE2FS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/tune2fs $(IDIR_TUNE2FS)/usr/sbin
 
 resize2fs-install:
-	${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_RESIZE2FS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/resize2fs $(IDIR_RESIZE2FS)/usr/sbin
 
 libcom-err-install:
-	${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcom_err.so* \
-		${IDIR_LIBCOM_ERR}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBCOM_ERR)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcom_err.so* \
+		$(IDIR_LIBCOM_ERR)/usr/lib
 
 libss-install:
-	${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libss.so* \
-		${IDIR_LIBSS}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBSS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libss.so* \
+		$(IDIR_LIBSS)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 6ba962062..4a30ffb5f 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -34,8 +34,8 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 libpthread-install:
-ifeq ($(ADK_TARGET_LIB_MUSL),)
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
+ifneq ($(ADK_TARGET_LIB_MUSL),y)
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
 ifeq ($(ADK_TARGET_WITH_NPTL),y)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 9373b2ad3..a77be01d2 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		lvm
-PKG_VERSION:=		2.02.111
+PKG_VERSION:=		2.02.114
 PKG_RELEASE:=		1
 PKG_HASH:=		6d8f3e72fe07f614315d8e0c2d9f93c5fc7a4360d14e4f9b805750e21593dd24
 PKG_DESCR:=		logical volume management
@@ -31,6 +31,10 @@ $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER},${PKG_OPTS}))
 
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+CONFIGURE_ARGS+=	--enable-static_link
+endif
+
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
 			--disable-testing \
diff --git a/package/parted/Makefile b/package/parted/Makefile
index aeb8163cf..1087ec9b5 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -9,26 +9,35 @@ PKG_RELEASE:=		1
 PKG_HASH:=		858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4
 PKG_DESCR:=		partition table editor
 PKG_SECTION:=		sys/fs
-PKG_DEPENDS:=		libblkid libuuid libreadline libpthread
-PKG_DEPENDS+=		libdevmapper
-PKG_BUILDDEP:=		util-linux readline lvm
+PKG_DEPENDS:=		libblkid libuuid libpthread
+PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://www.gnu.org/software/parted/index.shtml
-PKG_SITES:=		${MASTER_SITE_GNU:=parted/}
+PKG_SITES:=		$(MASTER_SITE_GNU:=parted/)
 
 PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
 
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
 ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y)
 TARGET_LDFLAGS+=	-liconv
 endif
 
-$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+CONFIGURE_ARGS+=	--disable-dynamic-loading
+endif
+
+CONFIGURE_ARGS+=	--disable-device-mapper \
+			--without-readline
 
 parted-install:
-	${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib
-	${CP} $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib
-	${INSTALL_BIN} $(WRKINST)/usr/sbin/parted $(IDIR_PARTED)/usr/sbin
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+	$(INSTALL_DIR) $(IDIR_PARTED)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib
+endif
+	$(INSTALL_DIR) $(IDIR_PARTED)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/parted $(IDIR_PARTED)/usr/sbin
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/parted/patches/patch-lib_config_h_in b/package/parted/patches/patch-lib_config_h_in
index df6cb1f7d..44c07bbc6 100644
--- a/package/parted/patches/patch-lib_config_h_in
+++ b/package/parted/patches/patch-lib_config_h_in
@@ -1,8 +1,8 @@
---- parted-3.1.orig/lib/config.h.in	2012-03-02 17:10:29.000000000 +0100
-+++ parted-3.1/lib/config.h.in	2013-12-25 20:03:47.000000000 +0100
-@@ -1424,6 +1424,11 @@
- # define _DARWIN_USE_64_BIT_INODE 1
- #endif
+--- parted-3.2.orig/lib/config.h.in	2014-07-28 22:02:54.000000000 -0500
++++ parted-3.2/lib/config.h.in	2015-01-03 14:02:11.888853421 -0600
+@@ -1471,6 +1471,11 @@
+ /* Enable large inode numbers on Mac OS X 10.5. */
+ #undef _DARWIN_USE_64_BIT_INODE
  
 +/* Enable large inode numbers on Mac OS X 10.5.  */
 +#ifndef _DARWIN_USE_64_BIT_INODE
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 35e4d77d5..659dc3ce9 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_HASH:=		e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
-PKG_BUILDDEP:=		ncurses pam
+PKG_BUILDDEP:=		ncurses
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.25/
 PKG_OPTS:=		dev
 
@@ -29,6 +29,7 @@ PKGSD_CFDISK:=		partition table manipulation utility
 PKGSC_CFDISK:=		sys/fs
 PKGSD_SU:=		switch user utility
 PKGSC_SU:=		sys/misc
+PKGSB_SU:=		pam
 PKGSD_SWAP_UTILS:=	swap space management utilities
 PKGSS_SWAP_UTILS:=	libblkid
 PKGSC_SWAP_UTILS:=	sys/fs
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index ac246319e..5c750717c 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -2,7 +2,7 @@ menu "Input devices"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
 config ADK_KERNEL_INPUT
-	boolean
+	bool
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
@@ -14,49 +14,46 @@ config ADK_KERNEL_INPUT
 	default n
 
 config ADK_KERNEL_HID_LOGITECH
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_HID_LOGITECH_DJ
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_KEYBOARD_ATARI
-	boolean
+	bool
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
 config ADK_KERNEL_MOUSE_ATARI
-	boolean
+	bool
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
 config ADK_KERNEL_KEYBOARD_GPIO
-	boolean
+	bool
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	default n
 
 config ADK_KERNEL_KEYBOARD_MATRIX
-	boolean
+	bool
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	default n
 
 config ADK_KERNEL_INPUT_TOUCHSCREEN
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_TOUCHSCREEN_ADS7846
-	boolean
+	bool
 	select ADK_KERNEL_INPUT_TOUCHSCREEN
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default n
 
 config ADK_KERNEL_INPUT_KEYBOARD
-	boolean
+	bool
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
@@ -68,7 +65,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default n
 
 config ADK_KERNEL_INPUT_MOUSE
-	boolean
+	bool
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
@@ -80,76 +77,71 @@ config ADK_KERNEL_INPUT_MOUSE
 	default n
 
 config ADK_KERNEL_INPUT_MOUSEDEV
-	boolean
+	bool
 
 config ADK_KERNEL_HID_SUPPORT
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_HID
-	boolean
-	select ADK_KERNEL_HID_SUPPORT
-	default n
+	bool
 
 config ADK_KERNEL_HID_GENERIC
-	boolean
-	select ADK_KERNEL_HID_SUPPORT
-	default n
+	bool
 	
 config ADK_KERNEL_USB_HID
-	prompt "USB HID support"
-	tristate
+	tristate "USB Human Interactive Device support"
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
+	select ADK_KERNEL_HID_SUPPORT
 	select ADK_KERNEL_HID_GENERIC
 	depends on ADK_TARGET_WITH_USB
-	default n
+	help
+	  You need this driver for USB keyboard and mouse support.
 
 config ADK_TARGET_USB_KEYBOARD
-	prompt "enable keyboard support"
-	boolean
+	bool "enable keyboard support"
 	depends on ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT_KEYBOARD
+	help
+	  Activate to get USB keyboard support.
 
 config ADK_TARGET_USB_MOUSE
-	prompt "enable mouse support"
-	boolean
+	bool "enable mouse support"
 	depends on ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_INPUT_MOUSE
+	help
+	  Activate to get USB mouse support.
 
 config ADK_KERNEL_LOGITECH_DINOVO
-	prompt "Support for Logitech DiNovo keyboard/mouse"
-	boolean
+	bool "Support for Logitech DiNovo keyboard/mouse"
 	select ADK_KERNEL_HID_LOGITECH
 	select ADK_KERNEL_HID_LOGITECH_DJ
 	depends on ADK_KERNEL_USB_HID
-	default n
 	help
 	  Support for Logitech DiNovo keyboard/mouse combination.
 
 config ADK_KERNEL_KEYBOARD_ATKBD
-	prompt "Keyboard support (AT)"
-	tristate
+	bool "Keyboard support (AT)"
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_VBOX
+	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 
 config ADK_KERNEL_MOUSE_PS2
-	prompt "Mouse support (PS/2)"
-	boolean
+	bool "Mouse support (PS/2)"
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_INPUT_MOUSE
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_VBOX
+	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 
 config ADK_KERNEL_INPUT_EVDEV
-	prompt "Event device support"
-	tristate
+	tristate "Event device support"
 	select ADK_KERNEL_INPUT
 	default m if ADK_PACKAGE_XF86_INPUT_EVDEV
 	default m if ADK_PACKAGE_XF86_INPUT_EVTOUCH
-- 
cgit v1.2.3