diff --git a/architecture/blackfin/pkg_gcc_post.conf b/architecture/blackfin/pkg_gcc_post.conf index f18ae7a111..8e2da6f53b 100644 --- a/architecture/blackfin/pkg_gcc_post.conf +++ b/architecture/blackfin/pkg_gcc_post.conf @@ -1,16 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: architecture/blackfin/pkg_gcc_post.conf -# Copyright (C) 2007 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- T2-COPYRIGHT-BEGIN --- +# t2/architecture/blackfin/pkg_gcc_post.conf +# Copyright (C) 2007 - 2025 The T2 SDE Project +# SPDX-License-Identifier: GPL-2.0 +# --- T2-COPYRIGHT-END --- var_remove_regex patchfiles ' ' .*uclibc.*patches.* -var_append extraconfopt ' ' '--disable-libstdcxx-pch --disable-symvers' +var_append confopt ' ' '--disable-libstdcxx-pch --disable-symvers' diff --git a/architecture/sparc/package/glibc/glibc.conf b/architecture/sparc/package/glibc/glibc.conf index 2b4f5ade0e..dc1ed11aa9 100644 --- a/architecture/sparc/package/glibc/glibc.conf +++ b/architecture/sparc/package/glibc/glibc.conf @@ -1,20 +1,15 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# T2 SDE: architecture/sparc/package/*/glibc.conf -# Copyright (C) 2004 - 2022 The T2 SDE Project -# -# This Copyright note is generated by scripts/Create-CopyPatch, -# more information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2. -# --- T2-COPYRIGHT-NOTE-END --- +# --- T2-COPYRIGHT-BEGIN --- +# t2/architecture/sparc/package/*/glibc.conf +# Copyright (C) 2004 - 2025 The T2 SDE Project +# SPDX-License-Identifier: GPL-2.0 +# --- T2-COPYRIGHT-END --- # overwrite prefix to not point to the tools, but the real root for the headers if atstage toolchain; then # hack due to sane variable not available and prefix is tools prefix # -ReneR confopt="--prefix=$base/build/$SDECFG_ID/usr \ - --with-headers=$base/build/$SDECFG_ID/usr/include \$extraconfopt" + --with-headers=$base/build/$SDECFG_ID/usr/include" includedir="/../../usr/include" # MIPS injects -mabi - the host CC does not know about it for header gen @@ -90,18 +85,18 @@ elif pkginstalled libgd; then var_append confopt " " "--with-gd=/usr --with-gd-lib=/usr/lib --with-gd-include=/usr/include" fi -var_append extraconfopt " " "--with-tls --with-__thread" #,libidn +var_append confopt " " "--with-tls --with-__thread" #,libidn # build and install the obsolete RPC code -var_append extraconfopt " " "--enable-obsolete-rpc" +var_append confopt " " "--enable-obsolete-rpc" # control whether to include profiling support if [ $SDECFG_PKG_GLIBC_ENABLE_PROFILE = 1 ] ; then - var_append extraconfopt " " "--enable-profile" + var_append confopt " " "--enable-profile" else - var_append extraconfopt " " "--disable-profile" + var_append confopt " " "--disable-profile" fi var_remove_regex makeopt " " "prefix=.*" diff --git a/doc/PKG-BUILD-VARS b/doc/PKG-BUILD-VARS index dd0b02273f..21f75193a3 100644 --- a/doc/PKG-BUILD-VARS +++ b/doc/PKG-BUILD-VARS @@ -75,7 +75,6 @@ patchopt ...... options passed to the patch program runconf ....... set to '0' if you want to skip running configure autogen ....... set to '1' if you want to run the autogen script confopt ....... options for GNU autoconf './configure' -extraconfopt .. options which should be appended to $confopt by set_confopt() configprefix .. variable declarations only for GNU autoconf './configure' configscript .. script file name of the GNU autoconf configure script cleanconfopt .. set to '0' if you don't want to remove unsupported options diff --git a/misc/jailing/jail-functions b/misc/jailing/jail-functions index 8bd9ebd284..98c4dcadba 100644 --- a/misc/jailing/jail-functions +++ b/misc/jailing/jail-functions @@ -1,19 +1,11 @@ #!/bin/bash # -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by scripts/Create-CopyPatch. -# -# T2 SDE: misc/jailing/jail-functions -# Copyright (C) 2004 - 2020 The T2 SDE Project +# --- T2-COPYRIGHT-BEGIN --- +# t2/misc/jailing/jail-functions +# Copyright (C) 2004 - 2025 The T2 SDE Project # Copyright (C) 1998 - 2003 ROCK Linux Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# SPDX-License-Identifier: GPL-2.0 +# --- T2-COPYRIGHT-END --- jail_lib_needed() { ### $1 dirtree to search for +x files (usually $jail) @@ -200,7 +192,6 @@ jail_set_confopt() { confopt="${confopt//--enable-nls/} --disable-nls" fi - confopt="$confopt \$extraconfopt" confopt="$confopt --build=\$arch_build --host=\$arch_target" } diff --git a/misc/jailing/parse-config b/misc/jailing/parse-config index db728e2a0c..1fdd594319 100644 --- a/misc/jailing/parse-config +++ b/misc/jailing/parse-config @@ -1,17 +1,9 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: misc/jailing/parse-config -# Copyright (C) 2004 - 2005 The T2 SDE Project +# --- T2-COPYRIGHT-BEGIN --- +# t2/misc/jailing/parse-config +# Copyright (C) 2004 - 2025 The T2 SDE Project # Copyright (C) 1998 - 2003 ROCK Linux Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# SPDX-License-Identifier: GPL-2.0 +# --- T2-COPYRIGHT-END --- # Revwrite --with-