diff options
-rw-r--r-- | package/Makefile | 2 | ||||
-rw-r--r-- | package/base-files/Config.in.manual | 6 | ||||
-rw-r--r-- | package/busybox/Config.in.manual | 2 | ||||
-rw-r--r-- | package/cfgfs/Makefile | 2 | ||||
-rw-r--r-- | package/exmap/Makefile | 2 | ||||
-rw-r--r-- | package/glibc/Config.in.manual | 2 | ||||
-rw-r--r-- | package/ipset/Makefile | 2 | ||||
-rw-r--r-- | package/libgcc/Makefile | 2 | ||||
-rw-r--r-- | package/mksh/Makefile | 2 | ||||
-rw-r--r-- | package/musl/Config.in.manual | 2 | ||||
-rw-r--r-- | package/uclibc-ng/Config.in.manual | 2 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 18 |
12 files changed, 22 insertions, 22 deletions
diff --git a/package/Makefile b/package/Makefile index 8416fbced..c7779c2ac 100644 --- a/package/Makefile +++ b/package/Makefile @@ -41,7 +41,7 @@ all: compile download: $(patsubst %,%-download,$(package-y)) clean: $(patsubst %,%-clean,$(package-) $(package-y) base-files) hostcompile: $(HOST_COMPILE_PACKAGES) -ifeq ($(ADK_TOOLCHAIN_ONLY),y) +ifeq ($(ADK_APPLIANCE_TOOLCHAIN),y) compile: $(COMPILE_PACKAGES) install: $(INSTALL_PACKAGES) else diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual index 2a6accef0..2e56a5129 100644 --- a/package/base-files/Config.in.manual +++ b/package/base-files/Config.in.manual @@ -7,8 +7,8 @@ config ADK_PACKAGE_BASE_FILES prompt "base-files........... basic filesystem structure and scripts" tristate select ADK_COMPILE_BASE_FILES - depends on !ADK_TOOLCHAIN_ONLY - default y if !ADK_TOOLCHAIN_ONLY + depends on !ADK_APPLIANCE_TOOLCHAIN + default y if !ADK_APPLIANCE_TOOLCHAIN help basic filesystem structure and scripts @@ -16,7 +16,7 @@ config ADK_PACKAGE_CONFIG_IN_ETC prompt ".config in /etc.... include buildsystem configuration in image" bool depends on ADK_PACKAGE_BASE_FILES - default y if !ADK_TOOLCHAIN_ONLY + default y if !ADK_APPLIANCE_TOOLCHAIN help Copy the configuration file (.config) to the image. The file will be found in /etc/adkconfig.gz. This takes about diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index da70c40d9..c52bbda9b 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -5,7 +5,7 @@ config ADK_COMPILE_BUSYBOX config ADK_PACKAGE_BUSYBOX bool "busybox.............. core utilities for embedded systems" select ADK_COMPILE_BUSYBOX - default y if !ADK_TOOLCHAIN_ONLY + default y if !ADK_APPLIANCE_TOOLCHAIN help Core utilities for embedded Linux systems diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 8b152ab71..5667a5b74 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -17,7 +17,7 @@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_SORT@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_INITRAMFSARCHIVE && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS && !ADK_TARGET_ROOTFS_ISO -PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_TEST) +PKG_DFLT_CFGFS:= y if !(ADK_APPLIANCE_TOOLCHAIN || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_TEST) WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/exmap/Makefile b/package/exmap/Makefile index fd85dba82..78274ab80 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= glib readline PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/ PKG_ARCH_DEPENDS:= !m68k -PKG_CFLINE_EXMAP:= depends on !ADK_TOOLCHAIN_ONLY +PKG_CFLINE_EXMAP:= depends on !ADK_APPLIANCE_TOOLCHAIN DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual index 0940524bc..306390665 100644 --- a/package/glibc/Config.in.manual +++ b/package/glibc/Config.in.manual @@ -1,7 +1,7 @@ config ADK_PACKAGE_GLIBC prompt "glibc.................... GNU C library" bool - default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY + default y if ADK_TARGET_LIB_GLIBC && !ADK_APPLIANCE_TOOLCHAIN default n depends on ADK_TARGET_LIB_GLIBC select ADK_PACKAGE_TZDATA diff --git a/package/ipset/Makefile b/package/ipset/Makefile index eead7d510..3bcf92b4d 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://ipset.netfilter.org/ PKG_SITES:= http://ipset.netfilter.org/ PKG_ARCH_DEPENDS:= !arm -PKG_CFLINE_IPSET:= depends on !ADK_TOOLCHAIN_ONLY +PKG_CFLINE_IPSET:= depends on !ADK_APPLIANCE_TOOLCHAIN DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 33e405cc3..faa645b2e 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -9,7 +9,7 @@ PKG_DESCR:= gcc library PKG_SECTION:= base/libs PKG_OPTS:= noremove -PKG_DFLT_LIBGCC:= y if !ADK_TOOLCHAIN_ONLY +PKG_DFLT_LIBGCC:= y if !ADK_APPLIANCE_TOOLCHAIN NO_DISTFILES:= 1 diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 46dfc7bf3..04af72bc6 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -13,7 +13,7 @@ PKG_NEEDS:= mmu PKG_URL:= http://www.mirbsd.org/mksh.htm PKG_SITES:= $(MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/) -PKG_DFLT_MKSH:= y if !ADK_TOOLCHAIN_ONLY +PKG_DFLT_MKSH:= y if !ADK_APPLIANCE_TOOLCHAIN PKG_SUBPKGS:= MKSH MKSH_TEST PKGSD_MKSH_TEST:= install testsuite diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual index e7f0d0c31..0a308b988 100644 --- a/package/musl/Config.in.manual +++ b/package/musl/Config.in.manual @@ -1,7 +1,7 @@ config ADK_PACKAGE_MUSL prompt "musl................. embedded C library" bool - default y if ADK_TARGET_LIB_MUSL && !ADK_TOOLCHAIN_ONLY + default y if ADK_TARGET_LIB_MUSL && !ADK_APPLIANCE_TOOLCHAIN default n depends on ADK_TARGET_LIB_MUSL help diff --git a/package/uclibc-ng/Config.in.manual b/package/uclibc-ng/Config.in.manual index cb4c1b200..073b0d935 100644 --- a/package/uclibc-ng/Config.in.manual +++ b/package/uclibc-ng/Config.in.manual @@ -1,7 +1,7 @@ config ADK_PACKAGE_UCLIBC_NG bool "uClibc-ng............... embedded C library" depends on ADK_TARGET_LIB_UCLIBC_NG - default y if ADK_TARGET_LIB_UCLIBC_NG && !ADK_TOOLCHAIN_ONLY + default y if ADK_TARGET_LIB_UCLIBC_NG && !ADK_APPLIANCE_TOOLCHAIN default n help Embedded C library. diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 460c849d6..1c02ea7f3 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -9,7 +9,7 @@ config ADK_RUNTIME_HOSTNAME choice prompt "init" -depends on !ADK_TOOLCHAIN_ONLY +depends on !ADK_APPLIANCE_TOOLCHAIN default ADK_RUNTIME_INIT_SYSV config ADK_RUNTIME_INIT_SYSV @@ -23,7 +23,7 @@ endchoice choice prompt "System for /dev management" -depends on !ADK_TOOLCHAIN_ONLY +depends on !ADK_APPLIANCE_TOOLCHAIN default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_WITHOUT_MMU default ADK_RUNTIME_DEV_MDEV @@ -298,21 +298,21 @@ default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH bool "mksh (MirBSD Korn Shell)" - select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY + select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN help Use mksh (a Korn Shell variant) as standard login shell for the superuser. config ADK_ROOTSH_HUSH bool "hush (busybox shell compatible with non-MMU systems)" - select BUSYBOX_HUSH if !ADK_TOOLCHAIN_ONLY - select BUSYBOX_FEATURE_SH_IS_HUSH if !ADK_TOOLCHAIN_ONLY + select BUSYBOX_HUSH if !ADK_APPLIANCE_TOOLCHAIN + select BUSYBOX_FEATURE_SH_IS_HUSH if !ADK_APPLIANCE_TOOLCHAIN help hush shell from busybox. config ADK_ROOTSH_SASH bool "sash (Shell compatible with non-MMU systems)" - select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY + select ADK_PACKAGE_SASH if !ADK_APPLIANCE_TOOLCHAIN help standalone shell. @@ -353,20 +353,20 @@ default ADK_BINSH_MKSH config ADK_BINSH_MKSH bool "mksh (MirBSD Korn Shell)" - select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY + select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN help Use mksh (a Korn Shell variant) as system shell, which is both small and powerful, so quite suited for this task. config ADK_BINSH_HUSH bool "hush (busybox)" - select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY + select ADK_PACKAGE_HUSH if !ADK_APPLIANCE_TOOLCHAIN help hush shell. config ADK_BINSH_SASH bool "sash (Standalone Shell)" - select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY + select ADK_PACKAGE_SASH if !ADK_APPLIANCE_TOOLCHAIN help sash shell. |