Compare commits

..

No commits in common. "1.6.1" and "main" have entirely different histories.
1.6.1 ... main

20 changed files with 177 additions and 74 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
build*

20
.gitmodules vendored
View File

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

View File

@ -1,30 +1,54 @@
SRCREV_pn-ssc-sysstate-driver = "${AUTOREV}" #./meta-netmodule-bsp/recipes-kernel/ssc-sysstate-driver/ssc-sysstate-driver_git.bb
SRCREV_pn-ssc-broker-driver = "${AUTOREV}" SRCREV_ssc-sysstate-driver = "${AUTOREV}"
SRCREV_pn-ssc-extmod-driver = "${AUTOREV}" #./meta-netmodule-bsp/recipes-kernel/ssc-broker-driver/ssc-broker-driver_git.bb
SRCREV_pn-linux-netmodule = "${AUTOREV}" SRCREV_ssc-broker-driver = "${AUTOREV}"
SRCREV_pn-nmubxlib = "${AUTOREV}" #./meta-netmodule-bsp/recipes-kernel/ssc-extmod-driver/ssc-extmod-driver_git.bb
SRCREV_pn-gnss-mgr = "${AUTOREV}" SRCREV_ssc-extmod-driver = "${AUTOREV}"
SRCREV_pn-wwan-config = "${AUTOREV}" #./meta-netmodule-bsp/recipes-kernel/dt-overlay/dt-overlay_1.0.bb
SRCREV_pn-modemmanager = "${AUTOREV}" SRCREV_dt-overlay = "${AUTOREV}"
SRCREV_pn-bootloader-config = "${AUTOREV}" #./meta-netmodule-bsp/recipes-kernel/linux/linux-netmodule_git.bb
SRCREV_pn-udev-rules-nmhw = "${AUTOREV}" SRCREV_linux-netmodule = "${AUTOREV}"
SRCREV_pn-nmhw-fwupdate = "${AUTOREV}" #./meta-netmodule-bsp/recipes-connectivity/nmubxlib/nmubxlib.bb
SRCREV_pn-libnmapp = "${AUTOREV}" SRCREV_nmubxlib = "${AUTOREV}"
SRCREV_pn-ssf-mgr = "${AUTOREV}" #./meta-netmodule-bsp/recipes-connectivity/gnss-mgr/gnss-mgr.bb
SRCREV_pn-sys-mon = "${AUTOREV}" SRCREV_gnss-mgr = "${AUTOREV}"
SRCREV_pn-storage-info = "${AUTOREV}" #./meta-netmodule-bsp/recipes-connectivity/wwan-config/wwan-config.bb
SRCREV_pn-battery-test = "${AUTOREV}" SRCREV_wwan-config = "${AUTOREV}"
SRCREV_pn-hydra = "${AUTOREV}" #./meta-netmodule-bsp/recipes-connectivity/modemmanager/modemmanager_git.bb
# imx8 machines only: SRCREV_modemmanager = "${AUTOREV}"
SRCREV_pn-imx-atf = "${AUTOREV}" #./meta-netmodule-bsp/recipes-bsp/bootloader-config/bootloader-config.bb
SRCREV_pn-u-boot-imx8-nmhw23 = "${AUTOREV}" SRCREV_bootloader-config = "${AUTOREV}"
# aramada machines only: #./meta-netmodule-bsp/freescale/recipes-imx/imx-atf/imx-atf_1.5.0.bb
SRCREV_pn-u-boot-armada = "${AUTOREV}" SRCREV_imx-atf = "${AUTOREV}"
# ti33x machines only: #./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
SRCREV_pn-u-boot-ti33x = "${AUTOREV}" SRCREV_u-boot-imx8-nmhw23 = "${AUTOREV}"
# lava image only: #./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-armada_git.bb
SRCREV_pn-fct = "${AUTOREV}" SRCREV_u-boot-armada = "${AUTOREV}"
SRCREV_pn-fct-lava = "${AUTOREV}" #./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-ti33x_git.bb
SRCREV_pn-provisioning = "${AUTOREV}" SRCREV_u-boot-ti33x = "${AUTOREV}"
SRCREV_pn-badassbd = "${AUTOREV}" #./meta-netmodule-bsp/recipes-core/udev/udev-rules-nmhw_git.bb
SRCREV_pn-toast = "${AUTOREV}" 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}"

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

View File

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

48
build-fct/conf/local.conf Normal file
View File

@ -0,0 +1,48 @@
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

View File

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

View File

@ -0,0 +1,48 @@
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

View File

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

View File

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

View File

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

View File

@ -1,17 +0,0 @@
# 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"

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

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

@ -1 +1 @@
Subproject commit 504e367a0c729b672a97a0e6dea100b822b82400 Subproject commit 30d95eb8c877bb655cfd11a5dd1f7ba0a533e2b7

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

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

@ -1 +1 @@
Subproject commit 303cf4aa33d80b5185017046f5259e01439a043c Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696

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

1
meta-telephony Submodule

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

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

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