uClibc: restore support of shadow passwords, but make it configurable

SVN-Revision: 10276
This commit is contained in:
Gabor Juhos 2008-01-26 20:07:47 +00:00
parent 9826bd89d8
commit 6f60b7afcd
12 changed files with 23 additions and 21 deletions

View file

@ -27,6 +27,13 @@ config LARGEFILE
help help
Enable large file (files > 2 GB) support Enable large file (files > 2 GB) support
config SHADOW_PASSWORDS
bool
prompt "Enable shadow password support?" if TOOLCHAINOPTS
default y
help
Enable shadow password support.
config SOFT_FLOAT config SOFT_FLOAT
bool bool
prompt "Use software floating point by default" if TOOLCHAINOPTS prompt "Use software floating point by default" if TOOLCHAINOPTS

View file

@ -1,4 +1,4 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -46,6 +46,7 @@ define Build/Prepare
$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \ $(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \
-e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),g' \ -e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),g' \
-e 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=$(if $(CONFIG_LARGEFILE),y,n),g' \ -e 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=$(if $(CONFIG_LARGEFILE),y,n),g' \
-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
$(PKG_BUILD_DIR)/.config $(PKG_BUILD_DIR)/.config
mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/include mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/include
mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/lib mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/lib
@ -90,7 +91,7 @@ UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
define Build/Compile define Build/Compile
$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
$(UCLIBC_MAKE) PREFIX= all $(UCLIBC_MAKE) PREFIX= all
$(UCLIBC_MAKE) PREFIX=$(STAGING_DIR_HOST)/ install_runtime install_dev $(UCLIBC_MAKE) PREFIX=$(STAGING_DIR_HOST)/ install_runtime install_dev
$(SED) 's,UCLIBC_VERSION=.*,UCLIBC_VERSION=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,UCLIBC_VERSION=.*,UCLIBC_VERSION=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
$(SED) 's,UCLIBC_PATCHVER=.*,UCLIBC_PATCHVER=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,UCLIBC_PATCHVER=.*,UCLIBC_PATCHVER=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk

View file

@ -91,11 +91,10 @@ LINUXTHREADS_OLD=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -92,11 +92,10 @@ LINUXTHREADS_OLD=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -76,11 +76,10 @@ LINUXTHREADS_OLD=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
UNIX98PTY_ONLY=y UNIX98PTY_ONLY=y

View file

@ -69,7 +69,7 @@ UCLIBC_HAS_LFS=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y UCLIBC_HAS_SHADOW=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set
ASSUME_DEVPTS=y ASSUME_DEVPTS=y
UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TM_EXTENSIONS=y

View file

@ -96,7 +96,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -96,7 +96,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -1,4 +1,4 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -89,11 +89,10 @@ LINUXTHREADS_OLD=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -1,4 +1,4 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -89,11 +89,10 @@ LINUXTHREADS_OLD=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -1,4 +1,4 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -78,11 +78,10 @@ LINUXTHREADS_OLD=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y
COMPAT_ATEXIT=y COMPAT_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY is not set
UCLIBC_SUSV3_LEGACY_MACROS=y UCLIBC_SUSV3_LEGACY_MACROS=y
# UCLIBC_HAS_SHADOW is not set UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y UCLIBC_HAS___PROGNAME=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set

View file

@ -65,7 +65,7 @@ UCLIBC_HAS_LFS=y
MALLOC_STANDARD=y MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_DYNAMIC_ATEXIT=y
HAS_SHADOW=y UCLIBC_HAS_SHADOW=y
# UNIX98PTY_ONLY is not set # UNIX98PTY_ONLY is not set
ASSUME_DEVPTS=y ASSUME_DEVPTS=y
UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TM_EXTENSIONS=y