Skip to content

Commit b5f9cdb

Browse files
committed
Get rid of broken ct-ng oldconfig everywhere and directly provide a suitable .config file.
1 parent a412880 commit b5f9cdb

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

src/ci/docker/host-x86_64/dist-arm-linux/build-toolchains.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ exit 1
2222
mkdir build
2323
cd build
2424
cp ../arm-linux-gnueabi.config .config
25-
ct-ng oldconfig
25+
# FIXME ct-ng oldconfig is not working as intended.
26+
# ct-ng oldconfig
2627
hide_output ct-ng build
2728
cd ..
2829
rm -rf build

src/ci/docker/host-x86_64/dist-armhf-linux/arm-linux-gnueabihf.config

+2-15
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CT_CONFIGURE_has_autoconf_2_65_or_newer=y
1414
CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
1515
CT_CONFIGURE_has_automake_1_15_or_newer=y
1616
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
17+
CT_CONFIGURE_has_python_3_4_or_newer=y
1718
CT_CONFIGURE_has_bison_2_7_or_newer=y
1819
CT_CONFIGURE_has_python=y
1920
CT_CONFIGURE_has_git=y
@@ -132,12 +133,6 @@ CT_ARCH_ARM=y
132133
# CT_ARCH_XTENSA is not set
133134
CT_ARCH="arm"
134135
CT_ARCH_CHOICE_KSYM="ARM"
135-
# CT_ARCH_ALPHA_EV4 is not set
136-
# CT_ARCH_ALPHA_EV45 is not set
137-
# CT_ARCH_ALPHA_EV5 is not set
138-
# CT_ARCH_ALPHA_EV56 is not set
139-
# CT_ARCH_ALPHA_EV6 is not set
140-
# CT_ARCH_ALPHA_EV67 is not set
141136
CT_ARCH_CPU=""
142137
CT_ARCH_TUNE=""
143138
CT_ARCH_ARM_SHOW=y
@@ -372,8 +367,6 @@ CT_ALL_BINUTILS_CHOICES="BINUTILS"
372367
# C-library
373368
#
374369
CT_LIBC_GLIBC=y
375-
# CT_LIBC_NEWLIB is not set
376-
# CT_LIBC_NONE is not set
377370
# CT_LIBC_UCLIBC is not set
378371
CT_LIBC="glibc"
379372
CT_LIBC_CHOICE_KSYM="GLIBC"
@@ -390,6 +383,7 @@ CT_GLIBC_USE="GLIBC"
390383
CT_GLIBC_PKG_NAME="glibc"
391384
CT_GLIBC_SRC_RELEASE=y
392385
CT_GLIBC_PATCH_ORDER="global"
386+
# CT_GLIBC_V_2_29 is not set
393387
# CT_GLIBC_V_2_28 is not set
394388
# CT_GLIBC_V_2_27 is not set
395389
# CT_GLIBC_V_2_26 is not set
@@ -408,7 +402,6 @@ CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
408402
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
409403
CT_GLIBC_2_29_or_older=y
410404
CT_GLIBC_older_than_2_29=y
411-
CT_GLIBC_REQUIRE_older_than_2_29=y
412405
CT_GLIBC_2_27_or_older=y
413406
CT_GLIBC_older_than_2_27=y
414407
CT_GLIBC_2_26_or_older=y
@@ -448,12 +441,6 @@ CT_GLIBC_FORCE_UNWIND=y
448441
CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
449442
# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
450443
CT_GLIBC_MIN_KERNEL="3.2.101"
451-
# CT_GLIBC_SSP_DEFAULT is not set
452-
# CT_GLIBC_SSP_NO is not set
453-
# CT_GLIBC_SSP_YES is not set
454-
# CT_GLIBC_SSP_ALL is not set
455-
# CT_GLIBC_SSP_STRONG is not set
456-
# CT_NEWLIB_USE_REDHAT is not set
457444
CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
458445
CT_LIBC_SUPPORT_THREADS_ANY=y
459446
CT_LIBC_SUPPORT_THREADS_NATIVE=y

src/ci/docker/host-x86_64/dist-armhf-linux/build-toolchains.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ exit 1
2222
mkdir build
2323
cd build
2424
cp ../arm-linux-gnueabihf.config .config
25-
ct-ng oldconfig
25+
# FIXME ct-ng oldconfig is not working as intended.
26+
# ct-ng oldconfig
2627
hide_output ct-ng build
2728
cd ..
2829
rm -rf build

src/ci/docker/host-x86_64/dist-armv7-linux/armv7-linux-gnueabihf.config

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
1717
CT_CONFIGURE_has_python_3_4_or_newer=y
1818
CT_CONFIGURE_has_bison_2_7_or_newer=y
1919
CT_CONFIGURE_has_python=y
20-
CT_CONFIGURE_has_dtc=y
21-
CT_CONFIGURE_has_svn=y
2220
CT_CONFIGURE_has_git=y
2321
CT_CONFIGURE_has_md5sum=y
2422
CT_CONFIGURE_has_sha1sum=y

src/ci/docker/host-x86_64/dist-armv7-linux/build-toolchains.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ exit 1
2222
mkdir build
2323
cd build
2424
cp ../armv7-linux-gnueabihf.config .config
25-
ct-ng oldconfig
25+
# FIXME ct-ng oldconfig is not working as intended.
26+
# ct-ng oldconfig
2627
hide_output ct-ng build
2728
cd ..
2829
rm -rf build

0 commit comments

Comments
 (0)