Skip to content

Commit 1de2ad4

Browse files
authored
Merge pull request #113 from mdrodrigo/master
Add compatibility with Wrynose Yocto Project release
2 parents a321ea9 + 86cc36b commit 1de2ad4

2 files changed

Lines changed: 1 addition & 15 deletions

File tree

conf/distro/include/oel.inc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,6 @@ UBI_VOLNAME ?= "rootfs"
165165
# space will be needed and fails badly as the fs size grows.
166166
IMAGE_ROOTFS_EXTRA_SPACE = "40960"
167167

168-
# Sane default locales for images
169-
GLIBC_GENERATE_LOCALES ?= "en_US en_US.UTF-8"
170-
IMAGE_LINGUAS ?= "en-us"
171-
172168
# Include nss-myhostname for sysvinit, so the hostname resolves. systemd
173169
# includes myhostname itself.
174170
DISTRO_EXTRA_RRECOMMENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'nss-myhostname', d)}"
@@ -202,16 +198,6 @@ SSTATE_MIRROR_SITES:prepend = "${LAYER_SSTATE_MIRRORS} "
202198
# Ensure that we implement shared state reuse handling for non-target recipes
203199
require conf/distro/include/sstate.inc
204200

205-
# Disable static libs by default
206-
require conf/distro/include/no-static-libs.inc
207-
208-
# Enable uninative
209-
require conf/distro/include/yocto-uninative.inc
210-
INHERIT += "uninative"
211-
212-
# Enable security flags
213-
require conf/distro/include/security_flags.inc
214-
215201
DISTROOVERRIDES = "oel"
216202

217203
# This function changes the default tune for machines which are based on armv7a

conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_ossystems-base = "8"
1111

1212
addpylib ${LAYERDIR}/lib ossystems
1313

14-
LAYERSERIES_COMPAT_ossystems-base = "styhead walnascar whinlatter"
14+
LAYERSERIES_COMPAT_ossystems-base = "wrynose"
1515

1616
LICENSE_PATH += "${LAYERDIR}/conf/licenses"
1717

0 commit comments

Comments
 (0)