Changeset 294ba8d in freewrt

Timestamp:

Jul 21, 2006, 10:39:54 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

8936285

Parents:

c5f2acf

Message:

never use && in Makefiles, always use

and reverse test logic

• quote properly
• missing line continuation chars

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@332 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/base-files/Makefile (modified) (1 diff)

package/base-files/Makefile

@@ -60 +60 @@
         $(CP) ./default/* $(IDIR_BASE)
         $(SED) 's,$$R,$(REV),g' $(IDIR_BASE)/etc/banner
-        test -n $(BR2_RUNTIME_PACKAGES_URL) && \
-                $(SED) 's,^src freewrt.*$$,src freewrt $(BR2_RUNTIME_PACKAGES_URL),' \
-                    -e '/^src freewrt/s,"\(.*\)",\1,' $(IDIR_BASE)/etc/ipkg.conf
+        test -z '$(BR2_RUNTIME_PACKAGES_URL)' || \
+            $(SED) 's,^src freewrt.*$$,src freewrt $(BR2_RUNTIME_PACKAGES_URL),' \
+            -e '/^src freewrt/s,"\(.*\)",\1,' $(IDIR_BASE)/etc/ipkg.conf
         $(SED) 's,@TARGET@,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf
-        test -n $(BR2_RUNTIME_PASSWORD) && \
-                $(SED) 's,*NP*,$(MD5CRYPT),g' $(IDIR_BASE)/etc/passwd
-        test -n $(BR2_RUNTIME_SSHKEY) && ( \
-            mkdir -p $(IDIR_BASE)/etc/dropbear \
-            echo $(BR2_RUNTIME_SSHKEY) > $(IDIR_BASE)/etc/dropbear/authorized_keys \
+        test -z '$(BR2_RUNTIME_PASSWORD)' || \
+            $(SED) 's,*NP*,$(MD5CRYPT),g' $(IDIR_BASE)/etc/passwd
+        test -z '$(BR2_RUNTIME_SSHKEY)' || ( \
+            mkdir -p $(IDIR_BASE)/etc/dropbear; \
+            echo '$(BR2_RUNTIME_SSHKEY)' >$(IDIR_BASE)/etc/dropbear/authorized_keys; \
         )
         mkdir -p $(IDIR_BASE)/dev