From d06cf23e83c7e1beb2d90d5d69a9a01d9349e871 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 17 Apr 2014 09:12:01 -0500
Subject: [PATCH] scripts: sync with master of:
https://github.com/RobertCNelson/stable-kernel.git
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
build_deb.sh | 6 +++++-
build_kernel.sh | 6 +++++-
tools/host_det.sh | 5 ++++-
tools/rebuild.sh | 6 +++++-
tools/rebuild_deb.sh | 6 +++++-
5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/build_deb.sh b/build_deb.sh
index 4f54561b0..93118eeef 100755
--- a/build_deb.sh
+++ b/build_deb.sh
@@ -120,7 +120,11 @@ make_pkg () {
make -s ARCH=arm CROSS_COMPILE=${CC} firmware_install INSTALL_FW_PATH=${DIR}/deploy/tmp
;;
dtbs)
- find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ if [ "x${has_dtbs_install}" = "xenable" ] ; then
+ make -s ARCH=arm CROSS_COMPILE=${CC} dtbs_install INSTALL_DTBS_PATH=${DIR}/deploy/tmp
+ else
+ find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ fi
;;
esac
diff --git a/build_kernel.sh b/build_kernel.sh
index b13006a79..cb172f036 100755
--- a/build_kernel.sh
+++ b/build_kernel.sh
@@ -170,7 +170,11 @@ make_pkg () {
make -s ARCH=arm CROSS_COMPILE=${CC} firmware_install INSTALL_FW_PATH=${DIR}/deploy/tmp
;;
dtbs)
- find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ if [ "x${has_dtbs_install}" = "xenable" ] ; then
+ make -s ARCH=arm CROSS_COMPILE=${CC} dtbs_install INSTALL_DTBS_PATH=${DIR}/deploy/tmp
+ else
+ find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ fi
;;
esac
diff --git a/tools/host_det.sh b/tools/host_det.sh
index 3ab8e23c9..44843cf6f 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -81,7 +81,7 @@ redhat_reqs () {
#pkg="uboot-tools"
#check_rpm
;;
- 17|18|19|20)
+ 17|18|19|20|21)
pkg="uboot-tools"
check_rpm
;;
@@ -270,6 +270,9 @@ debian_regs () {
petra)
deb_distro="saucy"
;;
+ qiana)
+ deb_distro="trusty"
+ ;;
esac
case "${deb_distro}" in
diff --git a/tools/rebuild.sh b/tools/rebuild.sh
index c692c027e..6172c90e3 100755
--- a/tools/rebuild.sh
+++ b/tools/rebuild.sh
@@ -143,7 +143,11 @@ make_pkg () {
make -s ARCH=arm CROSS_COMPILE=${CC} firmware_install INSTALL_FW_PATH=${DIR}/deploy/tmp
;;
dtbs)
- find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ if [ "x${has_dtbs_install}" = "xenable" ] ; then
+ make -s ARCH=arm CROSS_COMPILE=${CC} dtbs_install INSTALL_DTBS_PATH=${DIR}/deploy/tmp
+ else
+ find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ fi
;;
esac
diff --git a/tools/rebuild_deb.sh b/tools/rebuild_deb.sh
index 636283dcc..70e7c0ac0 100755
--- a/tools/rebuild_deb.sh
+++ b/tools/rebuild_deb.sh
@@ -120,7 +120,11 @@ make_pkg () {
make -s ARCH=arm CROSS_COMPILE=${CC} firmware_install INSTALL_FW_PATH=${DIR}/deploy/tmp
;;
dtbs)
- find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ if [ "x${has_dtbs_install}" = "xenable" ] ; then
+ make -s ARCH=arm CROSS_COMPILE=${CC} dtbs_install INSTALL_DTBS_PATH=${DIR}/deploy/tmp
+ else
+ find ./arch/arm/boot/ -iname "*.dtb" -exec cp -v '{}' ${DIR}/deploy/tmp/ \;
+ fi
;;
esac
--
GitLab