From 5a1dc8d95d29f23f346625dec690ae0eb229d560 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 25 Jul 2024 19:18:57 +1200 Subject: 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 --- scripts/functions | 7 +++---- scripts/toolchain-config.in | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 scripts/toolchain-config.in 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 -- cgit v1.2.3