mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 09:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/*: Be more lenient with the EAPI versions

Browse Source 
We are in progress of updating packages with old EAPIs, so this change
should be reverted really soon.
This commit is contained in:
Krzesimir Nowak 2021-11-05 21:58:03 +01:00
parent 43b14b0700
commit 339298bd3e
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass vendored
View File

@ -28,10 +28,12 @@ _BASH_COMPLETION_R1_ECLASS=1
inherit toolchain-funcs inherit toolchain-funcs
case ${EAPI} in # Flatcar: we still have some packages that use old EAPI, revert this
5|6|7|8) ;; # change when we update those packages.
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; #case ${EAPI} in
esac # 5|6|7|8) ;;
# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
#esac
# @FUNCTION: _bash-completion-r1_get_bashdir # @FUNCTION: _bash-completion-r1_get_bashdir
# @INTERNAL # @INTERNAL

15
sdk_container/src/third_party/portage-stable/eclass/multilib.eclass vendored
View File

@ -9,11 +9,13 @@
# @DESCRIPTION: # @DESCRIPTION:
# This eclass is for all functions pertaining to handling multilib configurations. # This eclass is for all functions pertaining to handling multilib configurations.
case ${EAPI:-0} in # Flatcar: we still have some packages that use old EAPI, revert this
# EAPI=0 is still used by crossdev, bug #797367 # change when we update those packages.
0|5|6|7|8) ;; #case ${EAPI:-0} in
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; # # EAPI=0 is still used by crossdev, bug #797367
esac # 0|5|6|7|8) ;;
# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
#esac
if [[ -z ${_MULTILIB_ECLASS} ]]; then if [[ -z ${_MULTILIB_ECLASS} ]]; then
_MULTILIB_ECLASS=1 _MULTILIB_ECLASS=1
@ -54,7 +56,8 @@ has_multilib_profile() {
# fall back on old behavior. Any profile that has these set should also # fall back on old behavior. Any profile that has these set should also
# depend on a newer version of portage (not yet released) which uses these # depend on a newer version of portage (not yet released) which uses these
# over CONF_LIBDIR in econf, dolib, etc... # over CONF_LIBDIR in econf, dolib, etc...
if [[ ${EAPI} == [05] ]] ; then # Flatcar: Support older EAPIs for now.
if [[ ${EAPI} == [0345] ]] ; then
get_libdir() { get_libdir() {
local CONF_LIBDIR local CONF_LIBDIR
if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then

12
sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass vendored
View File

@ -13,11 +13,13 @@
# in such a way that you can rely on the function always returning # in such a way that you can rely on the function always returning
# something sane. # something sane.
case ${EAPI:-0} in # Flatcar: we still have some packages that use old EAPI, revert this
# EAPI=0 is still used by crossdev, bug #797367 # change when we update those packages.
0|5|6|7|8) ;; #case ${EAPI:-0} in
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; # # EAPI=0 is still used by crossdev, bug #797367
esac # 0|5|6|7|8) ;;
# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
#esac
if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then
_TOOLCHAIN_FUNCS_ECLASS=1 _TOOLCHAIN_FUNCS_ECLASS=1