Merge branch 'dev' into configurable-panic-action

board/common/overlay/sbin/fwupdate

@@ -119,7 +119,7 @@ function do_download() {
     version=$1
 
     if ! [[ "$url" == http* ]]; then  # a version was given
-        url=$(show_versions true | sed -rn '/^'"$version"' http.*\.img\.[a-z]+$/ {; /.*\.xz$/ {;s/^'"$version"' (.*)/\1/ p;q;}; /.*\.gz$/ {;h;b finish;};}; :finish; $ {;x;s/^'"$version"' (.*)/\1/ p;}')
+        url=$(show_versions true | jq -r ". | select(.version==\"$version\") | .url")
     else
         version="custom"
     fi

board/nanopineo/boot-fwupdater.cmd

@@ -0,0 +1,7 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
+
+fatload mmc 0 0x46000000 zImage
+fatload mmc 0 0x47000000 rootfs.cpio.uboot
+fatload mmc 0 0x48000000 sun8i-h3-nanopi-neo.dtb
+
+bootz 0x46000000 0x47000000 0x48000000

board/nanopineo/boot.cmd

@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
+
+fatload mmc 0 0x46000000 zImage
+fatload mmc 0 0x48000000 sun8i-h3-nanopi-neo.dtb
+
+bootz 0x46000000 - 0x48000000

board/nanopineo/mkimage.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+BOARD_DIR=$(dirname $0)
+COMMON_DIR=$BOARD_DIR/../common
+
+export BOARD=$(basename $BOARD_DIR)
+export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
+export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin
+export UBOOT_SEEK=16
+export PART_START=40960
+source $COMMON_DIR/mkimage.sh
+
+

board/nanopineo/os.conf

@@ -0,0 +1,2 @@
+os_tty_login="ttyS0"
+

board/nanopineo/overlay-initramfs/prepare_initramfs

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# we don't have the codepage kernel modules compiled in, so we have to manually insert them
+mkdir /system
+mount /dev/mmcblk1p2 /system
+/system/bin/busybox insmod /system/lib/modules/*/kernel/fs/nls/nls_*.ko
+

board/nanopineo/overlay-initramfs/remove_initramfs

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f /boot/boot-normal.scr ]; then
+    mv /boot/boot.scr /boot/boot-fwupdater.scr
+    mv /boot/boot-normal.scr /boot/boot.scr
+fi

board/nanopineo/overlay/etc/board

@@ -0,0 +1 @@
+nanopineo

board/nanopineo/overlay/etc/fstab.disk

@@ -0,0 +1,4 @@
+# <file system> <mount pt>            <type>   <options>         <dump> <pass>
+/dev/mmcblk1p1  /boot                 vfat     ro,defaults       0      0
+/dev/mmcblk1p3  /data                 ext4     defaults,noatime  0      0
+

board/nanopineo/overlay/etc/init.d/boardsn

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sn=$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d ':')
+echo ${sn: -8}
+

board/nanopineo/overlay/usr/libexec/fw-prepare-boot

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -f /boot/boot-fwupdater.scr ]; then
+    mv /boot/boot.scr /boot/boot-normal.scr
+    mv /boot/boot-fwupdater.scr /boot/boot.scr
+fi
+

board/nanopineo/postscript.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
+$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
+
+cp $IMG_DIR/zImage $BOOT_DIR
+cp $BOARD_DIR/sun8i-h3-nanopi-neo.dtb $BOOT_DIR
+cp $BOARD_DIR/rootfs.cpio.uboot $BOOT_DIR
+

configs/nanopineo_defconfig

@@ -0,0 +1,78 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo"
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_TARGET_TZ_INFO=y
+BR2_ROOTFS_OVERLAY="board/common/overlay board/nanopineo/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/friendlyarm/linux/archive/3f0ec3a78591ef3f0d06c59ae935de76d2c2de9b.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_B43_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y
+BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
+BR2_PACKAGE_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_LIBFUSE=y
+BR2_PACKAGE_LIBCURL=y
+BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCAP=y
+BR2_PACKAGE_PCRE=y
+BR2_PACKAGE_PCRE_UCP=y
+BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CRDA=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NTP=y
+BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_PPPD=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_LOGROTATE=y
+BR2_PACKAGE_TAR=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
+BR2_PACKAGE_NANO=y
+BR2_PACKAGE_HOST_DTC=y
+BR2_PACKAGE_HOST_E2FSPROGS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y

configs/nanopineo_initramfs_defconfig

@@ -0,0 +1,16 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs"
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+# BR2_TARGET_ROOTFS_TAR is not set

package/Config.in

@@ -852,6 +852,7 @@ menu "External python modules"
 	source "package/python-pygments/Config.in"
 	source "package/python-pyicu/Config.in"
 	source "package/python-pyinotify/Config.in"
+	source "package/python-pyjwt/Config.in"
 	source "package/python-pylibftdi/Config.in"
 	source "package/python-pylru/Config.in"
 	source "package/python-pymongo/Config.in"

package/python-pyjwt/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_PYJWT
+	bool "python-pyjwt"
+	help
+	  PyJWT is a Python library which allows you to encode and decode JSON Web Tokens (JWT).
+	  JWT is an open, industry-standard (RFC 7519) for representing claims securely between two parties.
+
+	  https://pyjwt.readthedocs.io/en/latest/

package/python-pyjwt/python-pyjwt.hash

@@ -0,0 +1,2 @@
+md5	2731c6b66b67b95d1944f072f5fa35a9  PyJWT-1.6.4.tar.gz
+sha256	4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176  PyJWT-1.6.4.tar.gz

package/python-pyjwt/python-pyjwt.mk

@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-pyjwt
+#
+################################################################################
+
+PYTHON_PYJWT_VERSION = 1.6.4
+PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz
+PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73
+PYTHON_PYJWT_LICENSE = MIT
+PYTHON_PYJWT_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
+