From da179dd7d5925b068201cf9c8217f84510dc409f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 22 Sep 2016 11:25:37 -0500
Subject: [PATCH] nodesource: not all distro are supported, so use the correct
one
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
configs/bb.org-debian-jessie-console-v4.1.conf | 1 +
configs/bb.org-debian-jessie-console-v4.4.conf | 1 +
configs/bb.org-debian-jessie-iot-2gb-v4.4.conf | 1 +
configs/bb.org-debian-jessie-iot-v4.1.conf | 1 +
configs/bb.org-debian-jessie-iot-v4.4.conf | 1 +
configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf | 1 +
configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf | 1 +
configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf | 1 +
configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf | 1 +
configs/bb.org-debian-jessie-lxqt-4gb-xm.conf | 1 +
configs/bb.org-debian-jessie-lxqt-4gb.conf | 1 +
configs/bb.org-debian-jessie-tester-2gb-v4.1.conf | 1 +
configs/bb.org-debian-stretch-iot-v4.9.conf | 1 +
configs/seeed-debian-jessie-gcp-iot-v4.4.conf | 1 +
configs/seeed-debian-jessie-iot-v4.1.conf | 1 +
configs/seeed-debian-jessie-iot-v4.4.conf | 1 +
configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf | 1 +
configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf | 1 +
scripts/chroot.sh | 4 ++--
19 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/configs/bb.org-debian-jessie-console-v4.1.conf b/configs/bb.org-debian-jessie-console-v4.1.conf
index c42343c38..b29bb31f9 100644
--- a/configs/bb.org-debian-jessie-console-v4.1.conf
+++ b/configs/bb.org-debian-jessie-console-v4.1.conf
@@ -83,6 +83,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
#include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-console-v4.4.conf b/configs/bb.org-debian-jessie-console-v4.4.conf
index b3f440492..219cd2f73 100644
--- a/configs/bb.org-debian-jessie-console-v4.4.conf
+++ b/configs/bb.org-debian-jessie-console-v4.4.conf
@@ -83,6 +83,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
#include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf b/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf
index 406c2bfc4..9a589b638 100644
--- a/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-iot-2gb-v4.4.conf
@@ -152,6 +152,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-iot-v4.1.conf b/configs/bb.org-debian-jessie-iot-v4.1.conf
index 248ebcf46..99b0d62ea 100644
--- a/configs/bb.org-debian-jessie-iot-v4.1.conf
+++ b/configs/bb.org-debian-jessie-iot-v4.1.conf
@@ -155,6 +155,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-iot-v4.4.conf b/configs/bb.org-debian-jessie-iot-v4.4.conf
index f2767ae3b..91cbe83d6 100644
--- a/configs/bb.org-debian-jessie-iot-v4.4.conf
+++ b/configs/bb.org-debian-jessie-iot-v4.4.conf
@@ -155,6 +155,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
index 5bb4aa777..d282e81cf 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v4.1.conf
@@ -157,6 +157,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
index 8c1863cf9..9e4844036 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
@@ -157,6 +157,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
index a268c7e1e..a7d884ef4 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.1.conf
@@ -198,6 +198,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
index 2497ceb74..d70a0d671 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
@@ -198,6 +198,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-xm.conf b/configs/bb.org-debian-jessie-lxqt-4gb-xm.conf
index cd3a8f3b4..508683896 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-xm.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-xm.conf
@@ -198,6 +198,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.8.0-rc7-armv7-x2"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb.conf b/configs/bb.org-debian-jessie-lxqt-4gb.conf
index c719bcb44..add24b09e 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb.conf
@@ -191,6 +191,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="3.8.13-bone80"
include_firmware="enable"
diff --git a/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf b/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
index 2b2f36833..c66c7afd6 100644
--- a/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
+++ b/configs/bb.org-debian-jessie-tester-2gb-v4.1.conf
@@ -135,6 +135,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
include_firmware="enable"
diff --git a/configs/bb.org-debian-stretch-iot-v4.9.conf b/configs/bb.org-debian-stretch-iot-v4.9.conf
index 6ab05f5d0..210f0e9ae 100644
--- a/configs/bb.org-debian-stretch-iot-v4.9.conf
+++ b/configs/bb.org-debian-stretch-iot-v4.9.conf
@@ -114,6 +114,7 @@ repo_rcnee_pkg_list=" \
#repo_nodesource="node_0.12"
repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.8.0-rc7-bone1"
include_firmware="enable"
diff --git a/configs/seeed-debian-jessie-gcp-iot-v4.4.conf b/configs/seeed-debian-jessie-gcp-iot-v4.4.conf
index 74403410e..ef83757de 100644
--- a/configs/seeed-debian-jessie-gcp-iot-v4.4.conf
+++ b/configs/seeed-debian-jessie-gcp-iot-v4.4.conf
@@ -161,6 +161,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/configs/seeed-debian-jessie-iot-v4.1.conf b/configs/seeed-debian-jessie-iot-v4.1.conf
index fe587d08c..8c6b153ba 100644
--- a/configs/seeed-debian-jessie-iot-v4.1.conf
+++ b/configs/seeed-debian-jessie-iot-v4.1.conf
@@ -160,6 +160,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
include_firmware="enable"
diff --git a/configs/seeed-debian-jessie-iot-v4.4.conf b/configs/seeed-debian-jessie-iot-v4.4.conf
index 5db91a00f..90b34c2bd 100644
--- a/configs/seeed-debian-jessie-iot-v4.4.conf
+++ b/configs/seeed-debian-jessie-iot-v4.4.conf
@@ -160,6 +160,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf b/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf
index cb28a515c..4639abf85 100644
--- a/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf
+++ b/configs/seeed-debian-jessie-lxqt-4gb-v4.1.conf
@@ -196,6 +196,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.1.30-ti-r69"
include_firmware="enable"
diff --git a/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf b/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf
index 646db5d86..8cde1db1f 100644
--- a/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf
+++ b/configs/seeed-debian-jessie-lxqt-4gb-v4.4.conf
@@ -196,6 +196,7 @@ repo_rcnee_pkg_list=" \
repo_nodesource="node_0.12"
#repo_nodesource="node_4.x"
#repo_nodesource="node_6.x"
+repo_nodesource_dist="jessie"
##
repo_rcnee_pkg_version="4.4.21-ti-r46"
include_firmware="enable"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 2fa57ccf1..074147ec3 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -387,8 +387,8 @@ fi
if [ ! "x${repo_nodesource}" = "x" ] ; then
echo "" >> ${wfile}
- echo "deb https://deb.nodesource.com/${repo_nodesource} ${deb_codename} main" >> ${wfile}
- echo "#deb-src https://deb.nodesource.com/${repo_nodesource} ${deb_codename} main" >> ${wfile}
+ echo "deb https://deb.nodesource.com/${repo_nodesource} ${repo_nodesource_dist} main" >> ${wfile}
+ echo "#deb-src https://deb.nodesource.com/${repo_nodesource} ${repo_nodesource_dist} main" >> ${wfile}
echo "" >> ${wfile}
sudo cp -v "${OIB_DIR}/target/keyring/nodesource.gpg.key" "${tempdir}/tmp/nodesource.gpg.key"
fi
--
GitLab