From e8828868a5aa967bd29e605c1dbdbcef11981f5e Mon Sep 17 00:00:00 2001 From: Ramon Moesching Date: Wed, 11 Nov 2020 14:36:04 +0100 Subject: [PATCH 1/2] meta-netmodule-wlan: introduce new meta layer for wifi system Common wlan layer for router and oem software BugzID: 67888 Signed-off-by: Ramon Moesching --- .gitmodules | 3 +++ build/conf/bblayers.conf | 1 + meta-netmodule-wlan | 1 + 3 files changed, 5 insertions(+) create mode 160000 meta-netmodule-wlan diff --git a/.gitmodules b/.gitmodules index cca7d5c..53c7827 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,3 +50,6 @@ path = meta-netmodule-om url = gitea@git.netmodule.intranet:hancock/meta-openmatics.git branch = warrior +[submodule "meta-netmodule-wlan"] + path = meta-netmodule-wlan + url = gitea@git.netmodule.intranet:nrsw-oe/meta-netmodule-wlan.git diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index b1023d3..97bdfaf 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -9,6 +9,7 @@ YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}" BBLAYERS ?= " \ ${YOCTOROOT}/openembedded-core/meta \ + ${YOCTOROOT}/meta-netmodule-wlan \ ${YOCTOROOT}/meta-netmodule-bsp \ ${YOCTOROOT}/meta-netmodule-distro \ ${YOCTOROOT}/meta-netmodule-private \ diff --git a/meta-netmodule-wlan b/meta-netmodule-wlan new file mode 160000 index 0000000..6e6cbfa --- /dev/null +++ b/meta-netmodule-wlan @@ -0,0 +1 @@ +Subproject commit 6e6cbfa97d68fe03e24509cd46693b47a713a746 From 80ec9abe37931c7ef97938507370c665b93803dd Mon Sep 17 00:00:00 2001 From: Marc Mattmueller Date: Wed, 11 Nov 2020 15:33:06 +0100 Subject: [PATCH 2/2] jenkins: initialized submodules before building Signed-off-by: Marc Mattmueller --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 54726e0..9db4f1c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,6 +98,7 @@ def isRelease(versionParam) { } def handle_submodules(versionParam) { + sh 'git submodule init' if(isRelease(versionParam)) { sh 'git submodule update' // set all submodules to freezed commit }