diff options
| author | Chris Packham <judge.packham@gmail.com> | 2024-07-25 19:18:57 +1200 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2024-07-29 13:13:26 +1200 |
| commit | 5a1dc8d95d29f23f346625dec690ae0eb229d560 (patch) | |
| tree | dccd2d65fbc9d35018dc6b2d636f6c0f427e9528 | |
| parent | b6a4766d2237f9fcb9a043ef5a2d74a25c69d07b (diff) | |
| download | crosstool-ng-5a1dc8d95d29f23f346625dec690ae0eb229d560.tar.gz crosstool-ng-5a1dc8d95d29f23f346625dec690ae0eb229d560.tar.bz2 crosstool-ng-5a1dc8d95d29f23f346625dec690ae0eb229d560.zip | |
scripts: Save toolchain config as regular file
Since commit 16c6cc99 ("Save the toolchain configuration to its own
file, as an auto-extracting shell script:") we've been saving the
configuration as a self extracting script. This is a little non-obvious
as it looks like it should be a regular file but the bzipped payload
means it can be easily inspected. It may also cause alarm for users who
should rightly be suspicious of unexpected binaries that get shipped
along with packaged toolchains. It also assumes that bzip2 (or at least
bzcat) is available on the machine running the toolchain.
Instead of the self extracting shell script save the config as a regular
compressed file with an obvious file extension.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
| -rw-r--r-- | scripts/functions | 7 | ||||
| -rw-r--r-- | scripts/toolchain-config.in | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/functions b/scripts/functions index c0365eae..9ee0391b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2539,8 +2539,7 @@ CT_InstallConfigurationFile() local path="${1}" local suffix="${2}" - CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin" - CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" - CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" - bzip2 -c -9 "${path}" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" + CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/share" + CT_DoExecLog DEBUG ${install} -m 0644 "${path}" "${CT_PREFIX_DIR}/share/${CT_TARGET}-${suffix}.config" + CT_DoExecLog DEBUG bzip2 -9 "${CT_PREFIX_DIR}/share/${CT_TARGET}-${suffix}.config" } diff --git a/scripts/toolchain-config.in b/scripts/toolchain-config.in deleted file mode 100644 index 14549bc3..00000000 --- a/scripts/toolchain-config.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -tail -n+5 "${0}" |bzcat -exit 0 |