Changeset 332

Show
Ignore:
Timestamp:
07/21/06 22:39:54 (2 years ago)
Author:
tg
Message:

* never use && in Makefiles, always use and reverse test logic
* quote properly
* missing line continuation chars

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r331 r332  
    6060        $(CP) ./default/* $(IDIR_BASE) 
    6161        $(SED) 's,$$R,$(REV),g' $(IDIR_BASE)/etc/banner 
    62         test -n $(BR2_RUNTIME_PACKAGES_URL) && \ 
    63                $(SED) 's,^src freewrt.*$$,src freewrt $(BR2_RUNTIME_PACKAGES_URL),' \ 
    64                    -e '/^src freewrt/s,"\(.*\)",\1,' $(IDIR_BASE)/etc/ipkg.conf 
     62        test -z '$(BR2_RUNTIME_PACKAGES_URL)' || \ 
     63            $(SED) 's,^src freewrt.*$$,src freewrt $(BR2_RUNTIME_PACKAGES_URL),' \ 
     64            -e '/^src freewrt/s,"\(.*\)",\1,' $(IDIR_BASE)/etc/ipkg.conf 
    6565        $(SED) 's,@TARGET@,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf 
    66         test -n $(BR2_RUNTIME_PASSWORD) && \ 
    67                 $(SED) 's,*NP*,$(MD5CRYPT),g' $(IDIR_BASE)/etc/passwd 
    68         test -n $(BR2_RUNTIME_SSHKEY) && ( \ 
    69             mkdir -p $(IDIR_BASE)/etc/dropbear \ 
    70             echo $(BR2_RUNTIME_SSHKEY) > $(IDIR_BASE)/etc/dropbear/authorized_keys \ 
     66        test -z '$(BR2_RUNTIME_PASSWORD)' || \ 
     67            $(SED) 's,*NP*,$(MD5CRYPT),g' $(IDIR_BASE)/etc/passwd 
     68        test -z '$(BR2_RUNTIME_SSHKEY)' || ( \ 
     69            mkdir -p $(IDIR_BASE)/etc/dropbear; \ 
     70            echo '$(BR2_RUNTIME_SSHKEY)' >$(IDIR_BASE)/etc/dropbear/authorized_keys; \ 
    7171        ) 
    7272        mkdir -p $(IDIR_BASE)/dev