All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Hochstein <tom.hochstein@nxp.com>
To: <meta-freescale@yoctoproject.org>
Subject: [base][PATCH] setup-environment: Keep sources/base files in sync automatically
Date: Mon, 14 Nov 2016 10:43:29 -0600	[thread overview]
Message-ID: <1479141809-11114-2-git-send-email-tom.hochstein@nxp.com> (raw)
In-Reply-To: <1479141809-11114-1-git-send-email-tom.hochstein@nxp.com>

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@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



      reply	other threads:[~2016-11-14 23:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-14 16:43 [fsl-community-bsp-platform][PATCH] default.xml: Keep sources/base files in sync automatically Tom Hochstein
2016-11-14 16:43 ` Tom Hochstein [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1479141809-11114-2-git-send-email-tom.hochstein@nxp.com \
    --to=tom.hochstein@nxp.com \
    --cc=meta-freescale@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.