Permalink
Browse files

scripts: sync with master

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information...
1 parent e301c56 commit e480c44f997aab97653ebf5dc3c29367d1308798 @RobertCNelson committed Mar 13, 2013
Showing with 30 additions and 45 deletions.
  1. +1 −9 README
  2. +4 −4 build_deb.sh
  3. +4 −4 build_kernel.sh
  4. +2 −2 system.sh.sample
  5. +10 −9 tools/host_det.sh
  6. +0 −6 tools/{install_image.sh → install_kernel.sh}
  7. +4 −4 tools/rebuild.sh
  8. +4 −4 tools/rebuild_deb.sh
  9. +1 −3 version.sh
View
10 README
@@ -4,14 +4,6 @@ Script Bugs: "bugs@rcn-ee.com"
Dependencies: GCC ARM Cross ToolChain
-Ubuntu (for target "armel", prior to 12.04):
-sudo apt-get install gcc-arm-linux-gnueabi
-set: "CC=arm-linux-gnueabi-" in system.sh
-
-Ubuntu (for target "armhf", 12.04+ is available in armhf):
-sudo apt-get install gcc-arm-linux-gnueabihf
-set: "CC=arm-linux-gnueabihf-" in system.sh
-
Linaro:
http://www.linaro.org/downloads/
@@ -41,7 +33,7 @@ Optional: Build Debian Package:
Install Kernel Image to SD card: (requires MMC set in system.sh)
-./tools/install_image.sh
+./tools/install_kernel.sh
Development/Hacking:
View
@@ -65,16 +65,16 @@ function make_menuconfig {
function make_deb {
cd ${DIR}/KERNEL/
echo "-----------------------------"
- echo "make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg"
+ echo "make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg"
echo "-----------------------------"
- time fakeroot make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg
+ time fakeroot make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg
mv ${DIR}/*.deb ${DIR}/deploy/
unset DTBS
cat ${DIR}/KERNEL/arch/arm/Makefile | grep "dtbs:" &> /dev/null && DTBS=1
if [ "x${DTBS}" != "x" ] ; then
- echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CCACHE} ${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
- time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" ${CONFIG_DEBUG_SECTION} dtbs
+ echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
+ time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" ${CONFIG_DEBUG_SECTION} dtbs
ls arch/arm/boot/* | grep dtb || unset DTBS
fi
View
@@ -65,15 +65,15 @@ function make_menuconfig {
function make_kernel {
cd ${DIR}/KERNEL/
echo "-----------------------------"
- echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CCACHE} ${CC}\" ${CONFIG_DEBUG_SECTION} zImage modules"
+ echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CC}\" ${CONFIG_DEBUG_SECTION} zImage modules"
echo "-----------------------------"
- time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" ${CONFIG_DEBUG_SECTION} zImage modules
+ time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" ${CONFIG_DEBUG_SECTION} zImage modules
unset DTBS
cat ${DIR}/KERNEL/arch/arm/Makefile | grep "dtbs:" &> /dev/null && DTBS=1
if [ "x${DTBS}" != "x" ] ; then
- echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CCACHE} ${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
- time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" ${CONFIG_DEBUG_SECTION} dtbs
+ echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
+ time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" ${CONFIG_DEBUG_SECTION} dtbs
ls arch/arm/boot/* | grep dtb || unset DTBS
fi
View
@@ -25,7 +25,7 @@ fi
#GIT_OVER_HTTP=1
###OPTIONAL: ZRELADDR: used by mkimage when copying files to target
-# with: ./tools/install_image.sh...
+# with: ./tools/install_kernel.sh...
#
##For TI: OMAP3/4/AM35xx
#ZRELADDR=0x80008000
@@ -39,7 +39,7 @@ fi
##For Freescale: i.mx6:
#ZRELADDR=0x10008000
-###OPTIONAL: MMC: (REQUIRED FOR RUNNING: tools/install_image.sh)
+###OPTIONAL: MMC: (REQUIRED FOR RUNNING: tools/install_kernel.sh)
#Note: This operates on raw disks, NOT PARTITIONS..
#
#WRONG: MMC=/dev/mmcblk0p1
View
@@ -93,8 +93,8 @@ Missing mkimage command.
function debian_regs
{
unset deb_pkgs
+ dpkg -l | grep bc >/dev/null || deb_pkgs+="bc "
dpkg -l | grep build-essential >/dev/null || deb_pkgs+="build-essential "
- dpkg -l | grep ccache >/dev/null || deb_pkgs+="ccache "
dpkg -l | grep device-tree-compiler >/dev/null || deb_pkgs+="device-tree-compiler "
dpkg -l | grep lsb-release >/dev/null || deb_pkgs+="lsb-release "
dpkg -l | grep lzma >/dev/null || deb_pkgs+="lzma "
@@ -139,19 +139,20 @@ function debian_regs
;;
esac
-# case "${deb_distro}" in
-# wheezy)
-# unset wheezy_multiarch
-# dpkg -l | grep ia32-libs-i386 >/dev/null || wheezy_multiarch=1
-# ;;
-# esac
+ case "${deb_distro}" in
+ wheezy)
+ unset wheezy_multiarch
+ dpkg -l | grep ia32-libs >/dev/null || wheezy_multiarch=1
+ ;;
+ esac
if [ "${wheezy_multiarch}" ] ; then
- deb_pkgs+="ia32-libs-i386 "
echo "-----------------------------"
- echo "Debian Wheezy:"
+ echo "Note: for Debian Wheezy `uname -m`: to install ia32-libs:"
+ echo "-----------------------------"
echo "sudo dpkg --add-architecture i386"
echo "sudo apt-get update"
+ echo "sudo apt-get install ia32-libs"
echo "-----------------------------"
fi
fi
@@ -185,12 +185,6 @@ unmount_partitions () {
sudo umount ${DRIVE} &> /dev/null || true
done
- if [ -f "${DIR}/deploy/${KERNEL_UTS}.uImage" ] ; then
- rm -rf "${DIR}/deploy/${KERNEL_UTS}.uImage" || true
- fi
- mkimage -A arm -O linux -T kernel -C none -a 0x10008000 -e 0x10008000 -n ${KERNEL_UTS} -d "${DIR}/deploy/${KERNEL_UTS}.zImage" "${DIR}/deploy/${KERNEL_UTS}.uImage"
- sudo dd if="${DIR}/deploy/${KERNEL_UTS}.uImage" of=${MMC} bs=1M seek=1
-
mkdir -p "${DIR}/deploy/disk/"
mmc_detect_n_mount
}
View
@@ -65,15 +65,15 @@ function make_menuconfig {
function make_kernel {
cd ${DIR}/KERNEL/
echo "-----------------------------"
- echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CCACHE} ${CC}\" ${CONFIG_DEBUG_SECTION} zImage modules"
+ echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CC}\" ${CONFIG_DEBUG_SECTION} zImage modules"
echo "-----------------------------"
- time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" ${CONFIG_DEBUG_SECTION} zImage modules
+ time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" ${CONFIG_DEBUG_SECTION} zImage modules
unset DTBS
cat ${DIR}/KERNEL/arch/arm/Makefile | grep "dtbs:" &> /dev/null && DTBS=1
if [ "x${DTBS}" != "x" ] ; then
- echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CCACHE} ${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
- time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" ${CONFIG_DEBUG_SECTION} dtbs
+ echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
+ time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" ${CONFIG_DEBUG_SECTION} dtbs
ls arch/arm/boot/* | grep dtb || unset DTBS
fi
View
@@ -65,16 +65,16 @@ function make_menuconfig {
function make_deb {
cd ${DIR}/KERNEL/
echo "-----------------------------"
- echo "make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg"
+ echo "make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg"
echo "-----------------------------"
- time fakeroot make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg
+ time fakeroot make -j${CORES} ARCH=arm KBUILD_DEBARCH=${DEBARCH} LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" KDEB_PKGVERSION=${BUILDREV}${DISTRO} ${CONFIG_DEBUG_SECTION} deb-pkg
mv ${DIR}/*.deb ${DIR}/deploy/
unset DTBS
cat ${DIR}/KERNEL/arch/arm/Makefile | grep "dtbs:" &> /dev/null && DTBS=1
if [ "x${DTBS}" != "x" ] ; then
- echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CCACHE} ${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
- time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CCACHE} ${CC}" ${CONFIG_DEBUG_SECTION} dtbs
+ echo "make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE=\"${CC}\" ${CONFIG_DEBUG_SECTION} dtbs"
+ time make -j${CORES} ARCH=arm LOCALVERSION=-${BUILD} CROSS_COMPILE="${CC}" ${CONFIG_DEBUG_SECTION} dtbs
ls arch/arm/boot/* | grep dtb || unset DTBS
fi
View
@@ -1,7 +1,7 @@
#!/bin/bash
#
ARCH=$(uname -m)
-#DISABLE_MASTER_BRANCH=1
+DISABLE_MASTER_BRANCH=1
CORES=1
if [ "x${ARCH}" == "xx86_64" ] || [ "x${ARCH}" == "xi686" ] ; then
@@ -17,8 +17,6 @@ if [ "${GIT_NOEDIT}" ] ; then
GIT_OPTS+="--no-edit"
fi
-CCACHE=ccache
-
config="wandboard_defconfig"
#Kernel/Build

0 comments on commit e480c44

Please sign in to comment.