Allow packages to define "relevant" part of the version

E.g., only include minor/major of the Linux kernel into the kconfig
symbol. In the future, to be defined by all packages, but for now
matches the current versioning in the packages.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-07-06 22:18:43 -07:00
parent 4bd6d5f560
commit 1b207d0adc
45 changed files with 32 additions and 51 deletions
bootstrap
packages
samples
aarch64-rpi3-linux-gnu
aarch64-unknown-linux-android
alphaev56-unknown-linux-gnu
alphaev67-unknown-linux-gnu
arm-bare_newlib_cortex_m3_nommu-eabi
arm-cortex_a15-linux-gnueabihf
arm-cortex_a8-linux-gnueabi
arm-cortexa5-linux-uclibcgnueabihf
arm-unknown-linux-gnueabi
armeb-unknown-linux-gnueabi
armeb-unknown-linux-uclibcgnueabi
armv6-nommu-linux-uclibcgnueabi
armv6-rpi-linux-gnueabi
armv7-rpi2-linux-gnueabihf
armv8-rpi3-linux-gnueabihf
i586-geode-linux-uclibc
i686-centos6-linux-gnu
i686-centos7-linux-gnu
i686-nptl-linux-gnu
i686-ubuntu12.04-linux-gnu
i686-ubuntu14.04-linux-gnu
i686-ubuntu16.04-linux-gnu
mips-ar2315-linux-gnu
mips-malta-linux-gnu
mips-unknown-linux-uclibc
mipsel-multilib-linux-gnu
mipsel-unknown-linux-gnu
powerpc-e500v2-linux-gnuspe
powerpc-unknown-linux-uclibc
sparc-leon-linux-uclibc
x86_64-centos6-linux-gnu
x86_64-centos7-linux-gnu
x86_64-multilib-linux-gnu
x86_64-multilib-linux-uclibc,powerpc-unknown-elf
x86_64-multilib-linux-uclibc
x86_64-ubuntu12.04-linux-gnu
x86_64-ubuntu14.04-linux-gnu
x86_64-ubuntu16.04-linux-gnu
x86_64-unknown-linux-gnu
x86_64-unknown-linux-uclibc
x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf
xtensa-fsf-linux-uclibc

View File

@ -219,6 +219,20 @@ run_template()
kconfigize()
{
local v="${1}"
local p pb pa vx
shift
# If optional patterns are provided, find the first match
# and contract to the matching portion.
for p in "$@"; do
pb=${p%|*}
pa=${p#*|}
eval "vx=\${v#${pb}${pa}}"
if [ "${v%${pa}${vx}}" != "${v}" ]; then
v=${v%${pa}${vx}}
break
fi
done
v=${v//[^0-9A-Za-z_]/_}
echo "${v^^}"
@ -429,6 +443,7 @@ find_forks()
pkg_nforks[${1}]=$[pkg_nforks[${1}]+1]
pkg_forks[${1}]+=" ${1} "
pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
pkg_relevantpattern[${1}]=${info[relevantpattern]}
pkg_masters+=( "${1}" )
fi
# Keep sorting so that preferred fork is first
@ -511,7 +526,7 @@ enter_version()
eval `read_version_desc ${info[fork]} ${version}`
info[ver]=${version}
info[kcfg]=`kconfigize ${version}`
info[kcfg]=`kconfigize ${version} ${info[relevantpattern]}`
info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]}
}
@ -529,7 +544,7 @@ enter_milestone()
gen_packages()
{
local -A pkg_forks pkg_milestones pkg_nforks
local -A pkg_forks pkg_milestones pkg_nforks pkg_relevantpattern
local -a pkg_masters pkg_all pkg_preferred
pkg_all=( `cd packages && \
@ -558,6 +573,7 @@ gen_packages()
[masterpfx]=`kconfigize ${p}` \
[nforks]=${pkg_nforks[${p}]} \
[all_milestones]=${pkg_milestones[${p}]} \
[relevantpattern]=${pkg_relevantpattern[${p}]} \
)
set_iter fork ${pkg_forks[${p}]}
set_iter milestone ${pkg_milestones[${p}]}
@ -588,8 +604,8 @@ enter_choice()
local choice="${1}"
local l
# TBD generate sourcing of versions/$component.in automatically - and add a comment that versions must
# TBD generated first? [what to do with glibc/glibc-ports]
# TBD generate sourcing of versions/$component.in automatically - and add a comment
# TBD that versions must be generated first? [what to do with glibc/glibc-ports]
info[choice]="${choice}"
info[kcfg_choice]=`kconfigize "${choice}"`

View File

@ -1,2 +1,3 @@
repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})'
relevantpattern='2.*.*|. *.*|.'

View File

@ -2,3 +2,4 @@ origin='RedHat'
repository='git git://sourceware.org/git/newlib-cygwin.git'
mirrors='ftp://sourceware.org/pub/newlib'
milestones='2.0 2.1 2.2'
relevantpattern='*.*.*|.'

View File

@ -1,6 +1,6 @@
CT_ARCH_ARM=y
CT_ARCH_64=y
CT_ARCH_CPU="cortex-a53"
CT_ARCH_64=y
CT_TARGET_VENDOR="rpi3"
CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y

View File

@ -4,7 +4,6 @@ CT_ARCH_64=y
CT_ARCH_ARCH="armv8-a"
CT_STATIC_TOOLCHAIN=y
CT_KERNEL_LINUX=y
CT_BIONIC_V_14b=y
CT_ANDROID_API_21=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y

View File

@ -1,4 +1,3 @@
CT_ARCH_CPU="ev56"
CT_ARCH_ALPHA_EV56=y
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y

View File

@ -1,4 +1,3 @@
CT_ARCH_CPU="ev67"
CT_ARCH_ALPHA_EV67=y
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y

View File

@ -1,8 +1,8 @@
CT_ARCH_ARM=y
# CT_ARCH_USE_MMU is not set
CT_ARCH_CPU="cortex-m3"
CT_ARCH_FLOAT_SW=y
CT_ARCH_ARM_MODE_THUMB=y
# CT_ARCH_USE_MMU is not set
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="bare_newlib_cortex_m3_nommu"
CT_ARCH_BINFMT_FLAT=y
CT_LIBC_NEWLIB_IO_C99FMT=y

View File

@ -8,7 +8,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -7,7 +7,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -10,7 +10,6 @@ CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -6,7 +6,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y

View File

@ -7,7 +7,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y

View File

@ -1,6 +1,6 @@
CT_ARCH_ARM=y
CT_ARCH_BE=y
CT_ARCH_CPU="xscale"
CT_ARCH_BE=y
CT_ARCH_FLOAT_SW=y
CT_KERNEL_LINUX=y
CT_BINUTILS_LINKER_LD_GOLD=y

View File

@ -3,8 +3,8 @@ CT_ARCH_SUFFIX="v6"
# CT_ARCH_USE_MMU is not set
CT_TARGET_VENDOR="nommu"
CT_KERNEL_LINUX=y
# CT_SHARED_LIBS is not set
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
# CT_SHARED_LIBS is not set
CT_BINUTILS_PLUGINS=y
CT_THREADS_NONE=y
CT_CC_GCC_DISABLE_PCH=y

View File

@ -1,6 +1,6 @@
CT_ARCH_ARM=y
CT_ARCH_SUFFIX="v6"
CT_ARCH_CPU="arm1176jzf-s"
CT_ARCH_SUFFIX="v6"
CT_ARCH_FPU="vfp"
CT_TARGET_VENDOR="rpi"
CT_KERNEL_LINUX=y
@ -9,7 +9,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_GLIBC_LOCALES=y
CT_GLIBC_KERNEL_VERSION_CHOSEN=y
CT_GLIBC_MIN_KERNEL_VERSION="3.2.27"

View File

@ -1,6 +1,6 @@
CT_ARCH_ARM=y
CT_ARCH_SUFFIX="v7"
CT_ARCH_CPU="cortex-a7"
CT_ARCH_SUFFIX="v7"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="rpi2"
@ -9,6 +9,5 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y

View File

@ -1,6 +1,6 @@
CT_ARCH_ARM=y
CT_ARCH_SUFFIX="v8"
CT_ARCH_CPU="cortex-a53"
CT_ARCH_SUFFIX="v8"
CT_ARCH_FPU="neon-vfpv4"
CT_ARCH_FLOAT_HW=y
CT_TARGET_VENDOR="rpi3"
@ -9,6 +9,5 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y

View File

@ -7,7 +7,6 @@ CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="centos6"
CT_KERNEL_LINUX=y
CT_LINUX_V_2_6_32=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_12_2=y
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="centos7"
CT_KERNEL_LINUX=y
CT_LINUX_V_3_10=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_17=y
CT_CC_LANG_CXX=y

View File

@ -6,7 +6,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="ubuntu12.04"
CT_KERNEL_LINUX=y
CT_LINUX_V_3_2=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_15=y
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="ubuntu14.04"
CT_KERNEL_LINUX=y
CT_LINUX_V_3_13=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_19=y
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
CT_TARGET_VENDOR="ubuntu16.04"
CT_KERNEL_LINUX=y
CT_LINUX_V_4_4=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_23=y
CT_CC_LANG_CXX=y

View File

@ -1,11 +1,10 @@
CT_ARCH_MIPS=y
CT_ARCH_ARCH="4kc"
CT_ARCH_TUNE="4kc"
CT_ARCH_ARCH="4kc"
CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="ar2315"
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y

View File

@ -2,7 +2,6 @@ CT_ARCH_MIPS=y
CT_TARGET_VENDOR="malta"
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y

View File

@ -4,7 +4,6 @@ CT_ARCH_FLOAT_SW=y
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y

View File

@ -5,7 +5,6 @@ CT_ARCH_FLOAT_SW=y
CT_TARGET_VENDOR="multilib"
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-targets=all"
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-targets=all"
CT_CC_GCC_mips_plt=y

View File

@ -4,7 +4,6 @@ CT_ARCH_ARCH="mips1"
CT_ARCH_FLOAT_SW=y
CT_KERNEL_LINUX=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_CC_GCC_mips_plt=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y

View File

@ -1,8 +1,8 @@
CT_ARCH_POWERPC=y
CT_ARCH_CPU="8548"
CT_ARCH_powerpc_ABI_SPE=y
CT_ARCH_FLOAT_SW=y
CT_TARGET_CFLAGS="-mfloat-gprs=double -Wa,-me500x2"
CT_ARCH_powerpc_ABI_SPE=y
CT_TARGET_VENDOR="e500v2"
CT_KERNEL_LINUX=y
CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2"

View File

@ -3,7 +3,6 @@ CT_ARCH_FLOAT_SW=y
CT_KERNEL_LINUX=y
CT_BINUTILS_FOR_TARGET=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_LANG_CXX=y
CT_CC_LANG_FORTRAN=y
CT_DEBUG_DUMA=y

View File

@ -8,7 +8,6 @@ CT_LINUX_V_3_10=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/uClibc.config"
CT_LIBC_UCLIBC_IPV6=y
CT_LIBC_UCLIBC_WCHAR=y
CT_GCC_V_6_3_0=y
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_64=y
CT_TARGET_VENDOR="centos6"
CT_KERNEL_LINUX=y
CT_LINUX_V_2_6_32=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_12_2=y
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_64=y
CT_TARGET_VENDOR="centos7"
CT_KERNEL_LINUX=y
CT_LINUX_V_3_10=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_17=y
CT_CC_LANG_CXX=y

View File

@ -7,7 +7,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_GLIBC_KERNEL_VERSION_NONE=y
CT_CC_GCC_MULTILIB_LIST="m64,m32,mx32"
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y

View File

@ -5,7 +5,6 @@ CT_HOST="x86_64-multilib-linux-uclibc"
CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_COMP_TOOLS_FOR_HOST=y
CT_COMP_TOOLS_M4=y
CT_COMP_TOOLS_MAKE=y

View File

@ -9,7 +9,6 @@ CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -4,7 +4,6 @@ CT_ARCH_64=y
CT_TARGET_VENDOR="ubuntu12.04"
CT_KERNEL_LINUX=y
CT_LINUX_V_3_2=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_15=y
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_64=y
CT_TARGET_VENDOR="ubuntu14.04"
CT_KERNEL_LINUX=y
CT_LINUX_V_3_13=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_19=y
CT_CC_LANG_CXX=y

View File

@ -4,7 +4,6 @@ CT_ARCH_64=y
CT_TARGET_VENDOR="ubuntu16.04"
CT_KERNEL_LINUX=y
CT_LINUX_V_4_4=y
CT_LIBC_GLIBC=y
# CT_KERNEL_LINUX_INSTALL_CHECK is not set
CT_GLIBC_V_2_23=y
CT_CC_LANG_CXX=y

View File

@ -5,7 +5,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_GLIBC=y
CT_GLIBC_KERNEL_VERSION_NONE=y
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
CT_CC_LANG_CXX=y

View File

@ -7,7 +7,6 @@ CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_LANG_CXX=y
CT_DEBUG_DUMA=y
CT_DEBUG_GDB=y

View File

@ -18,6 +18,5 @@ CT_GLIBC_KERNEL_VERSION_NONE=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
CT_GDB_NATIVE_STATIC=y

View File

@ -4,6 +4,5 @@ CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"
CT_TARGET_VENDOR="fsf"
CT_KERNEL_LINUX=y
CT_LIBC_UCLIBC=y
CT_LIBC_UCLIBC_WCHAR=y
CT_CC_LANG_CXX=y
CT_DEBUG_GDB=y