diff options
Diffstat (limited to 'meta/conf/layer.conf')
-rw-r--r-- | meta/conf/layer.conf | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index cda37c33b4..62f86f361a 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf | |||
@@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core" | |||
7 | BBFILE_PATTERN_core = "^${LAYERDIR}/" | 7 | BBFILE_PATTERN_core = "^${LAYERDIR}/" |
8 | BBFILE_PRIORITY_core = "5" | 8 | BBFILE_PRIORITY_core = "5" |
9 | 9 | ||
10 | LAYERSERIES_CORENAMES = "gatesgarth" | 10 | LAYERSERIES_CORENAMES = "scarthgap" |
11 | 11 | ||
12 | # This should only be incremented on significant changes that will | 12 | # This should only be incremented on significant changes that will |
13 | # cause compatibility issues with other layers | 13 | # cause compatibility issues with other layers |
14 | LAYERVERSION_core = "12" | 14 | LAYERVERSION_core = "15" |
15 | LAYERSERIES_COMPAT_core = "gatesgarth" | 15 | LAYERSERIES_COMPAT_core = "scarthgap" |
16 | 16 | ||
17 | BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" | 17 | BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" |
18 | 18 | ||
@@ -48,6 +48,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | |||
48 | " | 48 | " |
49 | 49 | ||
50 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 50 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
51 | *->patch-native \ | ||
51 | *->quilt-native \ | 52 | *->quilt-native \ |
52 | *->subversion-native \ | 53 | *->subversion-native \ |
53 | *->git-native \ | 54 | *->git-native \ |
@@ -68,6 +69,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
68 | initramfs-module-install->grub \ | 69 | initramfs-module-install->grub \ |
69 | initramfs-module-install->parted \ | 70 | initramfs-module-install->parted \ |
70 | initramfs-module-install->util-linux \ | 71 | initramfs-module-install->util-linux \ |
72 | initramfs-module-setup-live->udev-extraconf \ | ||
71 | grub-efi->grub-bootconf \ | 73 | grub-efi->grub-bootconf \ |
72 | liberation-fonts->fontconfig \ | 74 | liberation-fonts->fontconfig \ |
73 | cantarell-fonts->fontconfig \ | 75 | cantarell-fonts->fontconfig \ |
@@ -81,6 +83,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
81 | weston-init->kbd \ | 83 | weston-init->kbd \ |
82 | connman->xl2tpd \ | 84 | connman->xl2tpd \ |
83 | lttng-tools->lttng-modules \ | 85 | lttng-tools->lttng-modules \ |
86 | sato-icon-theme->gdk-pixbuf \ | ||
87 | sato-icon-theme->gtk+3 \ | ||
84 | adwaita-icon-theme->gdk-pixbuf \ | 88 | adwaita-icon-theme->gdk-pixbuf \ |
85 | adwaita-icon-theme->gtk+3 \ | 89 | adwaita-icon-theme->gtk+3 \ |
86 | " | 90 | " |
@@ -90,7 +94,24 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
90 | # (e.g. X -> Y -> binutils-cross -> bison-native) no longer meet the | 94 | # (e.g. X -> Y -> binutils-cross -> bison-native) no longer meet the |
91 | # dependency incidentally. This improves determinism and avoids build | 95 | # dependency incidentally. This improves determinism and avoids build |
92 | # failures when people switch to external toolchains. | 96 | # failures when people switch to external toolchains. |
93 | SSTATE_EXCLUDEDEPS_SYSROOT += ".*->bison-native" | 97 | # libarchive only needs e2fsprogs headers at buildtime |
98 | SSTATE_EXCLUDEDEPS_SYSROOT += "\ | ||
99 | .*->autoconf-native \ | ||
100 | .*->automake-native \ | ||
101 | .*->bison-native \ | ||
102 | .*->meson-native \ | ||
103 | .*->ninja-native \ | ||
104 | .*->patch-native \ | ||
105 | .*->pkgconfig-native \ | ||
106 | .*->quilt-native \ | ||
107 | ^(?!gtk-doc-native).*->xmlto-native \ | ||
108 | .*->gperf-native \ | ||
109 | .*->help2man-native \ | ||
110 | .*->gtk-doc-native \ | ||
111 | .*->texinfo-native \ | ||
112 | .*->perlcross-native \ | ||
113 | libarchive-native->e2fsprogs-native \ | ||
114 | " | ||
94 | # Nothing needs to depend on libc-initial | 115 | # Nothing needs to depend on libc-initial |
95 | # base-passwd/shadow-sysroot don't need their dependencies | 116 | # base-passwd/shadow-sysroot don't need their dependencies |
96 | SSTATE_EXCLUDEDEPS_SYSROOT += "\ | 117 | SSTATE_EXCLUDEDEPS_SYSROOT += "\ |
@@ -105,3 +126,8 @@ SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" | |||
105 | # Avoid empty path entries | 126 | # Avoid empty path entries |
106 | BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}" | 127 | BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}" |
107 | PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' != '' else ''}${HOSTTOOLS_DIR}" | 128 | PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' != '' else ''}${HOSTTOOLS_DIR}" |
129 | |||
130 | # Only OE-Core should set/change this | ||
131 | BB_GLOBAL_PYMODULES = "os sys time" | ||
132 | |||
133 | addpylib ${LAYERDIR}/lib oe | ||