From 2adaa8655f131cb0eb23827b4bceb1cefff37de5 Mon Sep 17 00:00:00 2001 From: Buzz Date: Sun, 30 Jul 2017 21:13:13 +1000 Subject: [PATCH] move url references and tags to OpenSolo and master --- meta-3dr/recipes-firmware/artoo/artoo-firmware_1.2.11.bb | 4 ++-- meta-3dr/recipes-firmware/gimbal/gimbal-firmware_1.3.6.bb | 2 +- meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_1.3.1.bb | 2 +- meta-3dr/recipes-sololink/sololink/sololink-python_0.0.3.bb | 3 ++- meta-3dr/recipes-sololink/sololink/sololink.bb | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-3dr/recipes-firmware/artoo/artoo-firmware_1.2.11.bb b/meta-3dr/recipes-firmware/artoo/artoo-firmware_1.2.11.bb index 0487584..aa2dcd5 100644 --- a/meta-3dr/recipes-firmware/artoo/artoo-firmware_1.2.11.bb +++ b/meta-3dr/recipes-firmware/artoo/artoo-firmware_1.2.11.bb @@ -1,6 +1,6 @@ SUMMARY = "Artoo firmware binary" -LICENSE = "CLOSED" +LICENSE = "APACHE2.0" FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" @@ -36,7 +36,7 @@ do_fetch () { # https://help.github.com/articles/creating-an-access-token-for-command-line-use/ TOKEN=$(cat ~/.ssh/github_token) - SRC_URL="https://api.github.com/repos/3drobotics/${REPO_NAME}/releases/tags/${REPO_TAG}" + SRC_URL="https://api.github.com/repos/OpenSolo/${REPO_NAME}/releases/tags/${REPO_TAG}" BIN_URL=$(curl -s -H "Authorization: token ${TOKEN}" -H "Accept: application/json" ${SRC_URL} | jq -r '.assets[] | select(.name | endswith(".${FILE_EXT}")) | .url') diff --git a/meta-3dr/recipes-firmware/gimbal/gimbal-firmware_1.3.6.bb b/meta-3dr/recipes-firmware/gimbal/gimbal-firmware_1.3.6.bb index 4a102e2..77e98ab 100644 --- a/meta-3dr/recipes-firmware/gimbal/gimbal-firmware_1.3.6.bb +++ b/meta-3dr/recipes-firmware/gimbal/gimbal-firmware_1.3.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Axon firmware binary" -LICENSE = "CLOSED" +LICENSE = "APACHE2.0" firmwaredir = "/firmware" FILES_${PN} += "${firmwaredir}/" diff --git a/meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_1.3.1.bb b/meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_1.3.1.bb index ac048a4..ec79168 100644 --- a/meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_1.3.1.bb +++ b/meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_1.3.1.bb @@ -29,7 +29,7 @@ do_fetch () { # https://help.github.com/articles/creating-an-access-token-for-command-line-use/ TOKEN=$(cat ~/.ssh/github_token) - SRC_URL="https://api.github.com/repos/3drobotics/${REPO_NAME}/releases/tags/${REPO_TAG}" + SRC_URL="https://api.github.com/repos/OpenSolo/${REPO_NAME}/releases/tags/${REPO_TAG}" BIN_URL=$(curl -s -H "Authorization: token ${TOKEN}" -H "Accept: application/json" ${SRC_URL} | jq -r '.assets[] | select(.name | endswith(".${FILE_EXT}")) | .url') diff --git a/meta-3dr/recipes-sololink/sololink/sololink-python_0.0.3.bb b/meta-3dr/recipes-sololink/sololink/sololink-python_0.0.3.bb index 094aeb5..d3241ac 100644 --- a/meta-3dr/recipes-sololink/sololink/sololink-python_0.0.3.bb +++ b/meta-3dr/recipes-sololink/sololink/sololink-python_0.0.3.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://requirements.txt;md5=dc90368fff309dbbef652a1fab32f191 PROVIDES += "${PN}_${PV}" -SRCREV = "f89466ccd7addae49cf800fdf5c67ed6bdff47d6" +#SRCREV = "f89466ccd7addae49cf800fdf5c67ed6bdff47d6" +SRCREV = "master" SRC_URI = "git://github.com/OpenSolo/sololink-python/" S = "${WORKDIR}/git" diff --git a/meta-3dr/recipes-sololink/sololink/sololink.bb b/meta-3dr/recipes-sololink/sololink/sololink.bb index 0f19013..d7ff58e 100644 --- a/meta-3dr/recipes-sololink/sololink/sololink.bb +++ b/meta-3dr/recipes-sololink/sololink/sololink.bb @@ -4,7 +4,8 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://README.md;md5=1b7fb31af91cdcda8e83aefb184e69df" # Pull from specific tag by default -SRCREV = "v2.2.4" +#SRCREV = "v2.2.4" +SRCREV = "master" SRC_URI = "git://github.com/OpenSolo/SoloLink/" # Or, AUTOREV means pull HEAD of the branch in the URI