diff --git a/.gitmodules b/.gitmodules index ca30a70..3eb4044 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,7 @@ path = coreos url = ssh://git@bitbucket.gad.local:7999/ico/coreos.git branch = master +[submodule "layers/meta-netmodule-wlan"] + path = layers/meta-netmodule-wlan + url = gitea@git.netmodule.intranet:nrsw-oe/meta-netmodule-wlan.git + branch = kirkstone diff --git a/layers/meta-netmodule-wlan b/layers/meta-netmodule-wlan new file mode 160000 index 0000000..e14df2a --- /dev/null +++ b/layers/meta-netmodule-wlan @@ -0,0 +1 @@ +Subproject commit e14df2a2ec15acca43b3bd14f2b9df75c7933904 diff --git a/layers/meta-nwl-distro/conf/distro/nwl.conf b/layers/meta-nwl-distro/conf/distro/nwl.conf index bcc5864..cde3ff8 100644 --- a/layers/meta-nwl-distro/conf/distro/nwl.conf +++ b/layers/meta-nwl-distro/conf/distro/nwl.conf @@ -41,3 +41,8 @@ PACKAGECONFIG:pn-bluez5 = "systemd udev" # Wit busybox "less" the output of "nmcli c" does not show up properly RDEPENDS:networkmanager-nmcli += "less" + + +# Dependency to meta-netmodule-wlan +# Reduce priority as we want only what we explicitly take from this layer +BBFILE_PRIORITY_netmodule-wlan = "1" diff --git a/layers/meta-nwl-distro/conf/layer.conf b/layers/meta-nwl-distro/conf/layer.conf index 053b351..0308672 100644 --- a/layers/meta-nwl-distro/conf/layer.conf +++ b/layers/meta-nwl-distro/conf/layer.conf @@ -9,7 +9,8 @@ BBFILE_COLLECTIONS += "meta-nwl-distro" BBFILE_PATTERN_meta-nwl-distro = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-nwl-distro = "6" -LAYERDEPENDS_meta-nwl-distro = "core" +LAYERDEPENDS_meta-nwl-distro = "core netmodule-wlan" + LAYERSERIES_COMPAT_meta-nwl-distro = "kirkstone" # Set a variable to get to the top of the metadata location diff --git a/templates/bblayers.conf.sample b/templates/bblayers.conf.sample index 257d715..cad2294 100644 --- a/templates/bblayers.conf.sample +++ b/templates/bblayers.conf.sample @@ -20,5 +20,6 @@ BBLAYERS ?= " \ ##COREOS_EXTLAYERSDIR##/meta-swupdate \ ##NWL_LAYERSDIR##/meta-nwl-distro \ ##NWL_LAYERSDIR##/meta-netmodule-legacy-bsp \ + ##NWL_LAYERSDIR##/meta-netmodule-wlan \ "