From 64a700b6de25332fb5d76733a495ebe0ff720b55 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 25 Jul 2013 10:21:01 -0500
Subject: [PATCH] scripts: sync with master
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
LICENSE | 20 +++++++++++++++++++
repo_maintenance/push-merge-to-sha.sh | 18 +++++++++++++++++
.../push-n-tag-release.sh | 0
repo_maintenance/push-sync-with-master.sh | 13 ++++++++++++
system.sh.sample | 5 ++++-
tools/host_det.sh | 11 ++++++++++
version.sh | 9 +++++++--
7 files changed, 73 insertions(+), 3 deletions(-)
create mode 100644 LICENSE
create mode 100755 repo_maintenance/push-merge-to-sha.sh
rename {tools => repo_maintenance}/push-n-tag-release.sh (100%)
mode change 100644 => 100755
create mode 100755 repo_maintenance/push-sync-with-master.sh
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..e5d082c11
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2009-2013 Robert Nelson <robertcnelson@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/repo_maintenance/push-merge-to-sha.sh b/repo_maintenance/push-merge-to-sha.sh
new file mode 100755
index 000000000..993c2c11d
--- /dev/null
+++ b/repo_maintenance/push-merge-to-sha.sh
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+DIR=$PWD
+repo="https://github.com/RobertCNelson/linux/commit"
+
+if [ -e ${DIR}/version.sh ]; then
+ unset BRANCH
+ unset KERNEL_SHA
+ . ${DIR}/version.sh
+
+ if [ ! "${BRANCH}" ] ; then
+ BRANCH="master"
+ fi
+
+ git commit -a -m "merge to: ${repo}/${KERNEL_SHA}" -s
+ git push origin ${BRANCH}
+fi
+
diff --git a/tools/push-n-tag-release.sh b/repo_maintenance/push-n-tag-release.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tools/push-n-tag-release.sh
rename to repo_maintenance/push-n-tag-release.sh
diff --git a/repo_maintenance/push-sync-with-master.sh b/repo_maintenance/push-sync-with-master.sh
new file mode 100755
index 000000000..f12879389
--- /dev/null
+++ b/repo_maintenance/push-sync-with-master.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+DIR=$PWD
+
+if [ -e ${DIR}/version.sh ]; then
+ unset BRANCH
+ . ${DIR}/version.sh
+
+ git commit -a -m "scripts: sync with master" -s
+
+ git push origin ${BRANCH}
+fi
+
diff --git a/system.sh.sample b/system.sh.sample
index b226ed382..8a9ae4adb 100644
--- a/system.sh.sample
+++ b/system.sh.sample
@@ -39,8 +39,11 @@ fi
##For Freescale: i.mx53:
#ZRELADDR=0x70008000
#
-##For Freescale: i.mx6:
+##For Freescale: i.mx6q/dl/solo:
#ZRELADDR=0x10008000
+#
+##For Freescale: i.mx6sl:
+#ZRELADDR=0x80008000
###OPTIONAL: MMC: (REQUIRED FOR RUNNING: tools/install_kernel.sh)
#Note: This operates on raw disks, NOT PARTITIONS..
diff --git a/tools/host_det.sh b/tools/host_det.sh
index 2ebbb5b12..e8770ef64 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -94,6 +94,8 @@ debian_regs () {
LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} "
pkg="fakeroot"
LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} "
+ pkg="man-db"
+ LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} "
pkg="lsb-release"
LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} "
pkg="lzma"
@@ -146,12 +148,20 @@ debian_regs () {
unset warn_eol_distro
;;
maverick|natty|oneiric)
+ #lucid -> precise
#http://us.archive.ubuntu.com/ubuntu/dists/
#list: dists between LTS's...
unset error_unknown_deb_distro
warn_eol_distro=1
stop_pkg_search=1
;;
+ hardy)
+ #Just old, but still on:
+ #http://us.archive.ubuntu.com/ubuntu/dists/
+ unset error_unknown_deb_distro
+ warn_eol_distro=1
+ stop_pkg_search=1
+ ;;
*)
error_unknown_deb_distro=1
unset warn_eol_distro
@@ -234,6 +244,7 @@ debian_regs () {
echo "-----------------------------"
echo "Please cut, paste and email to: bugs@rcn-ee.com"
echo "-----------------------------"
+ echo "git: `git rev-parse HEAD`"
echo "uname -m"
uname -m
echo "lsb_release -a"
diff --git a/version.sh b/version.sh
index fa52c7522..640727229 100644
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,13 @@
#
ARCH=$(uname -m)
-#Dual/Quad Core arms are now more prevalent, so don't just limit to x86:
-CORES=$(cat /proc/cpuinfo | grep processor | wc -l)
+#Dual/Quad Core arms are now more prevalent, so just don't limit it x86:
+check_cpuinfo=$(cat /proc/cpuinfo | grep "^processor" | awk '{print $1}' | head -n 1)
+if [ "x${check_cpuinfo}" = "xprocessor" ] ; then
+ CORES=$(cat /proc/cpuinfo | grep "^processor" | wc -l)
+else
+ CORES=1
+fi
unset GIT_OPTS
unset GIT_NOEDIT
--
GitLab