ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-18 10:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix installation of the license file

Browse Source 
... for ct-ng configured without --enable-local. Also, install
licenses in subdirectories of the components.

Also, ct-ng configured with --enable-local removed the scripts directory
upon `ct-ng distclean`.

Also, misspelled CT_WGET/CT_CURL variables prevented use of
`ct-ng updatetools`.

Fixes #1091.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-11-12 01:15:58 -08:00
parent fad46ac9d1
commit 35bec76b63
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -67,6 +67,8 @@ install-data-hook:
gzip -9 $(DESTDIR)$(man1dir)/$(ctng_progname).1
chmod a+x $(DESTDIR)$(pkgdatadir)/scripts/config.guess
chmod a+x $(DESTDIR)$(pkgdatadir)/scripts/config.sub
rm -f $(DESTDIR)$(pkgdatadir)/LICENSE
ln -s COPYING $(DESTDIR)$(pkgdatadir)/LICENSE
if INSTALL_BASH_COMPLETION
chmod a-x $(DESTDIR)$(compdir)/$(ctng_progname)
endif

2
bootstrap
View File

@ -742,7 +742,7 @@ msg "*** Gathering the list of data files to install"
{
declare -A seen_files
echo -n "verbatim_data ="
find config contrib packages samples scripts -type f | LANG=C sort | while read f; do
find COPYING config contrib licenses.d packages samples scripts -type f | LANG=C sort | while read f; do
# Implement some kind of .installignore for these files?
case "${f}" in
# Skip certain files not needed at runtime (used above for generating kconfig

1
ct-ng.in
View File

@ -20,6 +20,7 @@ ifeq (@enable_local@,yes)
export CT_LIB_DIR:=$(patsubst %/,%,$(dir $(CT_NG)))
export CT_LIBEXEC_DIR:=$(CT_LIB_DIR)/kconfig
export CT_DOC_DIR:=$(CT_LIB_DIR)/docs
export CT_LICENSE_DIR
else
# Paths and values set by ./configure
# Don't bother to change it other than with a new ./configure!

18
scripts/functions
View File

@ -2402,27 +2402,21 @@ fi
CT_InstallCopyingInformation()
{
local pkgname
local pkgdir
local licfile
local dstdir
CT_DoLog EXTRA "Collect license information from: ${CT_SRC_DIR}"
CT_DoLog EXTRA "Put the license information to: ${CT_PREFIX_DIR}/share/licenses"
shopt -s nullglob
for pkgdir in ${CT_SRC_DIR}/*; do
pkgname=$(basename "${pkgdir}")
for licfile in ${pkgdir}/{COPYING*,LICENSE*}; do
dstdir="${CT_PREFIX_DIR}/share/licenses/${pkgname}"
mkdir -p "${dstdir}"
CT_DoExecLog ALL cp -av "${licfile}" "${dstdir}/"
done
for licfile in $( find "${CT_SRC_DIR}" -follow -type f -a \( -name "COPYING*" -o -name "LICENSE*" \) ); do
dstdir="${licfile%/*}"
dstdir="${CT_PREFIX_DIR}/share/licenses${dstdir#${CT_SRC_DIR}}"
mkdir -p "${dstdir}"
CT_DoExecLog ALL cp -av "${licfile}" "${dstdir}/"
done
# Also add crosstool's information
for licfile in ${CT_TOP_DIR}/{COPYING*,LICENSE*,licenses.d}; do
for licfile in ${CT_LIB_DIR}/{COPYING*,LICENSE*,licenses.d}; do
dstdir="${CT_PREFIX_DIR}/share/licenses/crosstool-ng"
mkdir -p "${dstdir}"
CT_DoExecLog ALL cp -av "${licfile}" "${dstdir}/"

8
scripts/scripts.mk
View File

@ -31,11 +31,11 @@ ifneq ($(strip $(V)),2)
curl_silent_opt = --silent
endif
ifneq ($(CT_wget),)
download_cmd = $(CT_wget) --passive-ftp $(wget_silent_opt) -O $@
ifneq ($(CT_WGET),)
download_cmd = $(CT_WGET) --passive-ftp $(wget_silent_opt) -O $@
else
ifneq ($(CT_curl),)
download_cmd = $(CT_curl) --ftp-pasv $(curl_silent_opt) -o $@
ifneq ($(CT_CURL),)
download_cmd = $(CT_CURL) --ftp-pasv $(curl_silent_opt) -o $@
else
download_cmd = $(error wget or curl needed for downloads)
endif