diff --git a/sysa.py b/sysa.py index 35a83df7..0ccdd344 100755 --- a/sysa.py +++ b/sysa.py @@ -19,7 +19,8 @@ class SysA(SysGeneral): Class responsible for preparing sources for System A. """ # pylint: disable=too-many-instance-attributes,too-many-arguments - def __init__(self, arch, preserve_tmp, external_sources, early_preseed, tmpdir, sysb_dir, sysc_dir): + def __init__(self, arch, preserve_tmp, external_sources, + early_preseed, tmpdir, sysb_dir, sysc_dir): self.git_dir = os.path.dirname(os.path.join(__file__)) self.arch = arch self.preserve_tmp = preserve_tmp diff --git a/sysa/helpers.sh b/sysa/helpers.sh index c091de1a..77a923cf 100755 --- a/sysa/helpers.sh +++ b/sysa/helpers.sh @@ -77,7 +77,7 @@ get_revision() { local pkg=$1 cd "${SRCDIR}/repo" # Get revision (n time this package has been built) - revision=$((ls -1 "${pkg}"* 2>/dev/null || true) | wc -l | sed 's/ *//g') + revision=$( (ls -1 "${pkg}"* 2>/dev/null || true) | wc -l | sed 's/ *//g') } # Installs binary packages from an earlier run diff --git a/sysc/musl-1.2.3/files/ld-musl-i386.path.license b/sysc/musl-1.2.3/files/ld-musl-i386.path.license new file mode 100644 index 00000000..cf95404d --- /dev/null +++ b/sysc/musl-1.2.3/files/ld-musl-i386.path.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2022 fosslinux + +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/sysc/run2.sh b/sysc/run2.sh index a04d943f..4cbcda09 100755 --- a/sysc/run2.sh +++ b/sysc/run2.sh @@ -123,4 +123,4 @@ if [ -e after.sh ]; then FILE=after.sh fi -exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash ${FILE} +exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${FILE}"