From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [ptxdist] [PATCH] libptxdist: explicitly use sed to run migrate_*
Date: Mon, 10 Oct 2011 18:04:56 +0200 [thread overview]
Message-ID: <1318262696-584-1-git-send-email-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <1317833666-11917-1-git-send-email-andreas@biessmann.de>
this fixes migrate on systems where sed is not in /bin/ (e.g. OS X).
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
Hi,
what about this? It's less invasive than using autoconf.
mol
scripts/libptxdist.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh
index 48dbd64..4385566 100644
--- a/scripts/libptxdist.sh
+++ b/scripts/libptxdist.sh
@@ -156,12 +156,12 @@ ptxd_kconfig_migrate() {
local part="${1}"
local assistent="${PTX_MIGRATEDIR}/migrate_${part}"
- if [ \! -x "${assistent}" ]; then
+ if [ \! -f "${assistent}" ]; then
return 0
fi
cp -- ".config" ".config.old" || return
- "${assistent}" ".config.old" > ".config"
+ sed -f "${assistent}" ".config.old" > ".config"
retval=$?
if [ $retval -ne 0 ]; then
--
1.7.6.3
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-10 16:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 7:33 [ptxdist] [PATCH] scripts/migrate: use env to find sed Andreas Bießmann
2011-10-04 13:26 ` Michael Olbrich
2011-10-05 16:54 ` [ptxdist] [PATCH v2] scripts/migrate: use autotools to insert working sed Andreas Bießmann
2011-10-10 16:04 ` Michael Olbrich [this message]
2011-10-11 10:16 ` [ptxdist] [PATCH] libptxdist: explicitly use sed to run migrate_* andreas
2011-10-14 14:04 ` Michael Olbrich
2011-10-14 15:03 ` Bernhard Walle
2011-10-17 7:06 ` Andreas Bießmann
2011-10-17 10:45 ` Bernhard Walle
2011-10-17 12:53 ` Michael Olbrich
2011-10-17 6:54 ` Andreas Bießmann
2011-10-17 7:10 ` Andreas Bießmann
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=1318262696-584-1-git-send-email-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox