[meta-freescale] [base][PATCH] setup-environment: Keep sources/base files in sync automatically

Tom Hochstein tom.hochstein at nxp.com
Mon Nov 14 08:43:29 PST 2016


Currently setup-environment tries to keep the files in sources/base
in sync with the files copied by the manifest. When the files do
get out of sync, the script fails with an error message that many
users will not understand.

We avoid the sync issue in the manifest by linking to the files.

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
---
 setup-environment | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/setup-environment b/setup-environment
index a04ffae..9a3bdc2 100755
--- a/setup-environment
+++ b/setup-environment
@@ -135,25 +135,6 @@ if [ -e $PWD/sources/oe-core ]; then
     OEROOT=$PWD/sources/oe-core
 fi
 
-# Ensure all files in sources/base are kept in sync with project root
-updated=
-for f in $CWD/sources/base/*; do
-    file="$(basename $f)"
-    if [ "$file" = "conf" ] || echo $file | grep -q '~$'; then
-        continue
-    fi
-
-    if ! cmp -s "$file" "$f"; then
-        updated="true"
-        [ -e $file ] && chmod u+w $file
-        cp $f $file
-    fi
-done
-if [ "$updated" = "true" ]; then
-    echo "The project root content has been updated. Please run '$PROGNAME' again."
-    return
-fi
-
 . $OEROOT/oe-init-build-env $CWD/$1 > /dev/null
 
 # if conf/local.conf not generated, no need to go further
-- 
1.9.1



More information about the meta-freescale mailing list