diff --git a/lib/helpers b/lib/helpers index df34c70..1826388 100644 --- a/lib/helpers +++ b/lib/helpers @@ -29,7 +29,7 @@ install-custom-packages() { notice "checking for custom debs" mkdir -p $R/extra/custom-packages pushd $R/extra/custom-packages - local pkgs=$(find ../$device_name/*.deb) + local pkgs="$(find ../$device_name -name '*.deb')" [[ -n $pkgs ]] && { notice "found!" for deb in $pkgs; do @@ -57,7 +57,7 @@ get-kernel-sources() { if [[ -d $R/tmp/kernels/$device_name/${device_name}-linux ]]; then pushd $R/tmp/kernels/$device_name/${device_name}-linux - git pull + git pull popd else git clone --depth 1 \ @@ -75,7 +75,7 @@ get-kernel-firmware() { local gitsource="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" if [[ -d $R/tmp/linux-firmware ]]; then pushd $R/tmp/linux-firmware - git pull + git pull popd else git clone $gitsource $R/tmp/linux-firmware @@ -94,7 +94,7 @@ clone-git() { if [[ -d $clonepath ]]; then pushd $clonepath - git pull + git pull popd else [[ -n $gitbr ]] && gitbr="-b $gitbr" @@ -111,7 +111,7 @@ copy-zram-init() { ckreq || return 1 notice "installing zram init" - sudo cp $CPVERBOSE $R/extra/zram $strapdir/root/ + sudo ${=cp} $R/extra/zram $strapdir/root/ } copy-kernel-config() { @@ -120,7 +120,7 @@ copy-kernel-config() { ckreq || return 1 notice "copying available kernel config" - cp $R/boards/kernel-configs/${device_name}.config \ + ${=cp} $R/boards/kernel-configs/${device_name}.config \ $R/tmp/kernels/$device_name/${device_name}-linux/.config } @@ -128,7 +128,7 @@ write-fstab() { fn write-fstab req=(strapdir) ckreq || return 1 - cat </dev/null ## ## proc proc /proc proc nodev,noexec,nosuid 0 0 @@ -152,7 +152,7 @@ postbuild-clean() { sed -i /etc/default/openntpd \ -e 's:DAEMON_OPTS.*:DAEMON_OPTS="-f /etc/openntpd/ntpd.conf -s":' - cat </dev/null #!/bin/sh dpkg-divert --add --local \ --divert /usr/sbin/invoke-rc.d.chroot \ diff --git a/lib/libdevuansdk b/lib/libdevuansdk index 904c452..162d058 160000 --- a/lib/libdevuansdk +++ b/lib/libdevuansdk @@ -1 +1 @@ -Subproject commit 904c4527ab7dde5665da5e4afe2aab04546fface +Subproject commit 162d058cf1611a16ef15c2b703292536720e7ac7 diff --git a/sdk b/sdk index ef66f59..c9faa38 100755 --- a/sdk +++ b/sdk @@ -24,13 +24,6 @@ R=${ARM_SDK:-$PWD} DEBUG=0 QUIET=0 -if [[ $DEBUG = 1 ]]; then - CPVERBOSE="-v" -else - CPVERBOSE="" - setopt pushdsilent -fi - source $R/lib/zuper/zuper ## global vars @@ -70,6 +63,7 @@ load() { board_map=( "bananapi" "$R/boards/bananapi.sh" + "bananapi-m2plus" "$R/boards/bananapi-m2plus.sh" "bananapro" "$R/boards/bananapro.sh" "beagleboneblack" "$R/boards/beaglebone-black.sh" "chromeacer" "$R/boards/chromebook-acer.sh"