commit 200982330b492c5c7768ce5e4e598a47101c7abe
parent 6da83e3e4cf34066493d7281663f50924fc5b315
Author: parazyd <parazyd@dyne.org>
Date: Sat, 21 Nov 2020 13:04:03 +0100
Update boards for latest libdevuansdk revision.
Diffstat:
21 files changed, 88 insertions(+), 154 deletions(-)
diff --git a/boards/beaglebone-black.sh b/boards/beaglebone-black.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2017 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -31,10 +31,11 @@ size=1666
inittab=("T0:12345:respawn:/sbin/getty -L ttyS0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
-bootable_part="1"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
+bootable_part="1"
extra_packages+=()
custmodules=()
diff --git a/boards/bionic.sh b/boards/bionic.sh
@@ -29,9 +29,10 @@ size=1891
inittab=("s0:12345:respawn:/sbin/agetty -L ttyS2 115200 vt100")
parted_type="dos"
-parted_boot="8192s 270335s"
-parted_root="ext4 270336s 100%"
bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 8192s 270335s"
+dos_root="$rootfs 270336s 100%"
extra_packages+=(firmware-ti-connectivity)
custmodules=()
diff --git a/boards/droid4.sh b/boards/droid4.sh
@@ -30,9 +30,10 @@ size=1891
inittab=("s0:12345:respawn:/sbin/agetty -L ttyS2 115200 vt100")
parted_type="dos"
-parted_boot="8192s 270335s"
-parted_root="ext4 270336s 100%"
bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 8192s 270335s"
+dos_root="$rootfs 270336s 100%"
extra_packages+=(firmware-ti-connectivity)
custmodules=()
diff --git a/boards/nokia-n9.sh b/boards/nokia-n9.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -29,9 +29,10 @@ arch="armhf"
size=1337
parted_type="dos"
-parted_boot="fat32 8192s 270335s"
-parted_root="ext4 270336s 100%"
bootfs="none"
+rootfs="ext4"
+dos_boot="fat32 8192s 270335s"
+dos_root="$rootfs 270336s 100%"
extra_packages+=(firmware-ti-connectivity)
custmodules=()
diff --git a/boards/nokia-n900.sh b/boards/nokia-n900.sh
@@ -30,9 +30,10 @@ size=1891
inittab=("T0:23:respawn:/sbin/getty -L ttyS2 115200 vt100")
parted_type="dos"
-parted_boot="ext2 8192s 270335s"
-parted_root="ext4 270336s 100%"
bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 8192s 270335s"
+dos_root="$rootfs 270336s 100%"
extra_packages+=(firmware-ti-connectivity)
custmodules=()
diff --git a/boards/nokia-n950.sh b/boards/nokia-n950.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -29,9 +29,10 @@ arch="armhf"
size=1337
parted_type="dos"
-parted_boot="fat32 8192s 270335s"
-parted_root="ext4 270336s 100%"
bootfs="none"
+rootfs="ext4"
+dos_boot="fat32 8192s 270335s"
+dos_root="$rootfs 270336s 100%"
extra_packages+=(firmware-ti-connectivity)
custmodules=()
diff --git a/boards/odroid-xu.sh b/boards/odroid-xu.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -34,9 +34,10 @@ inittab=("T1:12345:respawn:/bin/login -f root ttySAC2 /dev/ttySAC2 2>&1")
hosttuple=${compiler:0:-1}
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/boards/odroid-xu4.sh b/boards/odroid-xu4.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2017-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -31,9 +31,10 @@ size=1891
inittab=("T1:12345:respawn:/sbin/agetty -L ttySAC2 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/boards/ouya.sh b/boards/ouya.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2017 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -31,9 +31,10 @@ size=1337
inittab=("T0:2345:respawn:/sbin/getty -L ttyS0 115200 linux")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=(libasound2 libglib2.0-0 libgstreamer-plugins-base0.10-0 libxv1)
custmodules=()
diff --git a/boards/pinephone-dontbeevil.sh b/boards/pinephone-dontbeevil.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2019 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -31,9 +31,10 @@ size=1891
inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100")
parted_type="dos"
-parted_boot="ext2 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/boards/pinephone.sh b/boards/pinephone.sh
@@ -29,9 +29,10 @@ size=1891
inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100")
parted_type="dos"
-parted_boot="ext2 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/boards/pinetab.sh b/boards/pinetab.sh
@@ -29,9 +29,10 @@ size=1891
inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100")
parted_type="dos"
-parted_boot="ext2 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/boards/raspberry-pi1.sh b/boards/raspberry-pi1.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -30,9 +30,10 @@ size=1891
inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=(snd_bcm2835)
diff --git a/boards/raspberry-pi2.sh b/boards/raspberry-pi2.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -30,9 +30,10 @@ size=1891
inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 8192s 270335s"
-parted_root="ext4 270336s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 8192s 270335s"
+dos_root="$rootfs 270336s 100%"
extra_packages+=()
custmodules=(snd_bcm2835)
diff --git a/boards/raspberry-pi3.sh b/boards/raspberry-pi3.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -30,9 +30,10 @@ size=1891
inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=(snd_bcm2835)
diff --git a/boards/raspberry-pi4.sh b/boards/raspberry-pi4.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2016-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -30,9 +30,10 @@ size=1891
inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="vfat"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=(snd_bcm2835)
diff --git a/boards/sunxi.sh b/boards/sunxi.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2017-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -31,9 +31,10 @@ size=1891
inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
-bootfs="ext4"
+bootfs="ext2"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/boards/turbox-twister.sh b/boards/turbox-twister.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env zsh
-# Copyright (c) 2017-2018 Dyne.org Foundation
+# Copyright (c) 2016-2020 Dyne.org Foundation
# arm-sdk is written and maintained by Ivan J. <parazyd@dyne.org>
#
# This file is part of arm-sdk
@@ -31,9 +31,10 @@ size=1891
inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100")
parted_type="dos"
-parted_boot="fat32 2048s 264191s"
-parted_root="ext4 264192s 100%"
bootfs="ext4"
+rootfs="ext4"
+dos_boot="$bootfs 2048s 264191s"
+dos_root="$rootfs 264192s 100%"
extra_packages+=()
custmodules=()
diff --git a/config b/config
@@ -17,42 +17,39 @@
# 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/>.
-
-## arm-sdk configuration
-## ---------------------
-
-## options for `make` when building kernel
+# Options for `make` when building kernels
MAKEOPTS="-j$(( $(grep -c 'processor' /proc/cpuinfo) + 1 ))"
-## uncomment if you wish to create stage4 tarballs for faster rebuilding
-# TAR_STAGE4=true
+# Comment if you wish to disable stage4 archives for faster rebuilding
+CPIO_STAGE4=1
+
+# Comment if you wish to disable image compression
+COMPRESS_IMAGE=1
-armhftc="arm-none-eabi-"
+armhftc="arm-linux-gnueabihf-"
armeltc="arm-none-eabi-"
arm64tc="aarch64-linux-gnu-"
or1ktc="or1k-linux-musl-"
export PATH="$PATH:/usr/sbin:/sbin:/usr/bin:/bin:$R/gcc/or1k-linux-musl/bin"
-## static qemu arm binaries
+# Static qemu arm binaries
armel_qemu_bin="/usr/bin/qemu-arm-static"
armhf_qemu_bin="/usr/bin/qemu-arm-static"
arm64_qemu_bin="/usr/bin/qemu-aarch64-static"
-
-## extra_packages for all images
+# extra_packages for all images
extra_packages+=(fake-hwclock busybox-static ntp)
-extra_packages+=(fbterm pciutils usbutils)
+extra_packages+=(pciutils usbutils)
purge_packages+=()
-
-## linux kernel firmware
+# Linux kernel firmware
linuxfirmware="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
-## linux mainline kernel
+# Linux mainline kernel
linuxmainline="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-## u-boot mainline
+# u-boot mainline
ubootmainline="git://git.denx.de/u-boot.git"
arrs+=(uboot_configs board_dtbs)
diff --git a/lib/overrides b/lib/overrides
@@ -1,40 +0,0 @@
-#!/usr/bin/env zsh
-# 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
-#
-# This source code is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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/>.
-
-## overrided functions for arm-sdk
-
-conf_print_sourceslist() {
- fn conf_print_sourceslist
- req=(mirror release section)
- ckreq || return 1
-
- cat <<EOF
-## package repositories
-deb ${mirror} ${release} ${section}
-deb ${mirror} ${release}-updates ${section}
-deb ${mirror} ${release}-security ${section}
-#deb ${mirror} ${release}-backports ${section}
-
-## source repositories
-#deb-src ${mirror} ${release} ${section}
-#deb-src ${mirror} ${release}-updates ${section}
-#deb-src ${mirror} ${release}-security ${section}
-#deb-src ${mirror} ${release}-backports ${section}
-EOF
-}
diff --git a/sdk b/sdk
@@ -26,22 +26,22 @@ QUIET=0
source $R/lib/zuper/zuper
-## global vars
+# Global vars
vars+=(armsdk_version)
vars+=(R workdir strapdir)
vars+=(os boardlib oslib blendlib)
vars+=(MAKEOPTS)
-## global arrs
+# Global arrs
arrs+=(extra_packages)
-## global maps
+# Global maps
maps+=(board_map os_map blend_map)
source $R/config
source $R/lib/helpers
-## conclude zuper initialization
+# Conclude zuper initialization
source $R/lib/zuper/zuper.init
load() {
@@ -100,58 +100,17 @@ load() {
)
boardlib="${board_map[$dev]}"
- [[ -f $boardlib ]] || { die "no valid boards specified"; exit 1 }
+ [[ -f $boardlib ]] || { die "no valid boards specified"; return 1 }
source $boardlib ## XXX: remove this line
oslib="${os_map[$os]}"
- [[ -f $oslib ]] || { die "no valid distro specified"; exit 1 }
+ [[ -f $oslib ]] || { die "no valid distro specified"; return 1 }
source $oslib
blendlib="${blend_map[$blend]}"
-
- if [[ -z "$blendlib" ]]; then
- if [[ "$blend" =~ '^http' ]]; then
- notice "grabbing blend from the internetz"
- dlpath="$R/extra/blends/$(basename $blend)"
- wget -O "$dlpath" "$blend"
- sed 1q "$dlpath" | grep -q '^#!/usr/bin/env zsh' && blendlib="$dlpath"
- fi
-
- if [[ -z "$blendlib" ]]; then
- [[ -n "$dlpath" ]] && blend="$dlpath"
- act "trying to parse an unknown blend"
- # Check if it's a Dockerfile
- if grep -qi '^FROM ' "$blend" 2>&/dev/null; then
- act "The blend is a Dockerfile"
- parsedfile="$($LIBPATH/extra/dockerfile_parse.py "$blend")"
- [[ $? = 0 ]] || { die "Could not parse the Dockerfile" ; exit 1}
- cat > "$R/$(basename ${blend}).blend" << __EOF__
-#!/usr/bin/env zsh
-# Parsed with dockerfile_parse.py
-#
-blend_postinst() {
- fn blend_postinst
- req=(strapdir blend)
- ckreq || return 1
-
- notice "executing blend postinst"
- cat << ___EOF___ | sudo tee \$strapdir/blendpostinst >/dev/null
-${parsedfile}
-___EOF___
-
- chroot-script -d blendpostinst || zerr
-}
-__EOF__
- blendlib="$R/$(basename ${blend}).blend"
- fi
- fi
- fi
-
[[ -f $blendlib ]] || { act "no blend specified" }
source $boardlib && act "$device_name build script loaded"
- source $R/lib/overrides
-
[[ -f $blendlib ]] && {
source $blendlib || zerr
act "$(basename $blend) blend loaded"
