diff options
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/include/distro_alias.inc | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 56055f7798..b4dfcfc5f5 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -81,10 +81,6 @@ DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodi | |||
81 | DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" | 81 | DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" |
82 | DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" | 82 | DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" |
83 | DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" | 83 | DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" |
84 | DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" | ||
85 | DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" | ||
86 | DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core" | ||
87 | DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial-x86_64 = "OE-Core" | ||
88 | DISTRO_PN_ALIAS_pn-gccmakedep = "Mandriva=gccmakedep Ubuntu=xutils-dev" | 84 | DISTRO_PN_ALIAS_pn-gccmakedep = "Mandriva=gccmakedep Ubuntu=xutils-dev" |
89 | DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc" | 85 | DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc" |
90 | DISTRO_PN_ALIAS_pn-gcc-sanitizers = "Ubuntu=gcc Fedora=gcc" | 86 | DISTRO_PN_ALIAS_pn-gcc-sanitizers = "Ubuntu=gcc Fedora=gcc" |
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 1bc95ec675..50e8a20f35 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -30,9 +30,7 @@ LLVMVERSION ?= "10.0.1" | |||
30 | 30 | ||
31 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 31 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" |
32 | PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" | 32 | PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" |
33 | PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}" | ||
34 | PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" | 33 | PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" |
35 | PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_SYS} ?= "${SDKGCCVERSION}" | ||
36 | PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" | 34 | PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" |
37 | PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" | 35 | PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" |
38 | PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" | 36 | PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" |