diff options
Diffstat (limited to 'meta/conf/layer.conf')
-rw-r--r-- | meta/conf/layer.conf | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index b3cc8a249e..54fa04e213 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 = "honister" | 10 | LAYERSERIES_CORENAMES = "whinlatter" |
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 = "honister" | 15 | LAYERSERIES_COMPAT_core = "whinlatter" |
16 | 16 | ||
17 | BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" | 17 | BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" |
18 | 18 | ||
@@ -45,6 +45,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | |||
45 | ca-certificates \ | 45 | ca-certificates \ |
46 | shared-mime-info \ | 46 | shared-mime-info \ |
47 | desktop-file-utils \ | 47 | desktop-file-utils \ |
48 | os-release \ | ||
48 | " | 49 | " |
49 | 50 | ||
50 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 51 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
@@ -52,7 +53,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
52 | *->quilt-native \ | 53 | *->quilt-native \ |
53 | *->subversion-native \ | 54 | *->subversion-native \ |
54 | *->git-native \ | 55 | *->git-native \ |
55 | *->icecc-create-env-native \ | ||
56 | gcc-cross-${TARGET_ARCH}->linux-libc-headers \ | 56 | gcc-cross-${TARGET_ARCH}->linux-libc-headers \ |
57 | ppp-dialin->ppp \ | 57 | ppp-dialin->ppp \ |
58 | resolvconf->bash \ | 58 | resolvconf->bash \ |
@@ -69,6 +69,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
69 | initramfs-module-install->grub \ | 69 | initramfs-module-install->grub \ |
70 | initramfs-module-install->parted \ | 70 | initramfs-module-install->parted \ |
71 | initramfs-module-install->util-linux \ | 71 | initramfs-module-install->util-linux \ |
72 | initramfs-module-setup-live->udev-extraconf \ | ||
72 | grub-efi->grub-bootconf \ | 73 | grub-efi->grub-bootconf \ |
73 | liberation-fonts->fontconfig \ | 74 | liberation-fonts->fontconfig \ |
74 | cantarell-fonts->fontconfig \ | 75 | cantarell-fonts->fontconfig \ |
@@ -82,8 +83,14 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
82 | weston-init->kbd \ | 83 | weston-init->kbd \ |
83 | connman->xl2tpd \ | 84 | connman->xl2tpd \ |
84 | lttng-tools->lttng-modules \ | 85 | lttng-tools->lttng-modules \ |
86 | sato-icon-theme->gdk-pixbuf \ | ||
87 | sato-icon-theme->gtk+3 \ | ||
85 | adwaita-icon-theme->gdk-pixbuf \ | 88 | adwaita-icon-theme->gdk-pixbuf \ |
86 | adwaita-icon-theme->gtk+3 \ | 89 | adwaita-icon-theme->gtk+3 \ |
90 | run-postinsts->util-linux \ | ||
91 | cantarell-fonts->qemuwrapper-cross \ | ||
92 | liberation-fonts->qemuwrapper-cross \ | ||
93 | ttf-bitstream-vera->qemuwrapper-cross \ | ||
87 | " | 94 | " |
88 | 95 | ||
89 | # Avoid adding bison-native to the sysroot without a specific | 96 | # Avoid adding bison-native to the sysroot without a specific |
@@ -91,6 +98,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
91 | # (e.g. X -> Y -> binutils-cross -> bison-native) no longer meet the | 98 | # (e.g. X -> Y -> binutils-cross -> bison-native) no longer meet the |
92 | # dependency incidentally. This improves determinism and avoids build | 99 | # dependency incidentally. This improves determinism and avoids build |
93 | # failures when people switch to external toolchains. | 100 | # failures when people switch to external toolchains. |
101 | # libarchive only needs e2fsprogs headers at buildtime | ||
94 | SSTATE_EXCLUDEDEPS_SYSROOT += "\ | 102 | SSTATE_EXCLUDEDEPS_SYSROOT += "\ |
95 | .*->autoconf-native \ | 103 | .*->autoconf-native \ |
96 | .*->automake-native \ | 104 | .*->automake-native \ |
@@ -100,6 +108,13 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\ | |||
100 | .*->patch-native \ | 108 | .*->patch-native \ |
101 | .*->pkgconfig-native \ | 109 | .*->pkgconfig-native \ |
102 | .*->quilt-native \ | 110 | .*->quilt-native \ |
111 | ^(?!gtk-doc-native).*->xmlto-native \ | ||
112 | .*->gperf-native \ | ||
113 | .*->help2man-native \ | ||
114 | .*->gtk-doc-native \ | ||
115 | .*->texinfo-native \ | ||
116 | .*->perlcross-native \ | ||
117 | libarchive-native->e2fsprogs-native \ | ||
103 | " | 118 | " |
104 | # Nothing needs to depend on libc-initial | 119 | # Nothing needs to depend on libc-initial |
105 | # base-passwd/shadow-sysroot don't need their dependencies | 120 | # base-passwd/shadow-sysroot don't need their dependencies |
@@ -115,3 +130,8 @@ SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" | |||
115 | # Avoid empty path entries | 130 | # Avoid empty path entries |
116 | BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}" | 131 | BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}" |
117 | PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' != '' else ''}${HOSTTOOLS_DIR}" | 132 | PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' != '' else ''}${HOSTTOOLS_DIR}" |
133 | |||
134 | # Only OE-Core should set/change this | ||
135 | BB_GLOBAL_PYMODULES = "os sys time" | ||
136 | |||
137 | addpylib ${LAYERDIR}/lib oe | ||