remove rdate, add postbuild-clean, add missing boards to hashmap

This commit is contained in:
parazyd 2016-10-13 10:03:06 +02:00
parent 18b120a4b7
commit 81cdfb4af4
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
3 changed files with 43 additions and 21 deletions

View File

@ -118,12 +118,33 @@ proc /proc proc nodev,noexec,nosuid 0 0
EOF EOF
} }
rdate-to-rclocal() { postbuild-clean() {
fn rdate-to-rclocal fn postbuild-clean
req=(strapdir) req=(qemu_bin strapdir)
ckreq || return 1 ckreq || return 1
notice "adding rdate to rc.local" cat <<EOF | sudo tee ${strapdir}/postbuild
sed -i -e "s/exit 0/rdate -s pool.ntp.org &/" $strapdir/etc/rc.local #!/bin/sh
print "exit 0" | sudo tee -a $strapdir/etc/rc.local ${TEEVERBOSE} dpkg-divert --add --local \
--divert /usr/sbin/invoke-rc.d.chroot \
--rename /usr/sbin/invoke-rc.d
cp /bin/true /usr/sbin/invoke-rc.d
echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
chmod +x /usr/sbin/policy-rc.d
apt-get update
apt-get --yes --force-yes upgrade
apt-get --yes --force-yes autoremove
apt-get clean
rm -f /usr/sbin/policy-rc.d
rm -f /usr/sbin/invoke-rc.d
dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
rm -f postbuild
rm -f ${qemu_bin}
EOF
sudo chmod +x $strapdir/postbuild || zerr
sudo chroot $strapdir /postbuild || zerr
} }

@ -1 +1 @@
Subproject commit 30750201ee956d93e2a2582c7ab056a71841b541 Subproject commit d2089d9a203f79bb5514488dfe6e4dfe26bbb889

29
sdk
View File

@ -17,27 +17,23 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this source code. If not, see <http://www.gnu.org/licenses/>. # along with this source code. If not, see <http://www.gnu.org/licenses/>.
armsdk_version="1.0-dev" armsdk_version="1.0"
## setup zsh options
setopt pushdsilent
R=${ARM_SDK:-$PWD} R=${ARM_SDK:-$PWD}
DEBUG=1 DEBUG=0
QUIET=0 QUIET=0
[[ $DEBUG = 1 ]] && { [[ $DEBUG = 1 ]] && {
## add -v to cp calls
CPVERBOSE="-v" CPVERBOSE="-v"
TEEVERBOSE="" LOG="armsdk.log"
} || [[ $DEBUG = 0 ]] && { } || [[ $DEBUG = 0 ]] && {
CPVERBOSE="" CPVERBOSE=""
TEEVERBOSE=">/dev/null" setopt pushdsilent
} }
source lib/zuper/zuper source lib/zuper/zuper
## global vars ## global vars
@ -46,6 +42,9 @@ vars+=(R workdir strapdir)
vars+=(os boardlib oslib) vars+=(os boardlib oslib)
vars+=(MAKEOPTS) vars+=(MAKEOPTS)
## global arrs
arrs+=(extra_packages)
## global maps ## global maps
maps+=(board_map os_map) maps+=(board_map os_map)
@ -74,15 +73,16 @@ load() {
board_map=( board_map=(
"bananapi" "$R/boards/bananapi.sh" "bananapi" "$R/boards/bananapi.sh"
"bananapro" "$R/boards/bananapro.sh" "bananapro" "$R/boards/bananapro.sh"
"bbb" "$R/boards/beaglebone-black.sh" "beagleboneblack" "$R/boards/beaglebone-black.sh"
"chromeacer" "$R/boards/chromebook-acer.sh" "chromeacer" "$R/boards/chromebook-acer.sh"
"chromeveyron" "$R/boards/chromebook-veyron.sh" "chromeveyron" "$R/boards/chromebook-veyron.sh"
"cubieboard2" "$R/boards/cubieboard2.sh" "cubieboard2" "$R/boards/cubieboard2.sh"
"cubietruck" "$R/boards/cubietruck.sh" "cubietruck" "$R/boards/cubietruck.sh"
"n900" "$R/boards/nokia-n900.sh"
"odroidxu" "$R/boards/odroid-xu.sh" "odroidxu" "$R/boards/odroid-xu.sh"
"ouya" "$R/boards/ouya.sh" "ouya" "$R/boards/ouya.sh"
"raspi" "$R/boards/raspberry-pi.sh" "raspi2" "$R/boards/raspberry-pi2.sh"
"n900" "$R/boards/nokia-n900.sh" "raspi3" "$R/boards/raspberry-pi3.sh"
) )
os_map=( os_map=(
@ -92,10 +92,11 @@ load() {
boardlib="${board_map[$dev]}" boardlib="${board_map[$dev]}"
oslib="${os_map[$os]}" oslib="${os_map[$os]}"
[[ -f $boardlib ]] || die "no valid board specified" [[ -f $boardlib ]] || { die "no valid boards specified"; exit 1 }
[[ -f $oslib ]] || die "no valid distro specified" [[ -f $oslib ]] || { die "no valid distro specified"; exit 1 }
source $boardlib source $boardlib && act "$device_name build script loaded"
export OS=$os
source $oslib source $oslib
workdir="$R/tmp/${device_name}-build" workdir="$R/tmp/${device_name}-build"