From 9671545536d45fbf1cb7b1eaa256d709287a53eb Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Wed, 11 Nov 2015 14:50:58 -0600 Subject: [PATCH] target: bb.org jessie: | grep 4.1 can be false Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- target/chroot/beagleboard.org-jessie.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh index 37a2f1115..ccad738c5 100755 --- a/target/chroot/beagleboard.org-jessie.sh +++ b/target/chroot/beagleboard.org-jessie.sh @@ -435,7 +435,12 @@ install_git_repos () { fi git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git" - git_branch="4.1-ti" + is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1 || true) + if [ ! "x${is_kernel}" = "x" ] ; then + git_branch="4.1-ti" + else + git_branch="3.14-ti" + fi git_target_dir="/opt/source/dtb-${git_branch}" git_clone_branch @@ -445,7 +450,7 @@ install_git_repos () { if [ -f ${git_target_dir}/.git/config ] ; then cd ${git_target_dir}/ if [ ! "x${repo_rcnee_pkg_version}" = "x" ] ; then - is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1) + is_kernel=$(echo ${repo_rcnee_pkg_version} | grep 4.1 || true) if [ ! "x${is_kernel}" = "x" ] ; then if [ -f /usr/bin/make ] ; then ./dtc-overlay.sh -- GitLab