diff options
author | Serhii Kostiuk <serhii.o.kostiuk@globallogic.com> | 2022-03-24 23:23:21 +0200 |
---|---|---|
committer | Serhii Kostiuk <serhii.o.kostiuk@globallogic.com> | 2022-03-24 23:23:21 +0200 |
commit | f3609e715f82130f500cbfe061f1abda8d2fb679 (patch) | |
tree | 22f6f4213bdbc8f8509f29626ef1fa7fc5eaf2d6 | |
parent | 0b41b06b77ae3376b2cab1d5af3e566f126be264 (diff) | |
parent | dbade41e2061570e4482ef925c7ac6d2171b9664 (diff) | |
download | meta-mlinux-f3609e715f82130f500cbfe061f1abda8d2fb679.tar.gz meta-mlinux-f3609e715f82130f500cbfe061f1abda8d2fb679.tar.bz2 meta-mlinux-f3609e715f82130f500cbfe061f1abda8d2fb679.zip |
Merge remote-tracking branch 'origin/6' into mpower-dev-nxp
-rw-r--r-- | conf/distro/mlinux.conf | 2 | ||||
-rw-r--r-- | recipes-connectivity/bluez/python-gatt-server_1.0.bb | 2 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb | 2 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-gateway-sx1303_2.0.9.bb (renamed from recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb) | 2 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb | 2 | ||||
-rw-r--r-- | recipes-support/jsoncpp/jsoncpp16_1.6.0.bb | 4 | ||||
-rw-r--r-- | recipes-support/pam-script/pam-script_1.1.9.bb | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index 83a367d..a89f731 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}.0dev7" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0" DISTRO_CODENAME = "" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" diff --git a/recipes-connectivity/bluez/python-gatt-server_1.0.bb b/recipes-connectivity/bluez/python-gatt-server_1.0.bb index 76069f6..d68d9af 100644 --- a/recipes-connectivity/bluez/python-gatt-server_1.0.bb +++ b/recipes-connectivity/bluez/python-gatt-server_1.0.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/git" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c53d04442d1a229d62549856b7ec456a" -SRC_URI = "git://github.com/Jumperr-labs/python-gatt-server.git;protocol=git" +SRC_URI = "git://github.com/Jumperr-labs/python-gatt-server.git;protocol=https" RDEPENDS_${PN} += "python-dbus python-pygobject" diff --git a/recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb b/recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb index 977805b..7568330 100644 --- a/recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb +++ b/recipes-connectivity/lora/lora-basic-station_2.0.5-3.bb @@ -11,7 +11,7 @@ PR = "r3" SRCREV = "${PV}" -SRC_URI = "git://github.com/MultiTechSystems/basicstation.git;protocol=git;branch=master \ +SRC_URI = "git://github.com/MultiTechSystems/basicstation.git;protocol=https;branch=master \ file://setup.gmk \ file://lora-basic-station.init \ file://lora-basic-station.default \ diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.9.bb index fb2d708..0f0fb24 100644 --- a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.7.bb +++ b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.9.bb @@ -12,7 +12,7 @@ PR = "r0" # SRCREV = "100104ee350a0e469b348ac383486d311caaf5e5" SRCREV = "V${PV}" -SRC_URI = "git://github.com/MultiTechSystems/sx1302_hal.git;protocol=git;branch=master \ +SRC_URI = "git://github.com/MultiTechSystems/sx1302_hal.git;protocol=https;branch=master \ file://global_conf.json.MTAC_003_0_0.EU868 \ file://global_conf.json.MTAC_003_0_0.US915 \ file://global_conf.json.MTCAP3.EU868 \ diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb index 5131a34..771d2ce 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb @@ -13,7 +13,7 @@ EXTRA_OEMAKE = " -e" # tag v1.4.1 SRCREV = "0011a60759a7d81656a5393e97089daab1ff1a81" -SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \ +SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=https \ file://lora-packet-forwarder-add-no-header-option.patch \ file://lora-packet-forwarder-set-spi-path.patch \ file://lora-packet-forwarder-fixb64.patch \ diff --git a/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb b/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb index 4a0d538..ffe8407 100644 --- a/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb +++ b/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb @@ -8,7 +8,7 @@ DEPENDS = "" #tag 1.6.0 SRCREV="cbe7e7c9cbd39d864588c5cf2436690634562d3f" -SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=git \ +SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=https \ file://0001-Install-headers-to-jsoncpp-json.patch \ " @@ -20,4 +20,4 @@ inherit cmake EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" -BBCLASSEXTEND = "native"
\ No newline at end of file +BBCLASSEXTEND = "native" diff --git a/recipes-support/pam-script/pam-script_1.1.9.bb b/recipes-support/pam-script/pam-script_1.1.9.bb index 3b9347c..5b38cb6 100644 --- a/recipes-support/pam-script/pam-script_1.1.9.bb +++ b/recipes-support/pam-script/pam-script_1.1.9.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" inherit autotools-brokensep pkgconfig RDEPENDS_${PN} = "libpam-runtime perl" -SRC_URI = "git://github.com/jeroennijhof/pam_script.git;protocol=git" +SRC_URI = "git://github.com/jeroennijhof/pam_script.git;protocol=https" SRCREV = "${PV}" S = "${WORKDIR}/git" PR="r2" |