From: Wolfgang Grandegger <wg@grandegger.com>
To: buildroot@busybox.net
Subject: [Buildroot] [RFC PATCH 5/9] support/scripts: add create-relocation-script for toolchain relocation
Date: Fri, 17 Mar 2017 08:10:49 +0100 [thread overview]
Message-ID: <dc66e761-80aa-22ff-0d22-4ace059f82fe@grandegger.com> (raw)
In-Reply-To: <d7bcc124-0706-8cdf-2398-2a1d3fa4b3a4@mind.be>
Hello,
Am 16.03.2017 um 18:51 schrieb Arnout Vandecappelle:
>
>
> On 03-03-17 15:18, Wolfgang Grandegger wrote:
>> It will create the script "relocate-toolchain.sh" in $HOST_DIR/usr/
>> allowing to adjust the path to the toolchain directory in all text
>> files after it has been moved to a new location.
>>
>> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
>> ---
>> support/scripts/create-relocation-script | 72 ++++++++++++++++++++++++++++++++
>> 1 file changed, 72 insertions(+)
>> create mode 100755 support/scripts/create-relocation-script
>>
>> diff --git a/support/scripts/create-relocation-script b/support/scripts/create-relocation-script
>> new file mode 100755
>> index 0000000..0ceaeb2
>> --- /dev/null
>> +++ b/support/scripts/create-relocation-script
>> @@ -0,0 +1,72 @@
>> +#!/bin/sh
>> +
>> +# Creates the script "relocate-toolchain.sh" and the "location" file in
>> +# the buildroot toolchain (host/usr). After copying that toolchain tree
>> +# to a new location, the script in the top directory should be executed
>> +# to relocate the toolchain. It actually will replace the string of the
>> +# old location with the new one in *all* text files.
>> +
>> +if [ "$#" -ne 1 -o ! -d "$1" ]; then
>> + echo "Usage: $0 <buildroot-host-directory-path>"
>> + exit 1
>> +fi
>> +
>> +# The toolchain is in buildroot's "host/usr"
>> +TOOLCHAINDIR="$1/usr"
>> +# We create the script in the top directory of the toolchain
>> +SCRIPTFILE="${TOOLCHAINDIR}/relocate-toolchain.sh"
>
> I think installing the script in host/usr/bin would be more appropriate.
I thought it's more visible/present in the root directory.
>> +# File holding the location of the buildroot toolchain
>> +LOCATIONFILE="share/buildroot/toolchain-location"
>> +
>> +echo "Creating ${SCRIPTFILE} for toolchain relocation ..."
>> +
>> +cat << EOF > "${SCRIPTFILE}"
>
> Instead of using cat to instantiate the template, it's easier to understand
> what happens by creating a template file
> (support/misc/relocate-toolchain.sh.in) and using sed to instantiate the
> variables that need to be instantiated. Such a sed command can typically be
> called directly from Makefile, without helper script.
I just see that you are looking to v1 of my RFC patch series. I have
sent v2 yesterday. In v2 I use the name "SDK" instead of "toolchain".
IIUC, the SDK is under "HOST_DIR" and the toolchain under
"HOST_DIR/usr". And we want to relocate the SDK, right?
>
> However, as far as I can see, the only thing that is instantiated in this
> script is LOCATIONFILE. But that variable is actually constant, so it could be
> coded directly in the script. So why not just $(INSTALL) the script itself, like
> is done for e.g. support/misc/target-dir-warning.txt ?
Will adapt that solution. I was just not sure about the locations.
>> +#!/bin/sh
>> +#
>> +# Automatically generated by $0: don't edit
>> +#
>> +if [ "\$#" -ne 0 ]; then
>> + echo "Run this script to relocate the buildroot toolchain at that location"
>> + exit 1
>> +fi
>> +
>> +FILEPATH="\$(readlink -f \$0)"
>> +NEWPATH="\$(dirname \${FILEPATH})"
>> +
>> +cd \${NEWPATH}
>> +if [ ! -r ./${LOCATIONFILE} ]; then
>> + echo "Previous location of the buildroot toolchain not found!"
>> + exit 1
>> +fi
>> +OLDPATH="\$(cat ./${LOCATIONFILE})"
>> +
>> +if [ \${NEWPATH} = \${OLDPATH} ]; then
>> + echo "This buildroot toolchain has already been relocated!"
>> + exit 0
>> +fi
>> +
>> +echo "Relocating the buildroot toolchain from \${OLDPATH} to \${NEWPATH} ..."
>> +
>> +# Make sure file uses the right language
>> +export LC_ALL=C
>> +# Replace the old path with the new one in all text files
>> +for FILE in \$(grep -r "\${OLDPATH}" . -l ) ; do
>
> We typically collect options before the regex, so grep -r -l ...
>
> I think that there are a few packages that might install something with spaces
> (though probably not in $HOST_DIR), so find -exec is probably more appropriate.
> Unfortunately, that doesn't allow you to do a test with a pipe however so a
> different solution would be needed to support files with spaces.
Yes, these magic spaces in file names. I will try using "find ... -exec".
>
>> + if [ ! -h \${FILE} ] && [ -n "\$(file -b --mime-type \${FILE} | grep '^text/' )" ] && [ "\${FILE}" != "./${LOCATIONFILE}" ]
>> + then
>> + sed -i s,"\${OLDPATH}",\${NEWPATH},g \${FILE}
>> + fi
>> +done
>> +
>> +# Finally, we update the location file itself
>> +sed -i s,"\${OLDPATH}",\${NEWPATH},g ./${LOCATIONFILE}
>
> Why do this separately? It works within the loop above as well, doesn't it?
If the script is interrupted with ^C, you can through away the tree. If
I update the location file at the end, just re-running the script will work.
>> +
>> +# Check if the path substitution did work properly
>> +if [ "\${NEWPATH}" != "\$(cat ./${LOCATIONFILE})" ]; then
>> + echo "Something went wrong with substituting the path!"
>> + echo "Please choose another location for your toolchain!"
>> +fi
>
> Is there any reason why this error handling is needed? The only thing I can
> imagine is concurrently running two instances of the script, but otherwise I see
> no way that the sed could fail...
If the path /a/b/c/a/b/c is copied to /a/b/c, relocation (substitution)
will not be correct. Maybe too much paranoia.
Wolfgang.
next prev parent reply other threads:[~2017-03-17 7:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 14:18 [Buildroot] [RFC PATCH 0/9] Make the buildroot toolchain relocatable Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 1/9] package/patchelf: use a recent version and add "--make-rpath-relative" patch Wolfgang Grandegger
2017-03-04 11:26 ` Arnout Vandecappelle
2017-03-04 15:16 ` Wolfgang Grandegger
2017-03-05 23:13 ` Arnout Vandecappelle
2017-03-06 8:42 ` Wolfgang Grandegger
2017-03-06 12:40 ` Arnout Vandecappelle
2017-03-06 13:57 ` Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 2/9] support/scripts: add fix-rpath script to sanitize the rpath Wolfgang Grandegger
2017-03-03 14:48 ` Thomas Petazzoni
2017-03-03 16:39 ` Wolfgang Grandegger
2017-03-06 9:07 ` Wolfgang Grandegger
[not found] ` <30db8390-0a94-5449-0c5e-90263576be98@mind.be>
2017-03-07 9:13 ` Wolfgang Grandegger
[not found] ` <7524a67f-d19d-1023-262c-c0b7793e6066@mind.be>
2017-03-08 9:25 ` Wolfgang Grandegger
2017-03-12 20:53 ` Arnout Vandecappelle
2017-03-12 21:10 ` Wolfgang Grandegger
2017-03-13 17:08 ` Arnout Vandecappelle
2017-03-14 7:36 ` Wolfgang Grandegger
2017-03-04 11:39 ` Arnout Vandecappelle
2017-03-04 15:29 ` Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 3/9] core: sanitize HOST_DIR at the very end of the build Wolfgang Grandegger
2017-03-04 11:50 ` Arnout Vandecappelle
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 4/9] core: add {TARGET, STAGING}_SANITIZE_RPATH_HOOK to TARGET_FINALIZE_HOOKS Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 5/9] support/scripts: add create-relocation-script for toolchain relocation Wolfgang Grandegger
2017-03-16 17:51 ` Arnout Vandecappelle
2017-03-17 7:10 ` Wolfgang Grandegger [this message]
2017-03-17 15:50 ` Arnout Vandecappelle
2017-03-17 17:15 ` Wolfgang Grandegger
2017-03-17 22:09 ` Arnout Vandecappelle
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 6/9] core: create relocate-toolchain.sh in HOST_DIR/usr at the end of the build Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 7/9] external-toolchain: check if a buildroot toolchain has already been relocated Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 8/9] support/scripts: check-host-rpath now handles $ORIGIN as well Wolfgang Grandegger
2017-03-03 14:46 ` Thomas Petazzoni
2017-03-03 14:56 ` Wolfgang Grandegger
2017-03-03 17:12 ` Wolfgang Grandegger
2017-03-03 14:18 ` [Buildroot] [RFC PATCH 9/9] support/scripts: check-host-rpath now uses patchelf to get the rpath Wolfgang Grandegger
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=dc66e761-80aa-22ff-0d22-4ace059f82fe@grandegger.com \
--to=wg@grandegger.com \
--cc=buildroot@busybox.net \
/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