prep for alpine support

This commit is contained in:
parazyd 2017-04-10 12:23:29 +02:00
parent 22106fad51
commit 1728ecec21
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
7 changed files with 15 additions and 15 deletions

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "lib/zuper"]
path = lib/zuper
url = https://github.com/dyne/zuper.git
[submodule "lib/libalpine"]
path = lib/libalpine
url = https://github.com/parazyd/libalpine

View File

@ -1,5 +1,5 @@
#!/usr/bin/env zsh
# Copyright (c) 2016 Dyne.org Foundation
# Copyright (c) 2016-2017 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@ -28,7 +28,6 @@ arrs+=(custmodules)
device_name="ouya"
arch="armhf"
size=1337
inittab="T0:2345:respawn:/sbin/getty -L ttyS0 115200 linux"
parted_type="dos"
@ -46,10 +45,7 @@ prebuild() {
notice "executing $device_name prebuild"
enablessh
#write-fstab
copy-zram-init
install-custom-packages
copy-root-overlay
cat <<EOF | sudo tee ${strapdir}/etc/fstab
# <file system> <mount point> <type> <options> <dump> <pass>
@ -58,9 +54,9 @@ tmpfs /tmp tmpfs defaults 0 0
EOF
notice "copying some kernel modules"
sudo cp $CPVERBOSE -ra $R/extra/ouya/3.1.10-tk3+ $strapdir/lib/modules/
sudo cp -ra $R/extra/ouya/3.1.10-tk3+ $strapdir/lib/modules/
print 1 | sudo tee $strapdir/boot/keep
print 1 | sudo tee $strapdir/boot/.keep
}
postbuild() {
@ -71,7 +67,7 @@ postbuild() {
notice "executing $device_name postbuild"
sudo mkdir -p $strapdir/ouya
sudo cp $CPVERBOSE $R/extra/ouya/*.deb $strapdir/ouya/
sudo cp -f $R/extra/ouya/*.deb $strapdir/ouya/
cat <<EOF | sudo tee ${strapdir}/ouya.sh
#!/bin/sh
@ -80,10 +76,9 @@ for deb in /ouya/*.deb; do
apt-get -f --yes --force-yes install
done
rm -rf /ouya
rm -f /ouya.sh
EOF
chroot-script ouya.sh || zerr
chroot-script -d ouya.sh || zerr
postbuild-clean
}

2
config
View File

@ -58,7 +58,7 @@ qemu_bin="/usr/bin/qemu-arm-static" # Devuan
## extra_packages for all images
extra_packages+=(fake-hwclock busybox-static openntpd)
extra_packages+=(fbterm)
extra_packages+=(fbterm pciutils usbutils)
purge_packages+=()

View File

@ -102,9 +102,8 @@ apt-get --yes --force-yes autoremove
#apt-get clean
updatedb
rm -f ${qemu_bin}
EOF
chroot-script -d postbuild || zerr
sudo rm -f $strapdir/$qemu_bin
}

1
lib/libalpine Submodule

@ -0,0 +1 @@
Subproject commit 76e429fea8f66203e715627f794e9314b2f81b77

@ -1 +1 @@
Subproject commit fea3aa058a12c3f07928ee1ef62769c0c0e15cb0
Subproject commit 78dbf5d0901f959b304d69554594b6e74e7fb36f

2
sdk
View File

@ -40,6 +40,7 @@ maps+=(board_map os_map blend_map)
source $R/config
source $R/lib/helpers
source $R/lib/overrides
## conclude zuper initialization
source $R/lib/zuper/zuper.init
@ -83,6 +84,7 @@ load() {
os_map=(
"devuan" "$R/lib/libdevuansdk/libdevuansdk"
"alpine" "$R/lib/libalpine/libalpine"
)
blend_map=(