Index: target/Config.in =================================================================== --- target/Config.in (revision 19953) +++ target/Config.in (working copy) @@ -12,6 +12,9 @@ source "target/iso9660/Config.in" source "target/initramfs/Config.in" +comment "Separate packages" +source "target/packages/Config.in" + comment "bootloader for target device" source "target/x86/grub/Config.in" Index: target/packages/DEBIAN/control =================================================================== --- target/packages/DEBIAN/control (revision 0) +++ target/packages/DEBIAN/control (revision 0) @@ -0,0 +1,10 @@ +Package: PKGNAME +Version: 1.1-1 +XC-Package-Type: udeb +Section: packages +Priority: optional +Architecture: ARCH +Depends: +Maintainer: Buildroot +Description: PKGNAME + PKGDESC Index: target/packages/packages.mk =================================================================== --- target/packages/packages.mk (revision 0) +++ target/packages/packages.mk (revision 0) @@ -0,0 +1,48 @@ +############################################################# +# +# packages to build, yup, packages. +# +############################################################# + +packages: + # Stupid but simple (I want all package types to be makeable) + # So that the make_packages script don't have to know where we are. + +ifeq ($(strip $(BR2_TARGET_PACKAGES_TAR_LZ)),y) + ( export PATH=$(TARGET_PATH) ; \ + target/packages/make_packages.sh $(TARGET_PACKAGES_DIR) \ + lzma $(ARCH) \ + ); +endif + +ifeq ($(strip $(BR2_TARGET_PACKAGES_TAR_GZ)),y) + ( export PATH=$(TARGET_PATH) ; \ + target/packages/make_packages.sh $(TARGET_PACKAGES_DIR) \ + gzip $(ARCH) \ + ); +endif + +ifeq ($(strip $(BR2_TARGET_PACKAGES_TAR_BZ2)),y) + ( export PATH=$(TARGET_PATH) ; \ + target/packages/make_packages.sh $(TARGET_PACKAGES_DIR) \ + bz2 $(ARCH) \ + ); +endif + +ifeq ($(strip $(BR2_TARGET_PACKAGES_UDEBS)),y) + cp -a target/packages/DEBIAN $(TARGET_PACKAGES_DIR)/. + + ( export PATH=$(TARGET_PATH) ; \ + target/packages/make_packages.sh $(TARGET_PACKAGES_DIR) \ + udebs $(ARCH) \ + ); +endif + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_TARGET_PACKAGES)),y) +TARGET_PACKAGES+=packages +endif Index: target/packages/make_packages.sh =================================================================== --- target/packages/make_packages.sh (revision 0) +++ target/packages/make_packages.sh (revision 0) @@ -0,0 +1,70 @@ +#!/bin/sh -e +# +# make-packages +# +# Thomas Lundquist 2006-11-05 +# + +PACKAGES_DIR=$1 +PACKAGES_TYPE=$2 +ARCH=$3 + +mktarpack () { + + cd $PACKAGES_DIR/$1 + tar -cpf ../$1.tar * + + cd .. + $COMP $1.tar > $1$EXT + +} + +mkudebs () { + + PKGNAME=$1 + + cp -a $PACKAGES_DIR/$PKGNAME $UDEBDIR/. + cp -a $PACKAGES_DIR/DEBIAN $UDEBDIR/$PKGNAME/. + cd $UDEBDIR + sed -i -e "s/PKGNAME/$PKGNAME/" $PKGNAME/DEBIAN/control + sed -i -e "s/ARCH/$ARCH/" $PKGNAME/DEBIAN/control + dpkg-deb -b $PKGNAME $PKGNAME.udeb + +} + +case $PACKAGES_TYPE in + bz2) + COMP="bzip2 -c" + EXT=.tar.bz2 + FUNC=mktarpack + ;; + lzma) + COMP="lzma -c" + EXT=.tar.lz + FUNC=mktarpack + ;; + gzip) + COMP="gzip -c" + EXT=.tgz + FUNC=mktarpack + ;; + udebs) + COMP="gzip -c" + EXT=.tgz + FUNC=mkudebs + ;; +esac + +UDEBDIR=$PACKAGES_DIR/udebs +mkdir -p $UDEBDIR + +for p in $PACKAGES_DIR/* + do + name=`basename $p` + if [ -d $p -a $name != "DEBIAN" -a $name != "udebs" ] + then + echo "Building $name package in $PACKAGES_DIR" + $FUNC $name + fi +done + Property changes on: target/packages/make_packages.sh ___________________________________________________________________ Name: svn:executable + * Index: target/packages/ipkg-cl/Config.in =================================================================== --- target/packages/ipkg-cl/Config.in (revision 0) +++ target/packages/ipkg-cl/Config.in (revision 0) @@ -0,0 +1,7 @@ +config BR2_PACKAGE_IPKG-CL + bool "ipkg-cl on host and target" + depends on BR2_TARGET_PACKAGES_IPKG + default n + help + ipkg-cl is the newer c based version of ipkg from handhelds.org + Index: target/packages/ipkg-cl/ipkg-cl.mk =================================================================== --- target/packages/ipkg-cl/ipkg-cl.mk (revision 0) +++ target/packages/ipkg-cl/ipkg-cl.mk (revision 0) @@ -0,0 +1,105 @@ +############################################################# +# +# ipkg-cl +# +############################################################# +http://www.handhelds.org/download/packages/ipkg-cl/ipkg-cl-0.99.163.tar.gz + +IPKG-CL_VERSION=0.99.163 +IPKG-CL_SOURCE=ipkg-$(IPKG-CL_VERSION).tar.gz +IPKG-CL_SITE=http://www.handhelds.org/download/packages/ipkg-cl/ +IPKG-CL_CAT:=$(ZCAT) + +$(DL_DIR)/$(IPKG-CL_SOURCE): + $(WGET) -P $(DL_DIR) $(IPKG-CL_SITE)/$(IPKG-CL_SOURCE) + +############################################################# +# +# Target +# +############################################################# + +IPKG-CL_TARGET_DIR=$(BUILD_DIR)/ipkg-$(IPKG-CL_VERSION) + +$(IPKG-CL_TARGET_DIR)/.unpacked: $(DL_DIR)/$(IPKG-CL_SOURCE) + $(IPKG-CL_CAT) $(DL_DIR)/$(IPKG-CL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(IPKG-CL_TARGET_DIR)/.unpacked + +$(IPKG-CL_TARGET_DIR)/.configured: $(IPKG-CL_TARGET_DIR)/.unpacked + (cd $(IPKG-CL_TARGET_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --sysconfdir=/etc \ + ); + touch $(IPKG-CL_TARGET_DIR)/.configured + +$(IPKG-CL_TARGET_DIR)/ipkg-cl: $(IPKG-CL_TARGET_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(IPKG-CL_TARGET_DIR) + +$(TARGET_DIR)/usr/sbin/ipkg-cl: $(IPKG-CL_TARGET_DIR)/ipkg-cl + cp -a $(IPKG-CL_TARGET_DIR)/ipkg-cl $(TARGET_DIR)/usr/sbin/. + $(STRIP) $(TARGET_DIR)/usr/sbin/ipkg-cl + cp -a $(IPKG-CL_TARGET_DIR)/.libs/libipkg.so* $(TARGET_DIR)/usr/lib/. + $(STRIP) $(TARGET_DIR)/usr/lib/libipkg.so.0.0.0 + # Adding this aswell but it may not be needed. + cp -a $(IPKG-CL_TARGET_DIR)/update-alternatives $(TARGET_DIR)/usr/sbin/. + # And the finishing touch; link it to ipkg? + +############################################################# +# +# Host +# +############################################################# + +IPKG-CL_HOST_DIR=$(TOOL_BUILD_DIR)/ipkg-$(IPKG-CL_VERSION) + +$(IPKG-CL_HOST_DIR)/.unpacked: $(DL_DIR)/$(IPKG-CL_SOURCE) + $(IPKG-CL_CAT) $(DL_DIR)/$(IPKG-CL_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + touch $(IPKG-CL_HOST_DIR)/.unpacked + +$(IPKG-CL_HOST_DIR)/.configured: $(IPKG-CL_HOST_DIR)/.unpacked + (cd $(IPKG-CL_HOST_DIR); rm -rf config.cache; \ + ./configure \ + --prefix=/ \ + ); + touch $(IPKG-CL_HOST_DIR)/.configured + +$(IPKG-CL_HOST_DIR)/ipkg-cl: $(IPKG-CL_HOST_DIR)/.configured + $(MAKE) -C $(IPKG-CL_HOST_DIR) + +$(STAGING_DIR)/usr/sbin/ipkg-cl: $(IPKG-CL_HOST_DIR)/ipkg-cl + $(MAKE) DESTDIR=$(STAGING_DIR) \ + -C $(IPKG-CL_HOST_DIR) install + +############################################################# +# +# Common +# +############################################################# + +ipkg-cl: uclibc $(STAGING_DIR)/usr/sbin/ipkg-cl $(TARGET_DIR)/usr/sbin/ipkg-cl + +ipkg-cl-source: $(DL_DIR)/$(IPKG-CL_SOURCE) + +ipkg-cl-clean: + @if [ -d $(IPKG-CL_TARGET_DIR)/Makefile ] ; then \ + $(MAKE) -C $(IPKG-CL_TARGET_DIR) clean ; \ + fi; + +ipkg-cl-dirclean: + rm -rf $(IPKG-CL_HOST_DIR) $(IPKG-CL_TARGET_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_IPKG-CL)),y) +TARGETS+=ipkg-cl +endif Index: target/packages/ipkg-utils/Config.in =================================================================== --- target/packages/ipkg-utils/Config.in (revision 0) +++ target/packages/ipkg-utils/Config.in (revision 0) @@ -0,0 +1,15 @@ +config BR2_PACKAGE_IPKG-UTILS_HOST + bool "ipkg-utils on the host." + depends on BR2_TARGET_PACKAGES_IPKG + default n + help + ipkg-utils is a compilation of utilities for building ipkg packages. + +config BR2_PACKAGE_IPKG-UTILS_TARGET + bool "ipkg-utils on the target." + depends on BR2_PACKAGE_IPKG-UTILS_HOST + default n + help + ipkg-utils is a compilation of utilities for building ipkg packages. + You don't need this unless you are going to build packages on the target. + Index: target/packages/ipkg-utils/ipkg-utils.mk =================================================================== --- target/packages/ipkg-utils/ipkg-utils.mk (revision 0) +++ target/packages/ipkg-utils/ipkg-utils.mk (revision 0) @@ -0,0 +1,96 @@ +############################################################# +# +# ipkg-utils +# +# This is basically for the host since it's for building the packages. +# +############################################################# + +IPKG-UTILS_VERSION=050831 +IPKG-UTILS_SOURCE=ipkg-utils-$(IPKG-UTILS_VERSION).tar.gz +IPKG-UTILS_SITE=http://ftp.handhelds.org/packages/ipkg-utils/ +IPKG-UTILS_CAT:=$(ZCAT) + +$(DL_DIR)/$(IPKG-UTILS_SOURCE): + $(WGET) -P $(DL_DIR) $(IPKG-UTILS_SITE)/$(IPKG-UTILS_SOURCE) + +############################################################# +# +# Target +# +############################################################# + +IPKG-UTILS_TARGET_DIR=$(BUILD_DIR)/ipkg-utils-$(IPKG-UTILS_VERSION) + +$(IPKG-UTILS_TARGET_DIR)/.unpacked: $(DL_DIR)/$(IPKG-UTILS_SOURCE) + $(IPKG-UTILS_CAT) $(DL_DIR)/$(IPKG-UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(IPKG-UTILS_TARGET_DIR)/.unpacked + +$(IPKG-UTILS_TARGET_DIR)/.configured: $(IPKG-UTILS_TARGET_DIR)/.unpacked + touch $(IPKG-UTILS_TARGET_DIR)/.configured + +$(IPKG-UTILS_TARGET_DIR)/ipkg-compare-versions: $(IPKG-UTILS_TARGET_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(IPKG-UTILS_TARGET_DIR) + +$(TARGET_DIR)/usr/bin/ipkg-compare-versions: \ + $(IPKG-UTILS_TARGET_DIR)/ipkg-compare-versions + + cp -a $(IPKG-UTILS_TARGET_DIR)/build/scripts-2.4/* + $(TARGET_DIR)/usr/bin/. + +ipkg-utils-target: uclibc $(TARGET_DIR)/usr/bin/ipkg-compare-versions + +############################################################# +# +# Host +# +############################################################# + +IPKG-UTILS_HOST_DIR=$(TOOL_BUILD_DIR)/ipkg-utils-$(IPKG-UTILS_VERSION) + +$(IPKG-UTILS_HOST_DIR)/.unpacked: $(DL_DIR)/$(IPKG-UTILS_SOURCE) + $(IPKG-UTILS_CAT) $(DL_DIR)/$(IPKG-UTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + touch $(IPKG-UTILS_HOST_DIR)/.unpacked + +$(IPKG-UTILS_HOST_DIR)/.configured: $(IPKG-UTILS_HOST_DIR)/.unpacked + touch $(IPKG-UTILS_HOST_DIR)/.configured + +$(IPKG-UTILS_HOST_DIR)/ipkg-compare-versions: $(IPKG-UTILS_HOST_DIR)/.configured + $(MAKE) -C $(IPKG-UTILS_HOST_DIR) + +$(STAGING_DIR)/usr/bin/ipkg-compare-versions: \ + $(IPKG-UTILS_HOST_DIR)/build/scripts-2.4/ipkg-compare-versions + + cp -a $(IPKG-UTILS_TARGET_DIR)/build/scripts-2.4/* + $(STAGING_DIR)/bin/. + +ipkg-utils-host: $(STAGING_DIR)/usr/bin/ipkg-compare-versions + +############################################################# +# +# Common +# +############################################################# + +ipkg-utils-source: $(DL_DIR)/$(IPKG-UTILS_SOURCE) + +ipkg-utils-utilsean: + @if [ -d $(IPKG-UTILS_TARGET_DIR)/Makefile ] ; then \ + $(MAKE) -C $(IPKG-UTILS_TARGET_DIR) clean ; \ + fi; + +ipkg-utils-dirclean: + rm -rf $(IPKG-UTILS_HOST_DIR) $(IPKG-UTILS_TARGET_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_IPKG-UTILS_HOST)),y) +TARGETS+=ipkg-utils-host +endif + +ifeq ($(strip $(BR2_PACKAGE_IPKG-UTILS_TARGET)),y) +TARGETS+=ipkg-utils-target +endif Index: target/packages/Config.in =================================================================== --- target/packages/Config.in (revision 0) +++ target/packages/Config.in (revision 0) @@ -0,0 +1,43 @@ +config BR2_TARGET_PACKAGES + bool "Build autonomous packages (if there are any)" + default y + help + Build autonomous packages/tarballs (if there are any) + +config BR2_TARGET_PACKAGES_TAR_GZ + bool "Tarball, gzip compressed (.tgz)" + depends on BR2_TARGET_PACKAGES + default n + help + +config BR2_TARGET_PACKAGES_TAR_BZ2 + bool "Tarball, bzip2 compressed (.tar.bz2)" + depends on BR2_TARGET_PACKAGES + default n + help + +config BR2_TARGET_PACKAGES_TAR_LZ + bool "Tarball, lzma compressed (.tar.lz)" + depends on BR2_TARGET_PACKAGES + default n + help + +config BR2_TARGET_PACKAGES_UDEBS + bool ".udeb" + depends on BR2_TARGET_PACKAGES + default n + help + Simple and small Debian packages, no dependencies set. + +config BR2_TARGET_PACKAGES_IPKG + bool ".ipk" + depends on BR2_TARGET_PACKAGES + select BR2_PACKAGE_IPKG-UTILS_HOST + default n + help + ipkg from handhelds.org, Deb(ian)'ish package system. + +source "target/packages/ipkg-utils/Config.in" + +source "target/packages/ipkg-cl/Config.in" + Index: project/Makefile.in =================================================================== --- project/Makefile.in (revision 19953) +++ project/Makefile.in (working copy) @@ -58,6 +58,7 @@ PROJECT_BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)project_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)/$(PROJECT) BINARIES_DIR:=$(BASE_DIR)/binaries/$(PROJECT) TARGET_DIR:=$(PROJECT_BUILD_DIR)/root +TARGET_PACKAGES_DIR:=$(PROJECT_BUILD_DIR)/packages # define values for prepatched source trees for toolchains VENDOR_SITE:=$(strip $(subst ",,$(BR2_VENDOR_SITE))) Index: package/x11r7/xapp_xclipboard/Config.in =================================================================== --- package/x11r7/xapp_xclipboard/Config.in (revision 19953) +++ package/x11r7/xapp_xclipboard/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XCLIPBOARD - bool "xclipboard" + tristate "xclipboard" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xapp_beforelight/Config.in =================================================================== --- package/x11r7/xapp_beforelight/Config.in (revision 19953) +++ package/x11r7/xapp_beforelight/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_BEFORELIGHT - bool "beforelight" + tristate "beforelight" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXSCRNSAVER Index: package/x11r7/xdriver_xf86-video-s3virge/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-s3virge/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-s3virge/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3VIRGE - bool "xf86-video-s3virge" + tristate "xf86-video-s3virge" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-input-hyperpen/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-hyperpen/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-hyperpen/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_HYPERPEN - bool "xf86-input-hyperpen" + tristate "xf86-input-hyperpen" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-i740/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-i740/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-i740/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I740 - bool "xf86-video-i740" + tristate "xf86-video-i740" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-nv/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-nv/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-nv/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV - bool "xf86-video-nv" + tristate "xf86-video-nv" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-suntcx/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-suntcx/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-suntcx/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNTCX - bool "xf86-video-suntcx" + tristate "xf86-video-suntcx" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xdpyinfo/Config.in =================================================================== --- package/x11r7/xapp_xdpyinfo/Config.in (revision 19953) +++ package/x11r7/xapp_xdpyinfo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XDPYINFO - bool "xdpyinfo" + tristate "xdpyinfo" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xlib_libXext/Config.in =================================================================== --- package/x11r7/xlib_libXext/Config.in (revision 19953) +++ package/x11r7/xlib_libXext/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXEXT - bool "libXext" + tristate "libXext" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XPROTO_XEXTPROTO Index: package/x11r7/xdriver_xf86-input-penmount/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-penmount/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-penmount/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_PENMOUNT - bool "xf86-input-penmount" + tristate "xf86-input-penmount" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-cyrix/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-cyrix/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-cyrix/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CYRIX - bool "xf86-video-cyrix" + tristate "xf86-video-cyrix" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xprop/Config.in =================================================================== --- package/x11r7/xapp_xprop/Config.in (revision 19953) +++ package/x11r7/xapp_xprop/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XPROP - bool "xprop" + tristate "xprop" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xdriver_xf86-input-evdev/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-evdev/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-evdev/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV - bool "xf86-input-evdev" + tristate "xf86-input-evdev" default n select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XSERVER_XORG_SERVER Index: package/x11r7/xapp_rgb/Config.in =================================================================== --- package/x11r7/xapp_rgb/Config.in (revision 19953) +++ package/x11r7/xapp_rgb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_RGB - bool "rgb" + tristate "rgb" default n select BR2_PACKAGE_XPROTO_XPROTO help Index: package/x11r7/xdriver_xf86-input-dynapro/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-dynapro/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-dynapro/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_DYNAPRO - bool "xf86-input-dynapro" + tristate "xf86-input-dynapro" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_luit/Config.in =================================================================== --- package/x11r7/xapp_luit/Config.in (revision 19953) +++ package/x11r7/xapp_luit/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_LUIT - bool "luit" + tristate "luit" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBFONTENC Index: package/x11r7/xdriver_xf86-input-calcomp/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-calcomp/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-calcomp/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_CALCOMP - bool "xf86-input-calcomp" + tristate "xf86-input-calcomp" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-sisusb/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-sisusb/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-sisusb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SISUSB - bool "xf86-video-sisusb" + tristate "xf86-video-sisusb" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xrx/Config.in =================================================================== --- package/x11r7/xapp_xrx/Config.in (revision 19953) +++ package/x11r7/xapp_xrx/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XRX - bool "xrx" + tristate "xrx" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xstdcmap/Config.in =================================================================== --- package/x11r7/xapp_xstdcmap/Config.in (revision 19953) +++ package/x11r7/xapp_xstdcmap/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XSTDCMAP - bool "xstdcmap" + tristate "xstdcmap" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xclock/Config.in =================================================================== --- package/x11r7/xapp_xclock/Config.in (revision 19953) +++ package/x11r7/xapp_xclock/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XCLOCK - bool "xclock" + tristate "xclock" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW Index: package/x11r7/xdriver_xf86-input-elo2300/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-elo2300/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-elo2300/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_ELO2300 - bool "xf86-input-elo2300" + tristate "xf86-input-elo2300" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-ark/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-ark/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-ark/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ARK - bool "xf86-video-ark" + tristate "xf86-video-ark" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xrdb/Config.in =================================================================== --- package/x11r7/xapp_xrdb/Config.in (revision 19953) +++ package/x11r7/xapp_xrdb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XRDB - bool "xrdb" + tristate "xrdb" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xcursorgen/Config.in =================================================================== --- package/x11r7/xapp_xcursorgen/Config.in (revision 19953) +++ package/x11r7/xapp_xcursorgen/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XCURSORGEN - bool "xcursorgen" + tristate "xcursorgen" default n select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xlib_libxkbui/Config.in =================================================================== --- package/x11r7/xlib_libxkbui/Config.in (revision 19953) +++ package/x11r7/xlib_libxkbui/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXKBUI - bool "libxkbui" + tristate "libxkbui" default n select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXT Index: package/x11r7/xapp_xkbprint/Config.in =================================================================== --- package/x11r7/xapp_xkbprint/Config.in (revision 19953) +++ package/x11r7/xapp_xkbprint/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XKBPRINT - bool "xkbprint" + tristate "xkbprint" default n select BR2_PACKAGE_XLIB_LIBXKBFILE help Index: package/x11r7/xdriver_xf86-input-digitaledge/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-digitaledge/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-digitaledge/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_DIGITALEDGE - bool "xf86-input-digitaledge" + tristate "xf86-input-digitaledge" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-input-dmc/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-dmc/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-dmc/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_DMC - bool "xf86-input-dmc" + tristate "xf86-input-dmc" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_fonttosfnt/Config.in =================================================================== --- package/x11r7/xapp_fonttosfnt/Config.in (revision 19953) +++ package/x11r7/xapp_fonttosfnt/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_FONTTOSFNT - bool "fonttosfnt" + tristate "fonttosfnt" default n select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_proxymngr/Config.in =================================================================== --- package/x11r7/xapp_proxymngr/Config.in (revision 19953) +++ package/x11r7/xapp_proxymngr/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_PROXYMNGR - bool "proxymngr" + tristate "proxymngr" default n select BR2_PACKAGE_XLIB_LIBICE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xkbutils/Config.in =================================================================== --- package/x11r7/xapp_xkbutils/Config.in (revision 19953) +++ package/x11r7/xapp_xkbutils/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XKBUTILS - bool "xkbutils" + tristate "xkbutils" default n select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXKBFILE Index: package/x11r7/xapp_mkfontscale/Config.in =================================================================== --- package/x11r7/xapp_mkfontscale/Config.in (revision 19953) +++ package/x11r7/xapp_mkfontscale/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE - bool "mkfontscale" + tristate "mkfontscale" default n select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xsm/Config.in =================================================================== --- package/x11r7/xapp_xsm/Config.in (revision 19953) +++ package/x11r7/xapp_xsm/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XSM - bool "xsm" + tristate "xsm" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xapp_showfont/Config.in =================================================================== --- package/x11r7/xapp_showfont/Config.in (revision 19953) +++ package/x11r7/xapp_showfont/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_SHOWFONT - bool "showfont" + tristate "showfont" default n select BR2_PACKAGE_XLIB_LIBFS help Index: package/x11r7/xdriver_xf86-video-imstt/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-imstt/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-imstt/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMSTT - bool "xf86-video-imstt" + tristate "xf86-video-imstt" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xlsatoms/Config.in =================================================================== --- package/x11r7/xapp_xlsatoms/Config.in (revision 19953) +++ package/x11r7/xapp_xlsatoms/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XLSATOMS - bool "xlsatoms" + tristate "xlsatoms" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xfindproxy/Config.in =================================================================== --- package/x11r7/xapp_xfindproxy/Config.in (revision 19953) +++ package/x11r7/xapp_xfindproxy/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XFINDPROXY - bool "xfindproxy" + tristate "xfindproxy" default n select BR2_PACKAGE_XLIB_LIBICE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xlib_libXrandr/Config.in =================================================================== --- package/x11r7/xlib_libXrandr/Config.in (revision 19953) +++ package/x11r7/xlib_libXrandr/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXRANDR - bool "libXrandr" + tristate "libXrandr" default n select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xdriver_xf86-video-sunleo/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-sunleo/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-sunleo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNLEO - bool "xf86-video-sunleo" + tristate "xf86-video-sunleo" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-chips/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-chips/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-chips/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CHIPS - bool "xf86-video-chips" + tristate "xf86-video-chips" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-cirrus/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-cirrus/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-cirrus/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CIRRUS - bool "xf86-video-cirrus" + tristate "xf86-video-cirrus" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXtst/Config.in =================================================================== --- package/x11r7/xlib_libXtst/Config.in (revision 19953) +++ package/x11r7/xlib_libXtst/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXTST - bool "libXtst" + tristate "libXtst" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xdriinfo/Config.in =================================================================== --- package/x11r7/xapp_xdriinfo/Config.in (revision 19953) +++ package/x11r7/xapp_xdriinfo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XDRIINFO - bool "xdriinfo" + tristate "xdriinfo" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XPROTO_GLPROTO Index: package/x11r7/xapp_xkbevd/Config.in =================================================================== --- package/x11r7/xapp_xkbevd/Config.in (revision 19953) +++ package/x11r7/xapp_xkbevd/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XKBEVD - bool "xkbevd" + tristate "xkbevd" default n select BR2_PACKAGE_XLIB_LIBXKBFILE help Index: package/x11r7/xapp_listres/Config.in =================================================================== --- package/x11r7/xapp_listres/Config.in (revision 19953) +++ package/x11r7/xapp_listres/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_LISTRES - bool "listres" + tristate "listres" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW Index: package/x11r7/xlib_libFS/Config.in =================================================================== --- package/x11r7/xlib_libFS/Config.in (revision 19953) +++ package/x11r7/xlib_libFS/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBFS - bool "libFS" + tristate "libFS" default n select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XPROTO_XPROTO Index: package/x11r7/xapp_bdftopcf/Config.in =================================================================== --- package/x11r7/xapp_bdftopcf/Config.in (revision 19953) +++ package/x11r7/xapp_bdftopcf/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_BDFTOPCF - bool "bdftopcf" + tristate "bdftopcf" default n select BR2_PACKAGE_XLIB_LIBXFONT help Index: package/x11r7/xdriver_xf86-video-via/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-via/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-via/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VIA - bool "xf86-video-via" + tristate "xf86-video-via" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xapp_xdm/Config.in =================================================================== --- package/x11r7/xapp_xdm/Config.in (revision 19953) +++ package/x11r7/xapp_xdm/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XDM - bool "xdm" + tristate "xdm" default n select BR2_PACKAGE_XAPP_XINIT select BR2_PACKAGE_XAPP_SESSREG Index: package/x11r7/xdriver_xf86-video-i128/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-i128/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-i128/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I128 - bool "xf86-video-i128" + tristate "xf86-video-i128" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-input-vmmouse/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-vmmouse/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-vmmouse/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_VMMOUSE - bool "xf86-input-vmmouse" + tristate "xf86-input-vmmouse" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-suncg14/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-suncg14/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-suncg14/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG14 - bool "xf86-video-suncg14" + tristate "xf86-video-suncg14" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXevie/Config.in =================================================================== --- package/x11r7/xlib_libXevie/Config.in (revision 19953) +++ package/x11r7/xlib_libXevie/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXEVIE - bool "libXevie" + tristate "libXevie" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_setxkbmap/Config.in =================================================================== --- package/x11r7/xapp_setxkbmap/Config.in (revision 19953) +++ package/x11r7/xapp_setxkbmap/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_SETXKBMAP - bool "setxkbmap" + tristate "setxkbmap" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXKBFILE Index: package/x11r7/xapp_xbiff/Config.in =================================================================== --- package/x11r7/xapp_xbiff/Config.in (revision 19953) +++ package/x11r7/xapp_xbiff/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XBIFF - bool "xbiff" + tristate "xbiff" default n select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XDATA_XBITMAPS Index: package/x11r7/xlib_libXprintUtil/Config.in =================================================================== --- package/x11r7/xlib_libXprintUtil/Config.in (revision 19953) +++ package/x11r7/xlib_libXprintUtil/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXPRINTUTIL - bool "libXprintUtil" + tristate "libXprintUtil" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXP Index: package/x11r7/xdriver_xf86-video-ast/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-ast/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-ast/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AST - bool "xf86-video-ast" + tristate "xf86-video-ast" default n help xf86-video-ast 0.81.0 Index: package/x11r7/xlib_liblbxutil/Config.in =================================================================== --- package/x11r7/xlib_liblbxutil/Config.in (revision 19953) +++ package/x11r7/xlib_liblbxutil/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBLBXUTIL - bool "liblbxutil" + tristate "liblbxutil" default n select BR2_PACKAGE_XPROTO_XEXTPROTO help Index: package/x11r7/xdriver_xf86-input-void/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-void/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-void/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID - bool "xf86-input-void" + tristate "xf86-input-void" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-dummy/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-dummy/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-dummy/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_DUMMY - bool "xf86-video-dummy" + tristate "xf86-video-dummy" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXcomposite/Config.in =================================================================== --- package/x11r7/xlib_libXcomposite/Config.in (revision 19953) +++ package/x11r7/xlib_libXcomposite/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXCOMPOSITE - bool "libXcomposite" + tristate "libXcomposite" default n select BR2_PACKAGE_XPROTO_COMPOSITEPROTO select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xdriver_xf86-input-ur98/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-ur98/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-ur98/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_UR98 - bool "xf86-input-ur98" + tristate "xf86-input-ur98" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-vmware/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-vmware/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-vmware/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE - bool "xf86-video-vmware" + tristate "xf86-video-vmware" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libfontenc/Config.in =================================================================== --- package/x11r7/xlib_libfontenc/Config.in (revision 19953) +++ package/x11r7/xlib_libfontenc/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBFONTENC - bool "libfontenc" + tristate "libfontenc" default n select BR2_PACKAGE_XPROTO_XPROTO help Index: package/x11r7/xserver_xorg-server/Config.in =================================================================== --- package/x11r7/xserver_xorg-server/Config.in (revision 19953) +++ package/x11r7/xserver_xorg-server/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER - bool "xorg-server" + tristate "xorg-server" default n select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_LIBDRM Index: package/x11r7/xapp_ico/Config.in =================================================================== --- package/x11r7/xapp_ico/Config.in (revision 19953) +++ package/x11r7/xapp_ico/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_ICO - bool "ico" + tristate "ico" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xapp_xfsinfo/Config.in =================================================================== --- package/x11r7/xapp_xfsinfo/Config.in (revision 19953) +++ package/x11r7/xapp_xfsinfo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XFSINFO - bool "xfsinfo" + tristate "xfsinfo" default n select BR2_PACKAGE_XLIB_LIBFS select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xlib_libXxf86dga/Config.in =================================================================== --- package/x11r7/xlib_libXxf86dga/Config.in (revision 19953) +++ package/x11r7/xlib_libXxf86dga/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXXF86DGA - bool "libXxf86dga" + tristate "libXxf86dga" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xplsprinters/Config.in =================================================================== --- package/x11r7/xapp_xplsprinters/Config.in (revision 19953) +++ package/x11r7/xapp_xplsprinters/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XPLSPRINTERS - bool "xplsprinters" + tristate "xplsprinters" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXP Index: package/x11r7/xdriver_xf86-video-tdfx/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-tdfx/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-tdfx/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX - bool "xf86-video-tdfx" + tristate "xf86-video-tdfx" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xdriver_xf86-video-ati/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-ati/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-ati/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI - bool "xf86-video-ati" + tristate "xf86-video-ati" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xlib_libX11/Config.in =================================================================== --- package/x11r7/xlib_libX11/Config.in (revision 19953) +++ package/x11r7/xlib_libX11/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBX11 - bool "libX11" + tristate "libX11" default n select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XUTIL_UTIL_MACROS Index: package/x11r7/xlib_libXmu/Config.in =================================================================== --- package/x11r7/xlib_libXmu/Config.in (revision 19953) +++ package/x11r7/xlib_libXmu/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXMU - bool "libXmu" + tristate "libXmu" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_fstobdf/Config.in =================================================================== --- package/x11r7/xapp_fstobdf/Config.in (revision 19953) +++ package/x11r7/xapp_fstobdf/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_FSTOBDF - bool "fstobdf" + tristate "fstobdf" default n select BR2_PACKAGE_XLIB_LIBFS select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xsetmode/Config.in =================================================================== --- package/x11r7/xapp_xsetmode/Config.in (revision 19953) +++ package/x11r7/xapp_xsetmode/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XSETMODE - bool "xsetmode" + tristate "xsetmode" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXI Index: package/x11r7/xapp_xcalc/Config.in =================================================================== --- package/x11r7/xapp_xcalc/Config.in (revision 19953) +++ package/x11r7/xapp_xcalc/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XCALC - bool "xcalc" + tristate "xcalc" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xapp_xmh/Config.in =================================================================== --- package/x11r7/xapp_xmh/Config.in (revision 19953) +++ package/x11r7/xapp_xmh/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XMH - bool "xmh" + tristate "xmh" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xapp_mkfontdir/Config.in =================================================================== --- package/x11r7/xapp_mkfontdir/Config.in (revision 19953) +++ package/x11r7/xapp_mkfontdir/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_MKFONTDIR - bool "mkfontdir" + tristate "mkfontdir" default n select BR2_PACKAGE_XAPP_MKFONTSCALE help Index: package/x11r7/xapp_xeyes/Config.in =================================================================== --- package/x11r7/xapp_xeyes/Config.in (revision 19953) +++ package/x11r7/xapp_xeyes/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XEYES - bool "xeyes" + tristate "xeyes" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xdriver_xf86-video-s3/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-s3/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-s3/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3 - bool "xf86-video-s3" + tristate "xf86-video-s3" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xrandr/Config.in =================================================================== --- package/x11r7/xapp_xrandr/Config.in (revision 19953) +++ package/x11r7/xapp_xrandr/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XRANDR - bool "xrandr" + tristate "xrandr" default n select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xdriver_xf86-input-jamstudio/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-jamstudio/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-jamstudio/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_JAMSTUDIO - bool "xf86-input-jamstudio" + tristate "xf86-input-jamstudio" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-input-keyboard/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-keyboard/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-keyboard/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD - bool "xf86-input-keyboard" + tristate "xf86-input-keyboard" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xwininfo/Config.in =================================================================== --- package/x11r7/xapp_xwininfo/Config.in (revision 19953) +++ package/x11r7/xapp_xwininfo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XWININFO - bool "xwininfo" + tristate "xwininfo" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xev/Config.in =================================================================== --- package/x11r7/xapp_xev/Config.in (revision 19953) +++ package/x11r7/xapp_xev/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XEV - bool "xev" + tristate "xev" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xlib_libdmx/Config.in =================================================================== --- package/x11r7/xlib_libdmx/Config.in (revision 19953) +++ package/x11r7/xlib_libdmx/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBDMX - bool "libdmx" + tristate "libdmx" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_oclock/Config.in =================================================================== --- package/x11r7/xapp_oclock/Config.in (revision 19953) +++ package/x11r7/xapp_oclock/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_OCLOCK - bool "oclock" + tristate "oclock" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xmessage/Config.in =================================================================== --- package/x11r7/xapp_xmessage/Config.in (revision 19953) +++ package/x11r7/xapp_xmessage/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XMESSAGE - bool "xmessage" + tristate "xmessage" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xdriver_xf86-video-v4l/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-v4l/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-v4l/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_V4L - bool "xf86-video-v4l" + tristate "xf86-video-v4l" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_RANDRPROTO Index: package/x11r7/xlib_libXft/Config.in =================================================================== --- package/x11r7/xlib_libXft/Config.in (revision 19953) +++ package/x11r7/xlib_libXft/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXFT - bool "libXft" + tristate "libXft" default n select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE Index: package/x11r7/xapp_xlsfonts/Config.in =================================================================== --- package/x11r7/xapp_xlsfonts/Config.in (revision 19953) +++ package/x11r7/xapp_xlsfonts/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XLSFONTS - bool "xlsfonts" + tristate "xlsfonts" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xapp_smproxy/Config.in =================================================================== --- package/x11r7/xapp_smproxy/Config.in (revision 19953) +++ package/x11r7/xapp_smproxy/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_SMPROXY - bool "smproxy" + tristate "smproxy" default n select BR2_PACKAGE_XLIB_LIBXMU select BR2_PACKAGE_XLIB_LIBXT Index: package/x11r7/xapp_fslsfonts/Config.in =================================================================== --- package/x11r7/xapp_fslsfonts/Config.in (revision 19953) +++ package/x11r7/xapp_fslsfonts/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_FSLSFONTS - bool "fslsfonts" + tristate "fslsfonts" default n select BR2_PACKAGE_XLIB_LIBFS select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xfd/Config.in =================================================================== --- package/x11r7/xapp_xfd/Config.in (revision 19953) +++ package/x11r7/xapp_xfd/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XFD - bool "xfd" + tristate "xfd" default n select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FONTCONFIG Index: package/x11r7/xlib_libXinerama/Config.in =================================================================== --- package/x11r7/xlib_libXinerama/Config.in (revision 19953) +++ package/x11r7/xlib_libXinerama/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXINERAMA - bool "libXinerama" + tristate "libXinerama" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xkill/Config.in =================================================================== --- package/x11r7/xapp_xkill/Config.in (revision 19953) +++ package/x11r7/xapp_xkill/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XKILL - bool "xkill" + tristate "xkill" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xdriver_xf86-video-tga/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-tga/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-tga/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA - bool "xf86-video-tga" + tristate "xf86-video-tga" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXrender/Config.in =================================================================== --- package/x11r7/xlib_libXrender/Config.in (revision 19953) +++ package/x11r7/xlib_libXrender/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXRENDER - bool "libXrender" + tristate "libXrender" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XPROTO_RENDERPROTO Index: package/x11r7/xdriver_xf86-video-glint/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-glint/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-glint/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT - bool "xf86-video-glint" + tristate "xf86-video-glint" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xapp_scripts/Config.in =================================================================== --- package/x11r7/xapp_scripts/Config.in (revision 19953) +++ package/x11r7/xapp_scripts/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_SCRIPTS - bool "scripts" + tristate "scripts" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xapp_lbxproxy/Config.in =================================================================== --- package/x11r7/xapp_lbxproxy/Config.in (revision 19953) +++ package/x11r7/xapp_lbxproxy/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_LBXPROXY - bool "lbxproxy" + tristate "lbxproxy" default n select BR2_PACKAGE_XLIB_LIBICE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xlsclients/Config.in =================================================================== --- package/x11r7/xapp_xlsclients/Config.in (revision 19953) +++ package/x11r7/xapp_xlsclients/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XLSCLIENTS - bool "xlsclients" + tristate "xlsclients" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xdriver_xf86-input-mouse/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-mouse/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-mouse/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE - bool "xf86-input-mouse" + tristate "xf86-input-mouse" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xmore/Config.in =================================================================== --- package/x11r7/xapp_xmore/Config.in (revision 19953) +++ package/x11r7/xapp_xmore/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XMORE - bool "xmore" + tristate "xmore" default n select BR2_PACKAGE_XLIB_LIBXPRINTUTIL select BR2_PACKAGE_XLIB_LIBXPRINTUTIL Index: package/x11r7/xdriver_xf86-video-nsc/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-nsc/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-nsc/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NSC - bool "xf86-video-nsc" + tristate "xf86-video-nsc" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xmag/Config.in =================================================================== --- package/x11r7/xapp_xmag/Config.in (revision 19953) +++ package/x11r7/xapp_xmag/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XMAG - bool "xmag" + tristate "xmag" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xdriver_xf86-input-citron/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-citron/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-citron/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_CITRON - bool "xf86-input-citron" + tristate "xf86-input-citron" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xfs/Config.in =================================================================== --- package/x11r7/xapp_xfs/Config.in (revision 19953) +++ package/x11r7/xapp_xfs/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XFS - bool "xfs" + tristate "xfs" default n select BR2_PACKAGE_XLIB_LIBFS select BR2_PACKAGE_XLIB_LIBXFONT Index: package/x11r7/xdriver_xf86-input-elographics/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-elographics/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-elographics/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_ELOGRAPHICS - bool "xf86-input-elographics" + tristate "xf86-input-elographics" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-input-fpit/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-fpit/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-fpit/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_FPIT - bool "xf86-input-fpit" + tristate "xf86-input-fpit" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xman/Config.in =================================================================== --- package/x11r7/xapp_xman/Config.in (revision 19953) +++ package/x11r7/xapp_xman/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XMAN - bool "xapp_xman" + tristate "xapp_xman" default n help Manual page display program for the X Window System Index: package/x11r7/xapp_xvidtune/Config.in =================================================================== --- package/x11r7/xapp_xvidtune/Config.in (revision 19953) +++ package/x11r7/xapp_xvidtune/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XVIDTUNE - bool "xvidtune" + tristate "xvidtune" default n select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXXF86VM Index: package/x11r7/xdriver_xf86-video-newport/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-newport/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-newport/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEWPORT - bool "xf86-video-newport" + tristate "xf86-video-newport" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-sis/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-sis/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-sis/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS - bool "xf86-video-sis" + tristate "xf86-video-sis" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xapp_sessreg/Config.in =================================================================== --- package/x11r7/xapp_sessreg/Config.in (revision 19953) +++ package/x11r7/xapp_sessreg/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_SESSREG - bool "sessreg" + tristate "sessreg" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XPROTO_XPROTO Index: package/x11r7/libxcb/Config.in =================================================================== --- package/x11r7/libxcb/Config.in (revision 19953) +++ package/x11r7/libxcb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_LIBXCB - bool "libxcb" + tristate "libxcb" default n select BR2_PACKAGE_PTHREAD_STUBS select BR2_PACKAGE_XCB_PROTO Index: package/x11r7/xlib_libXfont/Config.in =================================================================== --- package/x11r7/xlib_libXfont/Config.in (revision 19953) +++ package/x11r7/xlib_libXfont/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXFONT - bool "libXfont" + tristate "libXfont" default n select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_XLIB_LIBFONTENC Index: package/x11r7/xapp_bitmap/Config.in =================================================================== --- package/x11r7/xapp_bitmap/Config.in (revision 19953) +++ package/x11r7/xapp_bitmap/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_BITMAP - bool "bitmap" + tristate "bitmap" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW Index: package/x11r7/xapp_xdbedizzy/Config.in =================================================================== --- package/x11r7/xapp_xdbedizzy/Config.in (revision 19953) +++ package/x11r7/xapp_xdbedizzy/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XDBEDIZZY - bool "xdbedizzy" + tristate "xdbedizzy" default n select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXP Index: package/x11r7/xlib_libXxf86misc/Config.in =================================================================== --- package/x11r7/xlib_libXxf86misc/Config.in (revision 19953) +++ package/x11r7/xlib_libXxf86misc/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXXF86MISC - bool "libXxf86misc" + tristate "libXxf86misc" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xedit/Config.in =================================================================== --- package/x11r7/xapp_xedit/Config.in (revision 19953) +++ package/x11r7/xapp_xedit/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XEDIT - bool "xedit" + tristate "xedit" default n select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXPRINTUTIL Index: package/x11r7/xdriver_xf86-video-savage/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-savage/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-savage/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE - bool "xf86-video-savage" + tristate "xf86-video-savage" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xapp_xcmsdb/Config.in =================================================================== --- package/x11r7/xapp_xcmsdb/Config.in (revision 19953) +++ package/x11r7/xapp_xcmsdb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XCMSDB - bool "xcmsdb" + tristate "xcmsdb" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xapp_xgc/Config.in =================================================================== --- package/x11r7/xapp_xgc/Config.in (revision 19953) +++ package/x11r7/xapp_xgc/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XGC - bool "xgc" + tristate "xgc" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xdriver_xf86-video-trident/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-trident/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-trident/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TRIDENT - bool "xf86-video-trident" + tristate "xf86-video-trident" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_iceauth/Config.in =================================================================== --- package/x11r7/xapp_iceauth/Config.in (revision 19953) +++ package/x11r7/xapp_iceauth/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_ICEAUTH - bool "iceauth" + tristate "iceauth" default n select BR2_PACKAGE_XLIB_LIBICE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xdriver_xf86-input-palmax/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-palmax/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-palmax/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_PALMAX - bool "xf86-input-palmax" + tristate "xf86-input-palmax" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xset/Config.in =================================================================== --- package/x11r7/xapp_xset/Config.in (revision 19953) +++ package/x11r7/xapp_xset/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XSET - bool "xset" + tristate "xset" default n select BR2_PACKAGE_XLIB_LIBXFONTCACHE select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xphelloworld/Config.in =================================================================== --- package/x11r7/xapp_xphelloworld/Config.in (revision 19953) +++ package/x11r7/xapp_xphelloworld/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XPHELLOWORLD - bool "xphelloworld" + tristate "xphelloworld" default n select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXPRINTAPPUTIL Index: package/x11r7/mesa3d/Config.in =================================================================== --- package/x11r7/mesa3d/Config.in (revision 19953) +++ package/x11r7/mesa3d/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_MESA3D - bool "Mesa 3D Graphics Library" + tristate "Mesa 3D Graphics Library" default n select BR2_PACKAGE_XPROTO_GLPROTO select BR2_PACKAGE_XSERVER_XORG_SERVER Index: package/x11r7/xapp_xfwp/Config.in =================================================================== --- package/x11r7/xapp_xfwp/Config.in (revision 19953) +++ package/x11r7/xapp_xfwp/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XFWP - bool "xfwp" + tristate "xfwp" default n select BR2_PACKAGE_XLIB_LIBICE select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_x11perf/Config.in =================================================================== --- package/x11r7/xapp_x11perf/Config.in (revision 19953) +++ package/x11r7/xapp_x11perf/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_X11PERF - bool "x11perf" + tristate "x11perf" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xwud/Config.in =================================================================== --- package/x11r7/xapp_xwud/Config.in (revision 19953) +++ package/x11r7/xapp_xwud/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XWUD - bool "xwud" + tristate "xwud" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xdriver_xf86-video-tseng/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-tseng/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-tseng/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TSENG - bool "xf86-video-tseng" + tristate "xf86-video-tseng" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXvMC/Config.in =================================================================== --- package/x11r7/xlib_libXvMC/Config.in (revision 19953) +++ package/x11r7/xlib_libXvMC/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXVMC - bool "libXvMC" + tristate "libXvMC" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xinit/Config.in =================================================================== --- package/x11r7/xapp_xinit/Config.in (revision 19953) +++ package/x11r7/xapp_xinit/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XINIT - bool "xinit" + tristate "xinit" default n select BR2_PACKAGE_XAPP_XAUTH select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xlib_libXi/Config.in =================================================================== --- package/x11r7/xlib_libXi/Config.in (revision 19953) +++ package/x11r7/xlib_libXi/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXI - bool "libXi" + tristate "libXi" default n select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xlib_libXfontcache/Config.in =================================================================== --- package/x11r7/xlib_libXfontcache/Config.in (revision 19953) +++ package/x11r7/xlib_libXfontcache/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXFONTCACHE - bool "libXfontcache" + tristate "libXfontcache" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xdriver_xf86-input-joystick/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-joystick/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-joystick/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_JOYSTICK - bool "xf86-input-joystick" + tristate "xf86-input-joystick" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xwd/Config.in =================================================================== --- package/x11r7/xapp_xwd/Config.in (revision 19953) +++ package/x11r7/xapp_xwd/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XWD - bool "xwd" + tristate "xwd" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xfontsel/Config.in =================================================================== --- package/x11r7/xapp_xfontsel/Config.in (revision 19953) +++ package/x11r7/xapp_xfontsel/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XFONTSEL - bool "xfontsel" + tristate "xfontsel" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xapp_xditview/Config.in =================================================================== --- package/x11r7/xapp_xditview/Config.in (revision 19953) +++ package/x11r7/xapp_xditview/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XDITVIEW - bool "xditview" + tristate "xditview" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xdriver_xf86-video-rendition/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-rendition/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-rendition/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_RENDITION - bool "xf86-video-rendition" + tristate "xf86-video-rendition" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXp/Config.in =================================================================== --- package/x11r7/xlib_libXp/Config.in (revision 19953) +++ package/x11r7/xlib_libXp/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXP - bool "libXp" + tristate "libXp" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU Index: package/x11r7/xapp_twm/Config.in =================================================================== --- package/x11r7/xapp_twm/Config.in (revision 19953) +++ package/x11r7/xapp_twm/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_TWM - bool "twm" + tristate "twm" default n help twm 1.0.3 Index: package/x11r7/xlib_libXt/Config.in =================================================================== --- package/x11r7/xlib_libXt/Config.in (revision 19953) +++ package/x11r7/xlib_libXt/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXT - bool "libXt" + tristate "libXt" default n select BR2_PACKAGE_XLIB_LIBSM select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xvinfo/Config.in =================================================================== --- package/x11r7/xapp_xvinfo/Config.in (revision 19953) +++ package/x11r7/xapp_xvinfo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XVINFO - bool "xvinfo" + tristate "xvinfo" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXV Index: package/x11r7/xapp_xgamma/Config.in =================================================================== --- package/x11r7/xapp_xgamma/Config.in (revision 19953) +++ package/x11r7/xapp_xgamma/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XGAMMA - bool "xgamma" + tristate "xgamma" default n select BR2_PACKAGE_XLIB_LIBXXF86VM help Index: package/x11r7/xlib_libXv/Config.in =================================================================== --- package/x11r7/xlib_libXv/Config.in (revision 19953) +++ package/x11r7/xlib_libXv/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXV - bool "libXv" + tristate "libXv" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xlib_libXScrnSaver/Config.in =================================================================== --- package/x11r7/xlib_libXScrnSaver/Config.in (revision 19953) +++ package/x11r7/xlib_libXScrnSaver/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXSCRNSAVER - bool "libXScrnSaver" + tristate "libXScrnSaver" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xdriver_xf86-video-mga/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-mga/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-mga/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA - bool "xf86-video-mga" + tristate "xf86-video-mga" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xdriver_xf86-video-voodoo/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-voodoo/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-voodoo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VOODOO - bool "xf86-video-voodoo" + tristate "xf86-video-voodoo" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libXpm/Config.in =================================================================== --- package/x11r7/xlib_libXpm/Config.in (revision 19953) +++ package/x11r7/xlib_libXpm/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXPM - bool "libXpm" + tristate "libXpm" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xlib_libXcursor/Config.in =================================================================== --- package/x11r7/xlib_libXcursor/Config.in (revision 19953) +++ package/x11r7/xlib_libXcursor/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXCURSOR - bool "libXcursor" + tristate "libXcursor" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXFIXES Index: package/x11r7/xlib_libXdamage/Config.in =================================================================== --- package/x11r7/xlib_libXdamage/Config.in (revision 19953) +++ package/x11r7/xlib_libXdamage/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXDAMAGE - bool "libXdamage" + tristate "libXdamage" default n select BR2_PACKAGE_XPROTO_DAMAGEPROTO select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_xsetroot/Config.in =================================================================== --- package/x11r7/xapp_xsetroot/Config.in (revision 19953) +++ package/x11r7/xapp_xsetroot/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XSETROOT - bool "xsetroot" + tristate "xsetroot" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xlogo/Config.in =================================================================== --- package/x11r7/xapp_xlogo/Config.in (revision 19953) +++ package/x11r7/xapp_xlogo/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XLOGO - bool "xlogo" + tristate "xlogo" default n select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXPRINTUTIL Index: package/x11r7/xdriver_xf86-video-sunbw2/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-sunbw2/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-sunbw2/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNBW2 - bool "xf86-video-sunbw2" + tristate "xf86-video-sunbw2" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_RANDRPROTO Index: package/x11r7/xapp_xauth/Config.in =================================================================== --- package/x11r7/xapp_xauth/Config.in (revision 19953) +++ package/x11r7/xapp_xauth/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XAUTH - bool "xauth" + tristate "xauth" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU Index: package/x11r7/xapp_appres/Config.in =================================================================== --- package/x11r7/xapp_appres/Config.in (revision 19953) +++ package/x11r7/xapp_appres/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_APPRES - bool "appres" + tristate "appres" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT Index: package/x11r7/xdriver_xf86-video-neomagic/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-neomagic/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-neomagic/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEOMAGIC - bool "xf86-video-neomagic" + tristate "xf86-video-neomagic" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-sunffb/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-sunffb/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-sunffb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNFFB - bool "xf86-video-sunffb" + tristate "xf86-video-sunffb" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xapp_xtrap/Config.in =================================================================== --- package/x11r7/xapp_xtrap/Config.in (revision 19953) +++ package/x11r7/xapp_xtrap/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XTRAP - bool "xtrap" + tristate "xtrap" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXTRAP Index: package/x11r7/xdriver_xf86-video-fbdev/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-fbdev/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-fbdev/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV - bool "xf86-video-fbdev" + tristate "xf86-video-fbdev" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-video-siliconmotion/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-siliconmotion/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-siliconmotion/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SILICONMOTION - bool "xf86-video-siliconmotion" + tristate "xf86-video-siliconmotion" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_editres/Config.in =================================================================== --- package/x11r7/xapp_editres/Config.in (revision 19953) +++ package/x11r7/xapp_editres/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_EDITRES - bool "editres" + tristate "editres" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW Index: package/x11r7/xlib_libxkbfile/Config.in =================================================================== --- package/x11r7/xlib_libxkbfile/Config.in (revision 19953) +++ package/x11r7/xlib_libxkbfile/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXKBFILE - bool "libxkbfile" + tristate "libxkbfile" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XPROTO_KBPROTO Index: package/x11r7/xapp_xkbcomp/Config.in =================================================================== --- package/x11r7/xapp_xkbcomp/Config.in (revision 19953) +++ package/x11r7/xapp_xkbcomp/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XKBCOMP - bool "xkbcomp" + tristate "xkbcomp" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXKBFILE Index: package/x11r7/xlib_libXxf86vm/Config.in =================================================================== --- package/x11r7/xlib_libXxf86vm/Config.in (revision 19953) +++ package/x11r7/xlib_libXxf86vm/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXXF86VM - bool "libXxf86vm" + tristate "libXxf86vm" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xapp_xhost/Config.in =================================================================== --- package/x11r7/xapp_xhost/Config.in (revision 19953) +++ package/x11r7/xapp_xhost/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XHOST - bool "xhost" + tristate "xhost" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xapp_xf86dga/Config.in =================================================================== --- package/x11r7/xapp_xf86dga/Config.in (revision 19953) +++ package/x11r7/xapp_xf86dga/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XF86DGA - bool "xf86dga" + tristate "xf86dga" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXXF86DGA Index: package/x11r7/xapp_xpr/Config.in =================================================================== --- package/x11r7/xapp_xpr/Config.in (revision 19953) +++ package/x11r7/xapp_xpr/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XPR - bool "xpr" + tristate "xpr" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXMU Index: package/x11r7/xlib_libXau/Config.in =================================================================== --- package/x11r7/xlib_libXau/Config.in (revision 19953) +++ package/x11r7/xlib_libXau/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXAU - bool "libXau" + tristate "libXau" default n select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XPROTO_XPROTO Index: package/x11r7/xlib_libXTrap/Config.in =================================================================== --- package/x11r7/xlib_libXTrap/Config.in (revision 19953) +++ package/x11r7/xlib_libXTrap/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXTRAP - bool "libXTrap" + tristate "libXTrap" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT Index: package/x11r7/xlib_libXaw/Config.in =================================================================== --- package/x11r7/xlib_libXaw/Config.in (revision 19953) +++ package/x11r7/xlib_libXaw/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXAW - bool "libXaw" + tristate "libXaw" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT Index: package/x11r7/xdriver_xf86-input-microtouch/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-microtouch/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-microtouch/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_MICROTOUCH - bool "xf86-input-microtouch" + tristate "xf86-input-microtouch" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_rstart/Config.in =================================================================== --- package/x11r7/xapp_rstart/Config.in (revision 19953) +++ package/x11r7/xapp_rstart/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_RSTART - bool "rstart" + tristate "rstart" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xdriver_xf86-input-magellan/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-magellan/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-magellan/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_MAGELLAN - bool "xf86-input-magellan" + tristate "xf86-input-magellan" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xprehashprinterlist/Config.in =================================================================== --- package/x11r7/xapp_xprehashprinterlist/Config.in (revision 19953) +++ package/x11r7/xapp_xprehashprinterlist/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XPREHASHPRINTERLIST - bool "xprehashprinterlist" + tristate "xprehashprinterlist" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXP Index: package/x11r7/xlib_libXfixes/Config.in =================================================================== --- package/x11r7/xlib_libXfixes/Config.in (revision 19953) +++ package/x11r7/xlib_libXfixes/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXFIXES - bool "libXfixes" + tristate "libXfixes" default n select BR2_PACKAGE_XPROTO_FIXESPROTO select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xlib_liboldX/Config.in =================================================================== --- package/x11r7/xlib_liboldX/Config.in (revision 19953) +++ package/x11r7/xlib_liboldX/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBOLDX - bool "liboldX" + tristate "liboldX" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xapp_xsetpointer/Config.in =================================================================== --- package/x11r7/xapp_xsetpointer/Config.in (revision 19953) +++ package/x11r7/xapp_xsetpointer/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XSETPOINTER - bool "xsetpointer" + tristate "xsetpointer" default n select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XLIB_LIBX11 Index: package/x11r7/xapp_viewres/Config.in =================================================================== --- package/x11r7/xapp_viewres/Config.in (revision 19953) +++ package/x11r7/xapp_viewres/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_VIEWRES - bool "viewres" + tristate "viewres" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/xdriver_xf86-video-apm/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-apm/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-apm/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_APM - bool "xf86-video-apm" + tristate "xf86-video-apm" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xrefresh/Config.in =================================================================== --- package/x11r7/xapp_xrefresh/Config.in (revision 19953) +++ package/x11r7/xapp_xrefresh/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XREFRESH - bool "xrefresh" + tristate "xrefresh" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xlib_libXdmcp/Config.in =================================================================== --- package/x11r7/xlib_libXdmcp/Config.in (revision 19953) +++ package/x11r7/xlib_libXdmcp/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXDMCP - bool "libXdmcp" + tristate "libXdmcp" default n select BR2_PACKAGE_XUTIL_UTIL_MACROS select BR2_PACKAGE_XPROTO_XPROTO Index: package/x11r7/xdriver_xf86-video-i810/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-i810/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-i810/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I810 - bool "xf86-video-i810" + tristate "xf86-video-i810" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xlib_libSM/Config.in =================================================================== --- package/x11r7/xlib_libSM/Config.in (revision 19953) +++ package/x11r7/xlib_libSM/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBSM - bool "libSM" + tristate "libSM" default n select BR2_PACKAGE_XLIB_LIBICE select BR2_PACKAGE_XLIB_XTRANS Index: package/x11r7/xlib_libXres/Config.in =================================================================== --- package/x11r7/xlib_libXres/Config.in (revision 19953) +++ package/x11r7/xlib_libXres/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXRES - bool "libXres" + tristate "libXres" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT Index: package/x11r7/xdriver_xf86-input-spaceorb/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-spaceorb/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-spaceorb/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_SPACEORB - bool "xf86-input-spaceorb" + tristate "xf86-input-spaceorb" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xlib_libXprintAppUtil/Config.in =================================================================== --- package/x11r7/xlib_libXprintAppUtil/Config.in (revision 19953) +++ package/x11r7/xlib_libXprintAppUtil/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBXPRINTAPPUTIL - bool "libXprintAppUtil" + tristate "libXprintAppUtil" default n select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXP Index: package/x11r7/xdriver_xf86-input-acecad/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-acecad/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-acecad/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_ACECAD - bool "xf86-input-acecad" + tristate "xf86-input-acecad" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xapp_xmodmap/Config.in =================================================================== --- package/x11r7/xapp_xmodmap/Config.in (revision 19953) +++ package/x11r7/xapp_xmodmap/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XMODMAP - bool "xmodmap" + tristate "xmodmap" default n select BR2_PACKAGE_XLIB_LIBX11 help Index: package/x11r7/xlib_xtrans/Config.in =================================================================== --- package/x11r7/xlib_xtrans/Config.in (revision 19953) +++ package/x11r7/xlib_xtrans/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_XTRANS - bool "xtrans" + tristate "xtrans" default n help xtrans 1.0.3 Index: package/x11r7/xdriver_xf86-video-vesa/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-vesa/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-vesa/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VESA - bool "xf86-video-vesa" + tristate "xf86-video-vesa" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xapp_xload/Config.in =================================================================== --- package/x11r7/xapp_xload/Config.in (revision 19953) +++ package/x11r7/xapp_xload/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XAPP_XLOAD - bool "xload" + tristate "xload" default n select BR2_PACKAGE_XLIB_LIBXAW help Index: package/x11r7/openchrome/Config.in =================================================================== --- package/x11r7/openchrome/Config.in (revision 19953) +++ package/x11r7/openchrome/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_OPENCHROME - bool "openchrome" + tristate "openchrome" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBDRM Index: package/x11r7/xdriver_xf86-video-suncg3/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-suncg3/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-suncg3/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG3 - bool "xf86-video-suncg3" + tristate "xf86-video-suncg3" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xdriver_xf86-input-tek4957/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-tek4957/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-tek4957/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TEK4957 - bool "xf86-input-tek4957" + tristate "xf86-input-tek4957" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-suncg6/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-suncg6/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-suncg6/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG6 - bool "xf86-video-suncg6" + tristate "xf86-video-suncg6" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/x11r7/xlib_libICE/Config.in =================================================================== --- package/x11r7/xlib_libICE/Config.in (revision 19953) +++ package/x11r7/xlib_libICE/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XLIB_LIBICE - bool "libICE" + tristate "libICE" default n select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XPROTO_XPROTO Index: package/x11r7/xdriver_xf86-input-aiptek/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-aiptek/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-aiptek/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_AIPTEK - bool "xf86-input-aiptek" + tristate "xf86-input-aiptek" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-input-summa/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-summa/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-summa/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_SUMMA - bool "xf86-input-summa" + tristate "xf86-input-summa" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-input-magictouch/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-magictouch/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-magictouch/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_MAGICTOUCH - bool "xf86-input-magictouch" + tristate "xf86-input-magictouch" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-input-mutouch/Config.in =================================================================== --- package/x11r7/xdriver_xf86-input-mutouch/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-input-mutouch/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_MUTOUCH - bool "xf86-input-mutouch" + tristate "xf86-input-mutouch" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_INPUTPROTO Index: package/x11r7/xdriver_xf86-video-vga/Config.in =================================================================== --- package/x11r7/xdriver_xf86-video-vga/Config.in (revision 19953) +++ package/x11r7/xdriver_xf86-video-vga/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VGA - bool "xf86-video-vga" + tristate "xf86-video-vga" default n select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_FONTSPROTO Index: package/Makefile.autotools.in =================================================================== --- package/Makefile.autotools.in (revision 19953) +++ package/Makefile.autotools.in (working copy) @@ -379,6 +379,9 @@ ifeq ($$(BR2_PACKAGE_$(2)),y) TARGETS += $(1) endif +ifeq ($$(BR2_PACKAGE_$(2)),m) +TARGET_PACKAGES += $(1) +endif endef # :mode=makefile: Index: package/Config.in =================================================================== --- package/Config.in (revision 19953) +++ package/Config.in (working copy) @@ -1,5 +1,8 @@ menu "Package Selection for the target" +config MODULES + bool + default y comment "The default minimal system" source "package/busybox/Config.in" Index: package/config/mconf.c =================================================================== --- package/config/mconf.c (revision 19953) +++ package/config/mconf.c (working copy) @@ -177,7 +177,8 @@ "Arrow keys navigate the menu. " " selects submenus --->. " "Highlighted letters are hotkeys. " - "Pressing selectes a feature, while will exclude a feature. " + "Pressing selectes a feature, while will exclude a feature, " + " will build a separate package. " "Press to exit, for Help, for Search. " "Legend: [*] feature is selected [ ] feature is excluded"), radiolist_instructions[] = N_( Index: package/dropbear/dropbear.mk =================================================================== --- package/dropbear/dropbear.mk (revision 19953) +++ package/dropbear/dropbear.mk (working copy) @@ -11,6 +11,12 @@ DROPBEAR_BINARY:=dropbearmulti DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear +ifeq ($(strip $(BR2_PACKAGE_DROPBEAR)),m) +DROPBEAR_DESTDIR=$(TARGET_PACKAGES_DIR)/dropbear +else +DROPBEAR_DESTDIR=$(TARGET_DIR) +endif + $(DL_DIR)/$(DROPBEAR_SOURCE): $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE) @@ -45,25 +51,26 @@ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \ MULTI=1 SCPPROGRESS=1 -C $(DROPBEAR_DIR) -$(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/sbin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin +$(DROPBEAR_DESTDIR)/$(DROPBEAR_TARGET_BINARY): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) + mkdir -p $(DROPBEAR_DESTDIR) + $(INSTALL) -d -m 755 $(DROPBEAR_DESTDIR)/usr/sbin + $(INSTALL) -d -m 755 $(DROPBEAR_DESTDIR)/usr/bin $(INSTALL) -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \ - $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) - $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) - ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp - ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh - ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient - ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey - ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert - mkdir -p $(TARGET_DIR)/etc/init.d - cp -dpf $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/ - chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear + $(DROPBEAR_DESTDIR)/$(DROPBEAR_TARGET_BINARY) + $(STRIP) $(STRIP_STRIP_UNNEEDED) $(DROPBEAR_DESTDIR)/$(DROPBEAR_TARGET_BINARY) + ln -snf ../sbin/dropbear $(DROPBEAR_DESTDIR)/usr/bin/scp + ln -snf ../sbin/dropbear $(DROPBEAR_DESTDIR)/usr/bin/ssh + ln -snf ../sbin/dropbear $(DROPBEAR_DESTDIR)/usr/bin/dbclient + ln -snf ../sbin/dropbear $(DROPBEAR_DESTDIR)/usr/bin/dropbearkey + ln -snf ../sbin/dropbear $(DROPBEAR_DESTDIR)/usr/bin/dropbearconvert + mkdir -p $(DROPBEAR_DESTDIR)/etc/init.d + cp -dpf $(DROPBEAR_DIR)/S50dropbear $(DROPBEAR_DESTDIR)/etc/init.d/ + chmod a+x $(DROPBEAR_DESTDIR)/etc/init.d/S50dropbear -dropbear: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY) +dropbear: uclibc zlib $(DROPBEAR_DESTDIR)/$(DROPBEAR_TARGET_BINARY) dropbear-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) DESTDIR=$(DROPBEAR_DESTDIR) $(TARGET_CONFIGURE_OPTS) \ LD=$(TARGET_CC) -C $(DROPBEAR_DIR) uninstall -$(MAKE) -C $(DROPBEAR_DIR) clean @@ -78,3 +85,7 @@ ifeq ($(strip $(BR2_PACKAGE_DROPBEAR)),y) TARGETS+=dropbear endif +ifeq ($(strip $(BR2_PACKAGE_DROPBEAR)),m) +TARGET_PACKAGES+=dropbear +endif + Index: package/dropbear/Config.in =================================================================== --- package/dropbear/Config.in (revision 19953) +++ package/dropbear/Config.in (working copy) @@ -1,5 +1,5 @@ config BR2_PACKAGE_DROPBEAR - bool "dropbear" + tristate "dropbear" default n help A small SSH 2 server designed for small memory environments. Index: Makefile =================================================================== --- Makefile (revision 19953) +++ Makefile (working copy) @@ -174,6 +174,10 @@ BASE_TARGETS:=uclibc endif TARGETS:= +# +# This is TARGETS for autonomous packages (like .ipk and tar.gz) +# +TARGETS_PACKAGES:= # setup our pathes include project/Makefile.in @@ -222,6 +226,13 @@ TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS)) TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS)) TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS)) + +# For now, just add TARGET_PACKAGES to the targets. +TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGET_PACKAGES)) +TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGET_PACKAGES)) +TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGET_PACKAGES)) +TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGET_PACKAGES)) + # all targets depend on the crosscompiler and it's prerequisites $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % @@ -231,7 +242,7 @@ cp -dpRf $(CONFIG)/buildroot-config $@ dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ - $(BR2_DEPENDS_DIR) \ + $(TARGET_PACKAGES_DIR) $(BR2_DEPENDS_DIR) \ $(BINARIES_DIR) $(PROJECT_BUILD_DIR) $(BASE_TARGETS): dirs @@ -240,10 +251,10 @@ .PHONY: all world dirs clean dirclean distclean source \ - $(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \ + $(BASE_TARGETS) $(TARGETS) $(TARGET_PACKAGES) $(TARGETS_ALL) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \ $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ - $(BR2_DEPENDS_DIR) \ + $(TARGET_PACKAGES_DIR) $(BR2_DEPENDS_DIR) \ $(BINARIES_DIR) $(PROJECT_BUILD_DIR) ############################################################# @@ -283,6 +294,9 @@ $(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root +$(TARGET_PACKAGES_DIR): + @mkdir -p $(TARGET_PACKAGES_DIR) + erase-fakeroots: rm -f $(PROJECT_BUILD_DIR)/.fakeroot* @@ -297,10 +311,10 @@ # ############################################################# clean: $(TARGETS_CLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) + rm -rf $(STAGING_DIR) $(TARGET_DIR) $(TARGET_PACKAGES_DIR) $(IMAGE) dirclean: $(TARGETS_DIRCLEAN) - rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) + rm -rf $(STAGING_DIR) $(TARGET_DIR) $(TARGET_PACKAGES_DIR) $(IMAGE) distclean: ifeq ($(DL_DIR),$(BASE_DIR)/dl)