summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2020-11-11 18:48:27 -0600
committerJohn Klug <john.klug@multitech.com>2020-11-11 18:48:27 -0600
commitb00be59bbc49535097c450b6b8c5fc10c1efd6dd (patch)
tree25cf0e14f66c5fca1cfe41b31bf862d60a36cf12 /conf
parentdb088915be6dca3f09dedbcdaa7264d9271b1c74 (diff)
downloadmeta-mlinux-b00be59bbc49535097c450b6b8c5fc10c1efd6dd.tar.gz
meta-mlinux-b00be59bbc49535097c450b6b8c5fc10c1efd6dd.tar.bz2
meta-mlinux-b00be59bbc49535097c450b6b8c5fc10c1efd6dd.zip
Merge multiarch project to: added missing index file 2020 June 11GitosisMultiarch
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/mlinux.conf4
-rw-r--r--conf/layer.conf8
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 946ea46..c903762 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
DISTRO = "mlinux"
DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "5.2"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.7"
+DISTRO_BASE_VERSION = "6.0"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.dev6"
DISTRO_CODENAME = ""
SDK_VENDOR = "-mlinux"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
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"