diff options
author | Alexey Neyman <stilor@att.net> | 2022-01-06 21:10:07 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2022-02-11 08:47:50 (GMT) |
commit | 196f62e18ca16a1d6408d8e80989870e4ea93ef9 (patch) | |
tree | 09a01c7e8e05f0b8581c686bcea6f9f51109acd9 /samples | |
parent | cc6b7fad46f5cb3d84cf87ae47c5f723803a67a3 (diff) |
Upgrade script for uClibc retirement
Run samples through upgrade and fix accumulated breakages:
*-centos6-*: After 2.12.2 retirement, the samples selected most recent
glibc (2.34) which also forced kernels 3.2+. Revert to 2.12.1 and
2.6.32.71, respectively. Interestingly, 2.12.1 was marked as being used
in CentOS6, but the samples selected 2.12.2. Anyway, CentOS6 is EOL now
and glibc 2.12 is going to be marked obsolete, and retired soon.
arc-*: Make TARGET_VENDOR match the sample's name; otherwise `ct-ng
saveconfig` places the config file into a different location.
Fix 'savedefconfig' which was not saving the configuration file version
(CT_VCHECK was set to 'load' after CT_LoadConfig call).
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'samples')
-rw-r--r-- | samples/arc-arc700-linux-uclibc/crosstool.config | 6 | ||||
-rw-r--r-- | samples/arc-archs-linux-gnu/crosstool.config | 4 | ||||
-rw-r--r-- | samples/arc-multilib-elf32/crosstool.config | 2 | ||||
-rw-r--r-- | samples/arc-multilib-linux-gnu/crosstool.config | 2 | ||||
-rw-r--r-- | samples/arc-multilib-linux-uclibc/crosstool.config | 4 | ||||
-rw-r--r-- | samples/i686-centos6-linux-gnu/crosstool.config | 2 | ||||
-rw-r--r-- | samples/samples.mk | 2 | ||||
-rw-r--r-- | samples/x86_64-centos6-linux-gnu/crosstool.config | 6 |
8 files changed, 14 insertions, 14 deletions
diff --git a/samples/arc-arc700-linux-uclibc/crosstool.config b/samples/arc-arc700-linux-uclibc/crosstool.config index caa0cf1..93305e5 100644 --- a/samples/arc-arc700-linux-uclibc/crosstool.config +++ b/samples/arc-arc700-linux-uclibc/crosstool.config @@ -1,8 +1,8 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_ARCH_CPU="arc700" CT_TARGET_CFLAGS="-mno-atomic" -CT_TARGET_VENDOR="snps" +CT_TARGET_VENDOR="arc700" CT_TARGET_ALIAS="arc-linux" CT_KERNEL_LINUX=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y diff --git a/samples/arc-archs-linux-gnu/crosstool.config b/samples/arc-archs-linux-gnu/crosstool.config index ad39f70..dfeb1ed 100644 --- a/samples/arc-archs-linux-gnu/crosstool.config +++ b/samples/arc-archs-linux-gnu/crosstool.config @@ -1,6 +1,6 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_ARCH_CPU="archs" -CT_TARGET_VENDOR="snps" +CT_TARGET_VENDOR="archs" CT_TARGET_ALIAS="arc-linux" CT_KERNEL_LINUX=y diff --git a/samples/arc-multilib-elf32/crosstool.config b/samples/arc-multilib-elf32/crosstool.config index 0cc3cdd..e2bce98 100644 --- a/samples/arc-multilib-elf32/crosstool.config +++ b/samples/arc-multilib-elf32/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_MULTILIB=y CT_TARGET_VENDOR="multilib" diff --git a/samples/arc-multilib-linux-gnu/crosstool.config b/samples/arc-multilib-linux-gnu/crosstool.config index 3dc7802..b32c92e 100644 --- a/samples/arc-multilib-linux-gnu/crosstool.config +++ b/samples/arc-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_MULTILIB=y CT_TARGET_CFLAGS="-matomic" diff --git a/samples/arc-multilib-linux-uclibc/crosstool.config b/samples/arc-multilib-linux-uclibc/crosstool.config index b1862a5..16b7569 100644 --- a/samples/arc-multilib-linux-uclibc/crosstool.config +++ b/samples/arc-multilib-linux-uclibc/crosstool.config @@ -1,8 +1,8 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_MULTILIB=y CT_TARGET_CFLAGS="-matomic" CT_TARGET_VENDOR="multilib" CT_TARGET_ALIAS="arc-linux" CT_KERNEL_LINUX=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config index cb7f713..ffdb905 100644 --- a/samples/i686-centos6-linux-gnu/crosstool.config +++ b/samples/i686-centos6-linux-gnu/crosstool.config @@ -4,7 +4,5 @@ CT_ARCH_X86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="centos6" CT_KERNEL_LINUX=y -CT_LINUX_V_2_6_32=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_GLIBC_V_2_12_2=y CT_CC_LANG_CXX=y diff --git a/samples/samples.mk b/samples/samples.mk index 48bbbb9..51e9619 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -128,7 +128,7 @@ samples: # Save a sample saveconfig: .config samples - $(SILENT)CT_VCHECK=save CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh + $(SILENT)CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh # The 'sample_dir' function prints the directory in which the sample is, # searching first in local samples, then in global samples diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config index 24e8a11..e9747cd 100644 --- a/samples/x86_64-centos6-linux-gnu/crosstool.config +++ b/samples/x86_64-centos6-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_64=y @@ -6,5 +6,7 @@ CT_TARGET_VENDOR="centos6" CT_KERNEL_LINUX=y CT_LINUX_V_2_6_32=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_GLIBC_V_2_12_2=y +CT_GLIBC_V_2_12_1=y +CT_GLIBC_EXTRA_CFLAGS="" +# CT_GLIBC_ENABLE_COMMON_FLAG is not set CT_CC_LANG_CXX=y |