diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2020-06-15 12:01:01 -0500 |
|---|---|---|
| committer | Jeff Hatch <jhatch@multitech.com> | 2020-06-15 12:01:01 -0500 |
| commit | 612ffa7c85d856c9706064e62448a3debe5c3379 (patch) | |
| tree | 7ce893519ee65180783ef3c248bd04c6f3f817c5 /conf | |
| parent | 0a3f99fc26efa34e65d0105ae18888bd750e5ab6 (diff) | |
| parent | a117c7a2ccc99c9903764658fc3640e06ffe4661 (diff) | |
| download | meta-mlinux-612ffa7c85d856c9706064e62448a3debe5c3379.tar.gz meta-mlinux-612ffa7c85d856c9706064e62448a3debe5c3379.tar.bz2 meta-mlinux-612ffa7c85d856c9706064e62448a3debe5c3379.zip | |
Merge branch 'udev-rules-refactoring' to better reflect architecture dependencies in architecture specific layers.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/mlinux.conf | 14 | ||||
| -rw-r--r-- | conf/layer.conf | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index dce4a35..58d999e 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -1,7 +1,9 @@ DISTRO = "mlinux" DISTRO_NAME = "mLinux" -DISTRO_BASE_VERSION = "5.1" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.8" +#DISTRO_BASE_VERSION = "5.0" +DISTRO_BASE_VERSION = "6.0" +#DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev34" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev1" DISTRO_CODENAME = "" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -23,7 +25,7 @@ DISTRO_FEATURES_MLINUX = "argp largefile xattr \ bluetooth irda usbgadget usbhost wifi \ cramfs ext2 smbfs nfs \ libc-crypt pam \ - sysvinit x11" + sysvinit" DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}" # disable pulseaudio @@ -69,7 +71,7 @@ PREFERRED_PROVIDER_jpeg = "jpeg" PREFERRED_PROVIDER_jpeg-native = "jpeg-native" require java.inc -PREFERRED_VERSION_nodejs ?= "0.10.%" -PREFERRED_VERSION_nodejs-native ?= "0.10.%" +PREFERRED_VERSION_nodejs ?= "10.%" +PREFERRED_VERSION_nodejs-native ?= "10.%" -PREFERRED_VERSION_gpsd ?= "3.16" +PREFERRED_VERSION_gpsd ?= "3.18.%" diff --git a/conf/layer.conf b/conf/layer.conf index ce3d432..dfdfd8d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -3,8 +3,8 @@ BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" + ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "mlinux" -BBFILE_PATTERN_mlinux = "^${LAYERDIR}/" -BBFILE_PRIORITY_mlinux = "50" +BBFILE_COLLECTIONS += "meta-mlinux-common" +BBFILE_PATTERN_meta-mlinux-common = "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-mlinux-common = "50" |