From 8c50bdd5c835ee97981ba21b99bbe640dab4343f Mon Sep 17 00:00:00 2001 From: parazyd Date: Sun, 18 Dec 2016 15:27:30 +0100 Subject: [PATCH] codebase cleanup --- boards/bananapi.sh | 2 +- boards/bananapro.sh | 2 +- boards/chromebook-acer.sh | 6 +++--- boards/chromebook-veyron.sh | 5 ++--- boards/nokia-n900.sh | 4 +++- boards/ouya.sh | 1 + boards/raspberry-pi1.sh | 2 +- lib/libdevuansdk | 2 +- sdk | 13 +++++-------- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/boards/bananapi.sh b/boards/bananapi.sh index 5cef251..f190bf1 100644 --- a/boards/bananapi.sh +++ b/boards/bananapi.sh @@ -127,7 +127,7 @@ build_kernel_armhf() { pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ make INSTALL_MOD_PATH=$strapdir firmware_install || zerr - sudo cp -v arch/arm/boot/uImage $strapdir/boot/ + sudo cp $CPVERBOSE arch/arm/boot/uImage $strapdir/boot/ make mrproper make sun7i_defconfig sudo -E PATH="$PATH" \ diff --git a/boards/bananapro.sh b/boards/bananapro.sh index ea8122d..4aa632a 100644 --- a/boards/bananapro.sh +++ b/boards/bananapro.sh @@ -127,7 +127,7 @@ build_kernel_armhf() { pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ make INSTALL_MOD_PATH=$strapdir firmware_install || zerr - sudo cp -v arch/arm/boot/uImage $strapdir/boot/ + sudo cp $CPVERBOSE arch/arm/boot/uImage $strapdir/boot/ make mrproper make sun7i_defconfig sudo -E PATH="$PATH" \ diff --git a/boards/chromebook-acer.sh b/boards/chromebook-acer.sh index fd2fd8e..59687d6 100644 --- a/boards/chromebook-acer.sh +++ b/boards/chromebook-acer.sh @@ -34,7 +34,7 @@ parted_type="gpt" gpt_boot=(8192 32768) gpt_root=(40960) -extra_packages+=(abootimg cgpt fake-hwclock u-boot-tools) +extra_packages+=(abootimg cgpt u-boot-tools) extra_packages+=(vboot-utils vboot-kernel-utils) extra_packages+=(laptop-mode-tools usbutils) custmodules=() @@ -117,8 +117,8 @@ EOF ## }}} notice "grabbing some coreboot stuff" - #clone-git "https://chromium.googlesource.com/chromiumos/third_party/coreboot" "$R/tmp/chromiumos-coreboot" - git clone https://chromium.googlesource.com/chromiumos/third_party/coreboot $R/tmp/chromiumos-coreboot + clone-git "https://chromium.googlesource.com/chromiumos/third_party/coreboot" "$R/tmp/chromiumos-coreboot" + #git clone https://chromium.googlesource.com/chromiumos/third_party/coreboot $R/tmp/chromiumos-coreboot pushd $R/tmp/chromiumos-coreboot notice "copying coreboot tegra" diff --git a/boards/chromebook-veyron.sh b/boards/chromebook-veyron.sh index 0c5da61..7bfbd14 100644 --- a/boards/chromebook-veyron.sh +++ b/boards/chromebook-veyron.sh @@ -28,13 +28,13 @@ arrs+=(gpt_root gpt_boot) device_name="chromeveyron" arch="armhf" size=1730 -inittab="" +#inittab="" parted_type="gpt" gpt_boot=(8192 32768) gpt_root=(40960) -extra_packages+=(abootimg cgpt fake-hwclock u-boot-tools) +extra_packages+=(abootimg cgpt u-boot-tools) extra_packages+=(vboot-utils vboot-kernel-utils) extra_packages+=(laptop-mode-tools usbutils) custmodules=() @@ -148,7 +148,6 @@ build_kernel_armhf() { prebuild || zerr - get-kernel-sources pushd $R/tmp/kernels/$device_name/${device_name}-linux diff --git a/boards/nokia-n900.sh b/boards/nokia-n900.sh index b77324f..5c779b1 100644 --- a/boards/nokia-n900.sh +++ b/boards/nokia-n900.sh @@ -27,7 +27,7 @@ arrs+=(custmodules) device_name="n900" arch="armhf" size=666 -#inittab="T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100" +#inittab="" parted_type="dos" parted_boot="fat32 2048s 264191s" @@ -57,6 +57,8 @@ prebuild() { ## the wl1251 driver generates a random MAC address on every boot ## this "fixes" udev so it does not autoincrement the interface number each ## time the device boots + ## NOTE: comment the below line for a cool feature of having a random MAC + ## every time :) print "#" | sudo tee $strapdir/etc/udev/rules.d/75-persistent-net-generator.rules } diff --git a/boards/ouya.sh b/boards/ouya.sh index 608e843..c7887e4 100644 --- a/boards/ouya.sh +++ b/boards/ouya.sh @@ -18,6 +18,7 @@ # along with this source code. If not, see . ## kernel build script for OUYA Game console +## NOTE: see 'doc/quirks.md' for more info on this device ## settings & config vars+=(device_name arch size parted_boot parted_root inittab) diff --git a/boards/raspberry-pi1.sh b/boards/raspberry-pi1.sh index 17b607d..0c9bb00 100644 --- a/boards/raspberry-pi1.sh +++ b/boards/raspberry-pi1.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this source code. If not, see . -## kernel build script for Raspberry Pi 2/3 boards +## kernel build script for Raspberry Pi 1 boards ## settings & config vars+=(device_name arch size parted_type parted_boot parted_root inittab) diff --git a/lib/libdevuansdk b/lib/libdevuansdk index 367bf5f..8550bd6 160000 --- a/lib/libdevuansdk +++ b/lib/libdevuansdk @@ -1 +1 @@ -Subproject commit 367bf5fc2e718b78705ae618db360ea543f84ba0 +Subproject commit 8550bd607231d7f693dfe7dfe6716165e6b5cb54 diff --git a/sdk b/sdk index c2e818c..ef66f59 100755 --- a/sdk +++ b/sdk @@ -17,22 +17,19 @@ # You should have received a copy of the GNU General Public License # along with this source code. If not, see . -armsdk_version="1.0" - +armsdk_version="0.6" R=${ARM_SDK:-$PWD} DEBUG=0 QUIET=0 -[[ $DEBUG = 1 ]] && { +if [[ $DEBUG = 1 ]]; then CPVERBOSE="-v" - #LOG="armsdk.log" -} || [[ $DEBUG = 0 ]] && { +else CPVERBOSE="" setopt pushdsilent -} - +fi source $R/lib/zuper/zuper @@ -109,7 +106,7 @@ load() { [[ -f $boardlib ]] || { die "no valid boards specified"; exit 1 } [[ -f $oslib ]] || { die "no valid distro specified"; exit 1 } - [[ -f $blendlib ]] || warn "no valid blend specified" + [[ -f $blendlib ]] || { warn "no valid blend specified" } [[ -f $boardlib ]] && source $boardlib && act "$device_name build script loaded" [[ -f $oslib ]] && source $oslib