jessie: target: just clone both, dtb-4.1-ti/dtb-4.4-ti, instead of gr…

…eping around repo_rcnee_pkg_version Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
RobertCNelson · May 24, 2016 · 6ed6b03 · 6ed6b03
1 parent 62483b9
commit 6ed6b03
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 40 deletions.
diff --git a/target/chroot/beagleboard.org-console-jessie.sh b/target/chroot/beagleboard.org-console-jessie.sh
@@ -277,17 +277,12 @@ install_git_repos () {
 		fi
 	fi
 
-	is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1. || true)
-	if [ ! "x${is_kernel}" = "x" ] ; then
-		git_branch="4.1-ti"
-	else
-		is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.4. || true)
-		if [ ! "x${is_kernel}" = "x" ] ; then
-			git_branch="4.4-ti"
-		fi
-	fi
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-${git_branch}"
+	git_target_dir="/opt/source/dtb-4.1-ti"
+	git_clone_branch
+
+	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
+	git_target_dir="/opt/source/dtb-4.4-ti"
 	git_clone_branch
 
 	git_repo="https://github.com/beagleboard/bb.org-overlays"

diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh
@@ -277,17 +277,12 @@ install_git_repos () {
 		fi
 	fi
 
-	is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1. || true)
-	if [ ! "x${is_kernel}" = "x" ] ; then
-		git_branch="4.1-ti"
-	else
-		is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.4. || true)
-		if [ ! "x${is_kernel}" = "x" ] ; then
-			git_branch="4.4-ti"
-		fi
-	fi
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-${git_branch}"
+	git_target_dir="/opt/source/dtb-4.1-ti"
+	git_clone_branch
+
+	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
+	git_target_dir="/opt/source/dtb-4.4-ti"
 	git_clone_branch
 
 	git_repo="https://github.com/beagleboard/bb.org-overlays"

diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh
@@ -278,17 +278,12 @@ install_git_repos () {
 		fi
 	fi
 
-	is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1. || true)
-	if [ ! "x${is_kernel}" = "x" ] ; then
-		git_branch="4.1-ti"
-	else
-		is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.4. || true)
-		if [ ! "x${is_kernel}" = "x" ] ; then
-			git_branch="4.4-ti"
-		fi
-	fi
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-${git_branch}"
+	git_target_dir="/opt/source/dtb-4.1-ti"
+	git_clone_branch
+
+	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
+	git_target_dir="/opt/source/dtb-4.4-ti"
 	git_clone_branch
 
 	git_repo="https://github.com/beagleboard/bb.org-overlays"

diff --git a/target/chroot/seeed-jessie.sh b/target/chroot/seeed-jessie.sh
@@ -355,17 +355,12 @@ install_git_repos () {
 		fi
 	fi
 
-	is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1. || true)
-	if [ ! "x${is_kernel}" = "x" ] ; then
-		git_branch="4.1-ti"
-	else
-		is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.4. || true)
-		if [ ! "x${is_kernel}" = "x" ] ; then
-			git_branch="4.4-ti"
-		fi
-	fi
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-${git_branch}"
+	git_target_dir="/opt/source/dtb-4.1-ti"
+	git_clone_branch
+
+	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
+	git_target_dir="/opt/source/dtb-4.4-ti"
 	git_clone_branch
 
 	git_repo="https://github.com/beagleboard/bb.org-overlays"