summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc4
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/conf/layer.conf2
3 files changed, 1 insertions, 7 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
81DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" 81DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts"
82DISTRO_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" 82DISTRO_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"
83DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" 83DISTRO_PN_ALIAS_pn-formfactor = "OE-Core"
84DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core"
85DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core"
86DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core"
87DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial-x86_64 = "OE-Core"
88DISTRO_PN_ALIAS_pn-gccmakedep = "Mandriva=gccmakedep Ubuntu=xutils-dev" 84DISTRO_PN_ALIAS_pn-gccmakedep = "Mandriva=gccmakedep Ubuntu=xutils-dev"
89DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc" 85DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc"
90DISTRO_PN_ALIAS_pn-gcc-sanitizers = "Ubuntu=gcc Fedora=gcc" 86DISTRO_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
31PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 31PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
32PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
33PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}"
34PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" 33PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
35PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_SYS} ?= "${SDKGCCVERSION}"
36PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" 34PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
37PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" 35PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
38PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" 36PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 1a01d02fef..38df0f3aff 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -91,7 +91,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
91# dependency incidentally. This improves determinism and avoids build 91# dependency incidentally. This improves determinism and avoids build
92# failures when people switch to external toolchains. 92# failures when people switch to external toolchains.
93SSTATE_EXCLUDEDEPS_SYSROOT += ".*->bison-native" 93SSTATE_EXCLUDEDEPS_SYSROOT += ".*->bison-native"
94# Nothing needs to depend on libc-initial/gcc-cross-initial 94# Nothing needs to depend on libc-initial
95# base-passwd/shadow-sysroot don't need their dependencies 95# base-passwd/shadow-sysroot don't need their dependencies
96SSTATE_EXCLUDEDEPS_SYSROOT += "\ 96SSTATE_EXCLUDEDEPS_SYSROOT += "\
97 .*->.*-initial.* \ 97 .*->.*-initial.* \