Update BSP layer to fix codeaurora discontinuation

To be fully reproducible we want to use the hashes of the recipes.

id:376256

.gitignore

@@ -0,0 +1 @@
+build*

.gitmodules

@@ -12,27 +12,23 @@
 	branch = dunfell
 [submodule "meta-updater"]
 	path = meta-updater
-	url = https://github.com/advancedtelematic/meta-updater.git
+	url = https://github.com/uptane/meta-updater.git
 	branch = dunfell
-[submodule "meta-telephony"]
-	path = meta-telephony
-	url = gitea@git.netmodule.intranet:yoctoproject/meta-telephony.git
-	branch = 201705
 [submodule "meta-netmodule-private"]
 	path = meta-netmodule-private
-	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-private.git
+	url = git@gitlab.netmodule.intranet:oem-linux/meta-layers/meta-netmodule-private.git
 	branch = develop
 [submodule "meta-netmodule-bsp"]
 	path = meta-netmodule-bsp
-	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-bsp.git
+	url = git@gitlab.netmodule.intranet:oem-linux/meta-layers/meta-netmodule-bsp.git
 	branch = develop
 [submodule "meta-netmodule-distro"]
 	path = meta-netmodule-distro
-	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-distro.git
+	url = git@gitlab.netmodule.intranet:oem-linux/meta-layers/meta-netmodule-distro.git
 	branch = develop
 [submodule "meta-netmodule-fct"]
 	path = meta-netmodule-fct
-	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-fct.git
+	url = git@gitlab.netmodule.intranet:oem-linux/meta-layers/meta-netmodule-fct.git
 	branch = develop
 [submodule "meta-freescale"]
 	path = meta-freescale
@@ -42,13 +38,13 @@
 	path = sla-mirror
 	url = gitea@git.netmodule.intranet:yoctoproject/sla-mirror.git
 	branch = master
-[submodule "meta-ublox-module"]
+[submodule "meta-ublox-modules"]
-	path = meta-ublox-module
+	path = meta-ublox-modules
-	url = gitea@git.netmodule.intranet:yoctoproject/meta-ublox-module.git
+	url = git@gitlab.netmodule.intranet:oem-linux/meta-layers/meta-ublox-modules.git
-	branch = master
+	branch = main
 [submodule "meta-netmodule-om"]
 	path = meta-netmodule-om
-	url = gitea@git.netmodule.intranet:hancock/meta-openmatics.git
+	url = git@gitlab.netmodule.intranet:oem-linux/meta-layers/meta-openmatics.git
 	branch = develop
 [submodule "meta-netmodule-wlan"]
 	path = meta-netmodule-wlan

autorev-packages.inc

@@ -1,54 +0,0 @@
-#./meta-netmodule-bsp/recipes-kernel/ssc-sysstate-driver/ssc-sysstate-driver_git.bb
-SRCREV_ssc-sysstate-driver = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-kernel/ssc-broker-driver/ssc-broker-driver_git.bb
-SRCREV_ssc-broker-driver = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-kernel/ssc-extmod-driver/ssc-extmod-driver_git.bb
-SRCREV_ssc-extmod-driver = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-kernel/dt-overlay/dt-overlay_1.0.bb
-SRCREV_dt-overlay = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-kernel/linux/linux-netmodule_git.bb
-SRCREV_linux-netmodule = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-connectivity/nmubxlib/nmubxlib.bb
-SRCREV_nmubxlib = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-connectivity/gnss-mgr/gnss-mgr.bb
-SRCREV_gnss-mgr = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-connectivity/wwan-config/wwan-config.bb
-SRCREV_wwan-config = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-connectivity/modemmanager/modemmanager_git.bb
-SRCREV_modemmanager = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-bsp/bootloader-config/bootloader-config.bb
-SRCREV_bootloader-config = "${AUTOREV}"
-#./meta-netmodule-bsp/freescale/recipes-imx/imx-atf/imx-atf_1.5.0.bb
-SRCREV_imx-atf = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
-SRCREV_u-boot-imx8-nmhw23 = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-armada_git.bb
-SRCREV_u-boot-armada = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-ti33x_git.bb
-SRCREV_u-boot-ti33x = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-core/udev/udev-rules-nmhw_git.bb
-SRCREV_udev-rules-nmhw = "${AUTOREV}"
-#./meta-netmodule-distro/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb
-SRCREV_nmhw-fwupdate = "${AUTOREV}"
-#./meta-netmodule-distro/recipes-tools/libnmapp/libnmapp_git.bb
-SRCREV_libnmapp = "${AUTOREV}"
-#./meta-netmodule-distro/recipes-tools/ssf-mgr/ssf-mgr_git.bb
-SRCREV_ssf-mgr = "${AUTOREV}"
-#./meta-netmodule-distro/recipes-tools/sys-mon/sys-mon_git.bb
-SRCREV_sys-mon = "${AUTOREV}"
-#./meta-netmodule-bsp/recipes-bsp/storage-info/storage-info.bb
-SRCREV_storage-info = "${AUTOREV}"
-#./meta-netmodule-distro/recipes-tools/battery-test/battery-test_git.bb
-SRCREV_battery-test = "${AUTOREV}"
-#./meta-netmodule-fct/recipes-testing/fct/fct.bb
-SRCREV_fct = "${AUTOREV}"
-#./meta-netmodule-fct/recipes-testing/provisioning/provisioning.bb
-SRCREV_provisioning = "${AUTOREV}"
-#./meta-netmodule-fct/recipes-testing/badassbd/badassbd.bb
-SRCREV_badassbd = "${AUTOREV}"
-#./meta-netmodule-fct/recipes-connectivity/toast/toast.bb
-SRCREV_toast = "${AUTOREV}"
-#./meta-netmodule-om/recipes-navigation/gpsd/gpsd_om-3.20.bb
-SRCREV_gpsd_om = "${AUTOREV}"
-#./meta-netmodule-private/recipes-extended/hydra/hydra_1.0.0.bb
-SRCREV_hydra = "${AUTOREV}"

bitbake

@@ -1 +1 @@
-Subproject commit 0784db7dd0fef6f0621ad8d74372f44e87fef950
+Subproject commit 048d682b031644fb9f0d41a489bacb873aa27bd7

build-fct/conf/bblayers.conf

@@ -19,7 +19,7 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-openembedded/meta-filesystems \
   ${YOCTOROOT}/meta-updater \
   ${YOCTOROOT}/meta-freescale \
-  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-ublox-modules \
   ${YOCTOROOT}/meta-netmodule-om \
   ${YOCTOROOT}/meta-netmodule-fct \
   "

build-fct/conf/local.conf

@@ -1,48 +0,0 @@
-BB_NUMBER_THREADS ?= "8"
-PARALLEL_MAKE ?= "-j 8"
-PACKAGE_CLASSES ?= "package_rpm"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K"
-ASSUME_PROVIDED += "libsdl-native"
-CONF_VERSION = "1"
-EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
-
-ERROR_QA_remove += "version-going-backwards"
-#WARN_QA_append += "version-going-backwards"
-#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
-
-#PRSERV_HOST = "localhost:0"
-
-SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
-DL_DIR="${YOCTOROOT}/build-common/downloads"
-
-BUILDHISTORY_COMMIT = "1"
-BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <alexandre.bard@netmodule.com>"
-
-# Add licences file to the rootfs
-COPY_LIC_MANIFEST = "1"
-COPY_LIC_DIRS = "1"
-LICENSE_CREATE_PACKAGE = "1"
-
-INHERIT += "buildhistory buildstats-summary"
-
-# enable upstream check to use head of branch:
-UPSTREAM_CHECK_COMMITS = "1"
-
-YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
-
-PREMIRRORS_prepend = "\
-   git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
-   ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
-   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
-   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
-
-include ../../autorev-packages.inc
-include distro_version.inc

build-fct/conf/local.conf

@@ -0,0 +1 @@
+../../build/conf/local.conf

build-minimal/conf/bblayers.conf

@@ -19,6 +19,6 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-openembedded/meta-filesystems \
   ${YOCTOROOT}/meta-updater \
   ${YOCTOROOT}/meta-freescale \
-  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-ublox-modules \
   ${YOCTOROOT}/meta-netmodule-om \
   "

build-minimal/conf/local.conf

@@ -1,48 +0,0 @@
-BB_NUMBER_THREADS ?= "8"
-PARALLEL_MAKE ?= "-j 8"
-PACKAGE_CLASSES ?= "package_rpm"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K"
-ASSUME_PROVIDED += "libsdl-native"
-CONF_VERSION = "1"
-EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
-
-ERROR_QA_remove += "version-going-backwards"
-#WARN_QA_append += "version-going-backwards"
-#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
-
-#PRSERV_HOST = "localhost:0"
-
-SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
-DL_DIR="${YOCTOROOT}/build-common/downloads"
-
-BUILDHISTORY_COMMIT = "1"
-BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <alexandre.bard@netmodule.com>"
-
-# Add licences file to the rootfs
-COPY_LIC_MANIFEST = "1"
-COPY_LIC_DIRS = "1"
-LICENSE_CREATE_PACKAGE = "1"
-
-INHERIT += "buildhistory buildstats-summary"
-
-# enable upstream check to use head of branch:
-UPSTREAM_CHECK_COMMITS = "1"
-
-YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
-
-PREMIRRORS_prepend = "\
-   git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
-   ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
-   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
-   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
-
-include ../../autorev-packages.inc
-include distro_version.inc

build-minimal/conf/local.conf

@@ -0,0 +1 @@
+../../build/conf/local.conf

build-minimal/conf/templateconf.cfg

@@ -1 +1 @@
-meta/conf
+../meta-netmodule-distro/conf

build/conf/bblayers.conf

@@ -19,6 +19,7 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-openembedded/meta-filesystems \
   ${YOCTOROOT}/meta-updater \
   ${YOCTOROOT}/meta-freescale \
-  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-ublox-modules \
   ${YOCTOROOT}/meta-netmodule-om \
+  ${YOCTOROOT}/meta-netmodule-redtesting \
   "

build/conf/local.conf

@@ -1,5 +1,3 @@
-BB_NUMBER_THREADS ?= "8"
-PARALLEL_MAKE ?= "-j 8"
 PACKAGE_CLASSES ?= "package_rpm"
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
@@ -21,6 +19,7 @@ ERROR_QA_remove += "version-going-backwards"
 #PRSERV_HOST = "localhost:0"
 
 SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+SSTATE_MIRRORS = "file://.* http://nmrepo.netmodule.intranet/oem-linux-sstate/PATH"
 DL_DIR="${YOCTOROOT}/build-common/downloads"
 
 BUILDHISTORY_COMMIT = "1"
@@ -44,6 +43,6 @@ PREMIRRORS_prepend = "\
    http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
    https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
 
+require ../../internal-mirrors.inc
 include ../../autorev-packages.inc
 include distro_version.inc
-

env/distro/redtesting-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-ostree-redtesting"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw26-vcupro

@@ -0,0 +1,3 @@
+MACHINE=am335x-hw26-vcupro
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

internal-mirrors.inc

@@ -0,0 +1,17 @@
+# Changing public SRC_URI to internal
+
+## Bootloaders
+SRC_URI_pn-u-boot-ti33x = "git://git.netmodule.intranet/nmrouter/u-boot;user=gitea;branch=2016.05-am335x-netmodule;protocol=ssh;"
+SRC_URI_pn-u-boot-armada = "git://git.netmodule.intranet/nmrouter/u-boot;user=gitea;branch=2017.11-armada-nrhw;protocol=ssh;"
+SRC_URI_pn-u-boot-imx8-nmhw23 = "git://git.netmodule.intranet/nmrouter/u-boot;user=gitea;branch=2018.03/imx/imx8-nmhw23;protocol=ssh;"
+
+## Kernel
+SRC_URI_pn-linux-netmodule = "git://gitlab.netmodule.intranet/oem-linux/linux-netmodule.git;user=git;branch=5.10/standard/base;protocol=ssh"
+
+SRC_URI_pn-linux-netmodule_imx8-nmhw23 = "git://gitlab.netmodule.intranet/oem-linux/linux-netmodule.git;user=git;branch=4.14/nxp/nmhw23;protocol=ssh"
+
+# tools
+SRC_URI_pn-sys-mon = "git://gitlab.netmodule.intranet/oem-linux/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-sys-mon-native = "git://gitlab.netmodule.intranet/oem-linux/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+SRC_URI_pn-nativesdk-sys-mon = "git://gitlab.netmodule.intranet/oem-linux/tools/sys-mon.git;user=git;branch=develop;protocol=ssh"
+

meta-freescale

@@ -1 +1 @@
-Subproject commit 3dbca0ef2ae1ea3862e540c59ad77adbcb419d57
+Subproject commit c4347b507c2ba0d7eb3917303f83631244bf5048

meta-netmodule-bsp

@@ -1 +1 @@
-Subproject commit 901c12f911e4fa4ae351ca6da07e4b4dacd1d6f1
+Subproject commit a2226ab942a74421ce2393560be67d83e9c4d8db

meta-netmodule-distro

@@ -1 +1 @@
-Subproject commit 30d95eb8c877bb655cfd11a5dd1f7ba0a533e2b7
+Subproject commit 1be3029e383d5ae940327fe8e4600a804fdb9f9b

meta-netmodule-fct

@@ -1 +1 @@
-Subproject commit 7538f89cfdd7624df5c2a7ba9d3ceb01d8536671
+Subproject commit da8b11e49e5a6e55adedc2a4ae93aa9fe7f0ed75

meta-netmodule-private

@@ -1 +1 @@
-Subproject commit 8a842de32d43fd61c3e99f16d01a81918ed3c5d0
+Subproject commit edfedfbd2574af75569f5ac9d2045fa9c8cc3420

meta-netmodule-redtesting/conf/distro/netmodule-linux-ostree-redtesting.conf

@@ -0,0 +1,8 @@
+require conf/distro/netmodule-linux-ostree.conf
+DISTRO = "netmodule-linux-ostree-redtesting"
+DISTRO_VARIANT = " for red-testing"
+
+PACKAGECONFIG_append_pn-networkmanager-conf = " unmanaged-devices"
+
+IMAGE_INSTALL_append = " ti-calibrator-wl18xx"
+PACKAGECONFIG_pn-ti-calibrator-wl18xx = "libnl"

meta-netmodule-redtesting/conf/layer.conf

@@ -0,0 +1,12 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+#
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_netmodule-redtesting = "1"
+
+LAYERDEPENDS_netmodule-redtesting = "netmodule-distro"
+
+LAYERSERIES_COMPAT_netmodule-redtesting = "dunfell"

meta-netmodule-wlan

@@ -1 +1 @@
-Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696
+Subproject commit 471d605f9e4173a37a41e83c21f07c114e216085

meta-openembedded

@@ -1 +1 @@
-Subproject commit 8ff12bfffcf0840d5518788a53d88d708ad3aae0
+Subproject commit f22bf6efaae61a8fd9272be64e7d75223c58922e

meta-telephony

@@ -1 +0,0 @@
-Subproject commit 581a3363bcfaad507a8f4b127ff18c687ad5388d

meta-updater

@@ -1 +1 @@
-Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d
+Subproject commit 8e02177c2d9fa416f3117c5da1c0dfba7709dfbf

openembedded-core

@@ -1 +1 @@
-Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb
+Subproject commit 345193f36d08cfe4899c65e8edf3f79db09c50d2