Changeset 3125

Show
Ignore:
Timestamp:
07/04/07 13:39:54 (1 year ago)
Author:
tg
Message:

replace mkpasswd and /usr/bin/encrypt by portable md5crypt on
fwwif and mirmake basis; tested on GNU/Linux for now

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/base-files/Makefile

    r3119 r3125  
    2020 
    2121$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    22  
    23 MD5CRYPT:=              $(shell $(MKPASSWD) $(FWRT_RUNTIME_PASSWORD)) 
    2422 
    2523ADMIN_SHELL:=           /bin/sh 
    …… 
    6159        $(SED) 's,@VERSION@,$(FWRT_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf 
    6260        test -z $(FWRT_RUNTIME_PASSWORD) || \ 
    63             $(SED) 's,\*NP\*,$(MD5CRYPT),g' $(IDIR_BASE_FILES)/etc/passwd 
     61            $(SED) 's,\*NP\*,'"$$(${TOPDIR}/lbin/md5crypt \ 
     62            ${FWRT_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/passwd 
    6463        $(SED) 's!@SHELL@!${ADMIN_SHELL}!g' $(IDIR_BASE_FILES)/etc/passwd 
    6564        test -z $(FWRT_RUNTIME_SSHKEY) || ( \ 

  • trunk/freewrt/rules.mk

    r3051 r3125  
    6565TARGET_CXX:=            $(strip ${TARGET_CXX}) 
    6666 
    67 ifeq (${OStype},Linux) 
    68 MKPASSWD:=              $(STAGING_TOOLS)/bin/mkpasswd -H md5 
    69 else 
    70 MKPASSWD:=              encrypt -m 
    71 endif 
    72  
    7367ifeq ($(strip ${FWRT_JLEVEL}),-1) 
    7468MAKEFLAGS+=             -j 

  • trunk/freewrt/tools/Makefile

    r2987 r3125  
    2626TARGETS+=       jffs2 
    2727TARGETS+=       lzma 
     28TARGETS+=       md5crypt 
    2829TARGETS+=       mkimage 
    2930TARGETS+=       squashfs 
    …… 
    3435ifeq (${OStype},Linux) 
    3536TARGETS+=       genext2fs 
    36 TARGETS+=       mkpasswd 
    3737endif 
    3838