scripts: sync with master of: git://github.com/RobertCNelson/stable-k…

…ernel.git Signed-off-by: Robert Nelson <[email protected]>
RobertCNelson · Nov 8, 2013 · 17efc97 · 17efc97
1 parent 008c786
commit 17efc97
Show file tree

Hide file tree

Showing 7 changed files with 279 additions and 9 deletions.
diff --git a/build_deb.sh b/build_deb.sh
@@ -81,6 +81,15 @@ make_pkg () {
 	cd ${DIR}/KERNEL/
 
 	deployfile="-${pkg}.tar.gz"
+	tar_options="--create --gzip --file"
+
+	if [ "${AUTO_BUILD}" ] ; then
+		#FIXME: xz might not be available everywhere...
+		#FIXME: ./tools/install_kernel.sh needs update...
+		deployfile="-${pkg}.tar.xz"
+		tar_options="--create --xz --file"
+	fi
+
 	if [ -f "${DIR}/deploy/${KERNEL_UTS}${deployfile}" ] ; then
 		rm -rf "${DIR}/deploy/${KERNEL_UTS}${deployfile}" || true
 	fi
@@ -107,7 +116,7 @@ make_pkg () {
 
 	echo "Compressing ${KERNEL_UTS}${deployfile}..."
 	cd ${DIR}/deploy/tmp
-	tar czf ../${KERNEL_UTS}${deployfile} *
+	tar ${tar_options} ../${KERNEL_UTS}${deployfile} *
 
 	cd ${DIR}/
 	rm -rf ${DIR}/deploy/tmp || true

diff --git a/build_kernel.sh b/build_kernel.sh
@@ -86,6 +86,14 @@ make_kernel () {
 	fi
 
 	if [ -f ./arch/arm/boot/${image} ] ; then
+		if [ ${AUTO_TESTER} ] ; then
+			mkdir -p "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/" || true
+			cp -uv arch/arm/boot/${image} "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/${KERNEL_UTS}.${image}"
+			xz -z "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/${KERNEL_UTS}.${image}"
+			mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL_UTS} -d arch/arm/boot/zImage "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/${KERNEL_UTS}.uImage"
+			xz -z "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/${KERNEL_UTS}.uImage"
+			cp -uv .config "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/${KERNEL_UTS}.config"
+		fi
 		cp -v arch/arm/boot/${image} "${DIR}/deploy/${KERNEL_UTS}.${image}"
 		cp -v .config "${DIR}/deploy/${KERNEL_UTS}.config"
 	fi
@@ -104,6 +112,15 @@ make_pkg () {
 	cd ${DIR}/KERNEL/
 
 	deployfile="-${pkg}.tar.gz"
+	tar_options="--create --gzip --file"
+
+	if [ "${AUTO_TESTER}" ] ; then
+		#FIXME: xz might not be available everywhere...
+		#FIXME: ./tools/install_kernel.sh needs update...
+		deployfile="-${pkg}.tar.xz"
+		tar_options="--create --xz --file"
+	fi
+
 	if [ -f "${DIR}/deploy/${KERNEL_UTS}${deployfile}" ] ; then
 		rm -rf "${DIR}/deploy/${KERNEL_UTS}${deployfile}" || true
 	fi
@@ -130,7 +147,11 @@ make_pkg () {
 
 	echo "Compressing ${KERNEL_UTS}${deployfile}..."
 	cd ${DIR}/deploy/tmp
-	tar czf ../${KERNEL_UTS}${deployfile} *
+	tar ${tar_options} ../${KERNEL_UTS}${deployfile} *
+
+	if [ ${AUTO_TESTER} ] ; then
+		cp -uv ../${KERNEL_UTS}${deployfile} "${DIR}/deploy/beagleboard.org/${KERNEL_UTS}/"
+	fi
 
 	cd ${DIR}/
 	rm -rf ${DIR}/deploy/tmp || true
@@ -158,6 +179,13 @@ make_dtbs_pkg () {
 	make_pkg
 }
 
+update_latest () {
+	echo "#!/bin/sh -e" > "${DIR}/deploy/beagleboard.org/latest"
+	echo "abi=aac" >> "${DIR}/deploy/beagleboard.org/latest"
+	echo "kernel=${KERNEL_UTS}" >> "${DIR}/deploy/beagleboard.org/latest"
+	cp -uv ./tools/test-me.sh "${DIR}/deploy/beagleboard.org/"
+}
+
 /bin/sh -e ${DIR}/tools/host_det.sh || { exit 1 ; }
 
 if [ ! -f ${DIR}/system.sh ] ; then
@@ -220,6 +248,9 @@ make_firmware_pkg
 if [ "x${DTBS}" != "x" ] ; then
 	make_dtbs_pkg
 fi
+if [ "${AUTO_TESTER}" ] ; then
+	update_latest
+fi
 echo "-----------------------------"
 echo "Script Complete"
 echo "eewiki.net: [user@localhost:~$ export kernel_version=${KERNEL_UTS}]"

diff --git a/scripts/gcc.sh b/scripts/gcc.sh
@@ -104,10 +104,10 @@ gcc_linaro_toolchain () {
 		;;
 	cortex_gcc_4_8)
 		#https://launchpad.net/linaro-toolchain-binaries/+download
-		#https://launchpad.net/linaro-toolchain-binaries/trunk/2013.09/+download/gcc-linaro-arm-linux-gnueabihf-4.8-2013.09_linux.tar.xz
+		#https://launchpad.net/linaro-toolchain-binaries/trunk/2013.10/+download/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_linux.tar.xz
 
 		gcc_version="4.8"
-		release="2013.09"
+		release="2013.10"
 		toolchain_name="gcc-linaro-arm-linux-gnueabihf"
 		site="https://launchpad.net/linaro-toolchain-binaries"
 		version="trunk/${release}"

diff --git a/tools/host_det.sh b/tools/host_det.sh
@@ -37,6 +37,7 @@ check_rpm () {
 }
 
 redhat_reqs () {
+	#https://fedoraproject.org/wiki/Releases
 	unset rpm_pkgs
 	pkg="redhat-lsb-core"
 	check_rpm
@@ -214,6 +215,7 @@ debian_regs () {
 
 		#Linux Mint: Compatibility Matrix
 		#http://www.linuxmint.com/oldreleases.php
+		#http://packages.linuxmint.com/index.php
 		case "${deb_distro}" in
 		debian)
 			deb_distro="jessie"
@@ -239,6 +241,9 @@ debian_regs () {
 		olivia)
 			deb_distro="raring"
 			;;
+		petra)
+			deb_distro="saucy"
+			;;
 		esac
 
 		case "${deb_distro}" in
@@ -247,7 +252,7 @@ debian_regs () {
 			unset error_unknown_deb_distro
 			unset warn_eol_distro
 			;;
-		lucid|precise|quantal|raring|saucy)
+		lucid|precise|quantal|raring|saucy|trusty)
 			#Supported Ubuntu:
 			unset error_unknown_deb_distro
 			unset warn_eol_distro
@@ -298,7 +303,7 @@ debian_regs () {
 
 		#Libs; starting with jessie/sid/saucy, lib<pkg_name>-dev:<arch>
 		case "${deb_distro}" in
-		jessie|sid|saucy)
+		jessie|sid|saucy|trusty)
 			pkg="libncurses5-dev:${deb_arch}"
 			check_dpkg
 			;;
@@ -316,7 +321,7 @@ debian_regs () {
 				pkg="ia32-libs"
 				check_dpkg
 				;;
-			wheezy|jessie|sid|quantal|raring|saucy)
+			wheezy|jessie|sid|quantal|raring|saucy|trusty)
 				pkg="libc6:i386"
 				check_dpkg
 				pkg="libncurses5:i386"

diff --git a/tools/rebuild.sh b/tools/rebuild.sh
@@ -104,6 +104,15 @@ make_pkg () {
 	cd ${DIR}/KERNEL/
 
 	deployfile="-${pkg}.tar.gz"
+	tar_options="--create --gzip --file"
+
+	if [ "${AUTO_BUILD}" ] ; then
+		#FIXME: xz might not be available everywhere...
+		#FIXME: ./tools/install_kernel.sh needs update...
+		deployfile="-${pkg}.tar.xz"
+		tar_options="--create --xz --file"
+	fi
+
 	if [ -f "${DIR}/deploy/${KERNEL_UTS}${deployfile}" ] ; then
 		rm -rf "${DIR}/deploy/${KERNEL_UTS}${deployfile}" || true
 	fi
@@ -130,7 +139,7 @@ make_pkg () {
 
 	echo "Compressing ${KERNEL_UTS}${deployfile}..."
 	cd ${DIR}/deploy/tmp
-	tar czf ../${KERNEL_UTS}${deployfile} *
+	tar ${tar_options} ../${KERNEL_UTS}${deployfile} *
 
 	cd ${DIR}/
 	rm -rf ${DIR}/deploy/tmp || true

diff --git a/tools/rebuild_deb.sh b/tools/rebuild_deb.sh
@@ -81,6 +81,15 @@ make_pkg () {
 	cd ${DIR}/KERNEL/
 
 	deployfile="-${pkg}.tar.gz"
+	tar_options="--create --gzip --file"
+
+	if [ "${AUTO_BUILD}" ] ; then
+		#FIXME: xz might not be available everywhere...
+		#FIXME: ./tools/install_kernel.sh needs update...
+		deployfile="-${pkg}.tar.xz"
+		tar_options="--create --xz --file"
+	fi
+
 	if [ -f "${DIR}/deploy/${KERNEL_UTS}${deployfile}" ] ; then
 		rm -rf "${DIR}/deploy/${KERNEL_UTS}${deployfile}" || true
 	fi
@@ -107,7 +116,7 @@ make_pkg () {
 
 	echo "Compressing ${KERNEL_UTS}${deployfile}..."
 	cd ${DIR}/deploy/tmp
-	tar czf ../${KERNEL_UTS}${deployfile} *
+	tar ${tar_options} ../${KERNEL_UTS}${deployfile} *
 
 	cd ${DIR}/
 	rm -rf ${DIR}/deploy/tmp || true