]> git.openpandora.org Git - openembedded.git/commitdiff
freeze, unfreeze: look for auto.conf as well as local.conf
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 2 Oct 2005 19:06:34 +0000 (19:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Oct 2005 19:06:34 +0000 (19:06 +0000)
This matches new more recent nslu2 'master makefile' which, by default,
does not create local.conf, so freeze/unfreeze fail to find it and put
the frozen files in the first directory on the BBPATH (which happens now
to be the package directory and therefore does nothing.)

packages/freeze/files/freeze
packages/freeze/files/unfreeze

index 5305af7191d7a3ceba2383a6f56024de385309de..b92c66054e110d4b8871cfd226785be42cebb87d 100644 (file)
@@ -41,7 +41,7 @@ else
                FROZEN_DIR=""
                for d in ${BBPATH//:/ }
                do
-                       if test -r "$d/conf/local.conf"
+                       if test -r "$d/conf/local.conf" -o -r "$d/conf/auto.conf"
                        then
                                FROZEN_DIR="$d/conf"
                                break
index 2aaa2ac2fcdfc7001db57e5d35293f1ab3d8c829..5be1459c3c9902e48bd684649358157dbc086326 100644 (file)
@@ -31,7 +31,7 @@ else
                FROZEN_DIR=""
                for d in ${BBPATH//:/ }
                do
-                       if test -r "$d/conf/local.conf"
+                       if test -r "$d/conf/local.conf" -o -r "$d/conf/auto.conf"
                        then
                                FROZEN_DIR="$d/conf"
                                break