diff options
-rw-r--r-- | conf/distro/mlinux.conf | 2 | ||||
-rw-r--r-- | contrib/local.conf | 4 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 | 1 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 | 1 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 | 1 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 | 1 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb (renamed from recipes-connectivity/lora/lora-gateway-sx1303_2.0.4.bb) | 0 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway_5.0.10.bb (renamed from recipes-connectivity/lora/lora-gateway_5.0.6.bb) | 13 | ||||
-rw-r--r-- | recipes-core/sysvinit/files/start_getty_open | 2 | ||||
-rw-r--r-- | recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 2 | ||||
-rw-r--r-- | recipes-support/libpcre/libpcre2_%.bbappend | 11 | ||||
-rw-r--r-- | recipes-support/libpcre/libpcre_%.bbappend | 11 |
12 files changed, 34 insertions, 15 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index fa8364d..3a70afc 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -1,7 +1,7 @@ DISTRO = "mlinux" DISTRO_NAME = "mLinux" DISTRO_BASE_VERSION = "6.0" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev4" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev6" DISTRO_CODENAME = "" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" diff --git a/contrib/local.conf b/contrib/local.conf index b699649..61b8de1 100644 --- a/contrib/local.conf +++ b/contrib/local.conf @@ -69,10 +69,6 @@ IMAGE_FSTYPES =+ "jffs2 tar.gz" PACKAGECONFIG_append_pn-boost = " python" OVERRIDES .= ":${MTBSP}" -# This is populated in the respective kernel recipe -MLINUX_KERNEL_VERSION = "${@oe.utils.read_file('${STAGING_KERNEL_BUILDDIR}/kernel-abiversion')}" -MLINUX_KERNEL_EXTRA_VERSION = "${@oe.utils.read_file('${STAGING_KERNEL_BUILDDIR}/mlinux_pr')}" - # Make builds reproducible BUILD_REPRODUCIBLE_BINARIES = "1" export PYTHONHASHSEED = "0" diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 index 063c931..40dc9a2 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 +++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 @@ -2,6 +2,7 @@ "SX130x_conf": { "com_type": "SPI", "com_path": "/dev/spidev0.0", + "tmp102": 72, "lorawan_public": true, "clksrc": 0, "antenna_gain": 0, /* antenna gain, in dBi */ diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 index 04434bf..3719762 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 +++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 @@ -2,6 +2,7 @@ "SX130x_conf": { "com_type": "SPI", "com_path": "/dev/spidev0.0", + "tmp102": 72, "lorawan_public": true, "clksrc": 0, "antenna_gain": 0, /* antenna gain, in dBi */ diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 index 2f17d34..f1652ca 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 +++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 @@ -2,6 +2,7 @@ "SX130x_conf": { "com_type": "SPI", "com_path": "/dev/spidev1.0", + "tmp102": 72, "lorawan_public": true, "clksrc": 0, "antenna_gain": 0, /* antenna gain, in dBi */ diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 index e89cc16..21e906d 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 +++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 @@ -2,6 +2,7 @@ "SX130x_conf": { "com_type": "SPI", "com_path": "/dev/spidev1.0", + "tmp102": 72, "lorawan_public": true, "clksrc": 0, "antenna_gain": 0, /* antenna gain, in dBi */ diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.4.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb index fb2d708..fb2d708 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.4.bb +++ b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb diff --git a/recipes-connectivity/lora/lora-gateway_5.0.6.bb b/recipes-connectivity/lora/lora-gateway_5.0.10.bb index f16cadf..6be0c47 100644 --- a/recipes-connectivity/lora/lora-gateway_5.0.6.bb +++ b/recipes-connectivity/lora/lora-gateway_5.0.10.bb @@ -6,17 +6,16 @@ SECTION = "console/utils" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" DEPENDS = "gpsd" +RDEPENDS_${PN} = "libgps" -PR = "r23" -SRCREV = "004c03449d498cfa495df4d7834b733f4697a10f" +PR = "r32" +SRCREV = "${PV}" -SRC_URI = "git://git@gitlab.multitech.net/lora_enterprise/lora_gateway_mtac_full.git;protocol=ssh;branch=master \ +SRC_URI = "git://git.multitech.net/lora_gateway_mtac_full;branch=master;protocol=git \ file://library_4.0.cfg \ file://ln-lora-spi-dev.sh \ " -SRC_URI[md5sum] = "9e06a3733a9fea39a3d61f77b412badf" -SRC_URI[sha256sum] = "28fbfe098013908794b32e51d1fed4427f20dd6c8adbbca78df2e1800f5c84dc" S = "${WORKDIR}/git" @@ -28,7 +27,7 @@ do_configure_append() { } do_compile() { - oe_runmake LDFLAGS=${LDFLAGS} + oe_runmake } do_install() { @@ -55,7 +54,6 @@ do_install_append_mtcdt() { install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/ } - PACKAGES += "${PN}-utils ${PN}-utils-dbg" FILES_${PN} = "${libdir}/lora/lora-gw-readme.md" @@ -68,4 +66,3 @@ FILES_${PN}-staticdev = "${libdir}/lora/libloragw.a" do_rm_work() { echo "skipping" } - diff --git a/recipes-core/sysvinit/files/start_getty_open b/recipes-core/sysvinit/files/start_getty_open index 3afce00..3c2f2ef 100644 --- a/recipes-core/sysvinit/files/start_getty_open +++ b/recipes-core/sysvinit/files/start_getty_open @@ -2,5 +2,5 @@ # Open console for testing if [ -c /dev/$2 ] then - /sbin/getty -L $1 $2 xterm -n -l /bin/bash + PS1='bash# ' /sbin/getty -L $1 $2 xterm -n -l /bin/bash fi diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend index 259f2a0..faa155b 100644 --- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend +++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend @@ -7,7 +7,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://start_getty_open \ file://bootlogd \ " -PKGR_${PN}-start-open = "${PR}a" +PKGR_${PN}-start-open = "${PR}b" FILES_${PN} = "${sysconfdir}/inittab ${sysconfdir}/default/bootlogd" FILES_${PN}-start = "${base_bindir}/start_getty" FILES_${PN}-start-open = "${base_bindir}/start_getty_open" diff --git a/recipes-support/libpcre/libpcre2_%.bbappend b/recipes-support/libpcre/libpcre2_%.bbappend new file mode 100644 index 0000000..b7c303b --- /dev/null +++ b/recipes-support/libpcre/libpcre2_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PR = "r1" + +SRC_URI_remove = " \ +https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ +" + +SRC_URI_prepend = " \ + https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2 \ +" diff --git a/recipes-support/libpcre/libpcre_%.bbappend b/recipes-support/libpcre/libpcre_%.bbappend new file mode 100644 index 0000000..f0736eb --- /dev/null +++ b/recipes-support/libpcre/libpcre_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PR = "r1" + +SRC_URI_remove = " \ +https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ +" + +SRC_URI_prepend = " \ + ${SOURCEFORGE_MIRROR}/project/pcre/pcre/${PV}/pcre-${PV}.tar.bz2 \ +" |