From 8bf88eb572f37eefa7ab700e8f02989f4a5fd9e6 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 21 Feb 2017 20:30:04 +0200 Subject: [PATCH 1/6] add back rpi-armmem --- package/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/Config.in b/package/Config.in index 93b0b107d5..ce22019cdd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -446,6 +446,7 @@ endmenu source "package/read-edid/Config.in" source "package/rfkill/Config.in" source "package/rng-tools/Config.in" + source "package/rpi-armmem/Config.in" source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtl8188eu/Config.in" From 67c7305923eb11ee0bc3e2b7d35dc8eb28cd49ed Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 21 Feb 2017 20:37:08 +0200 Subject: [PATCH 2/6] build.sh: use /etc/version when naming the release file --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index f7e3963b1d..ce552f0348 100755 --- a/build.sh +++ b/build.sh @@ -12,6 +12,7 @@ target=${*:2} cd $(dirname $0) basedir=$(pwd) osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name) +osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version) gzip=$(which pigz || which gzip) if [ "$board" == "all" ]; then @@ -44,10 +45,9 @@ if [ "$target" == "mkimage" ]; then elif [ "$target" == "mkrelease" ]; then $boarddir/mkimage.sh cp $outputdir/images/$osname-$board.img $basedir - date=$(date +%Y%m%d) - mv $basedir/$osname-$board.img $basedir/$osname-$board-$date.img - rm -f $basedir/$osname-$board-$date.img.gz - $gzip $basedir/$osname-$board-$date.img + mv $basedir/$osname-$board.img $basedir/$osname-$board-$osversion.img + rm -f $basedir/$osname-$board-$osversion.img.gz + $gzip $basedir/$osname-$board-$osversion.img elif [ -n "$target" ]; then make O=$outputdir $target else From d3aa564e4ac48bdbd12512a01f1bed1519d27956 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 22 Feb 2017 22:10:24 +0200 Subject: [PATCH 3/6] rpi1: use gcc4.9 as it seems to fix some crashes --- configs/raspberrypi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 6e2a398258..5ac381e0c8 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -6,6 +6,7 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +BR2_GCC_VERSION_4_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_SKELETON_CUSTOM=y From 4cacfaf0032e391207be73c6008aab8b678a1c24 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 25 Feb 2017 11:57:03 +0200 Subject: [PATCH 4/6] add package python-functools32 --- package/python-functools32/Config.in | 7 +++++++ package/python-functools32/python-functools32.mk | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-functools32/Config.in create mode 100644 package/python-functools32/python-functools32.mk diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in new file mode 100644 index 0000000000..acfd0f3b0d --- /dev/null +++ b/package/python-functools32/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_FUNCTOOLS32 + bool "python-functools32" + depends on BR2_PACKAGE_PYTHON + help + Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy. + + https://github.com/MiCHiLU/python-functools32 diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk new file mode 100644 index 0000000000..af2e86526d --- /dev/null +++ b/package/python-functools32/python-functools32.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-functools32 +# +################################################################################ + +PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 +PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz +PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db +PYTHON_FUNCTOOLS32_SETUP_TYPE = setuptools + +$(eval $(python-package)) + From 4c834de7202ce0d84836afa5c6e574aa3c6bca73 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 25 Feb 2017 20:58:04 +0200 Subject: [PATCH 5/6] python-functools32 uses distutils, not setuptools --- package/python-functools32/python-functools32.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-functools32/python-functools32.mk b/package/python-functools32/python-functools32.mk index af2e86526d..1590c51238 100644 --- a/package/python-functools32/python-functools32.mk +++ b/package/python-functools32/python-functools32.mk @@ -7,7 +7,7 @@ PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db -PYTHON_FUNCTOOLS32_SETUP_TYPE = setuptools +PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils $(eval $(python-package)) From 43d373a6dfa08f51eea4e626da7e486c4aa5aa39 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 26 Feb 2017 12:01:50 +0200 Subject: [PATCH 6/6] remove motionEye watch settings from watch.conf --- board/bananapi/kernel.config | 1 - board/common/overlay/etc/watch.conf | 3 --- 2 files changed, 4 deletions(-) diff --git a/board/bananapi/kernel.config b/board/bananapi/kernel.config index 0282da9f11..aece551bab 100644 --- a/board/bananapi/kernel.config +++ b/board/bananapi/kernel.config @@ -29,7 +29,6 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-meye" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y diff --git a/board/common/overlay/etc/watch.conf b/board/common/overlay/etc/watch.conf index 34d46b9089..5876ccc0af 100644 --- a/board/common/overlay/etc/watch.conf +++ b/board/common/overlay/etc/watch.conf @@ -10,6 +10,3 @@ netwatch_retries=3 netwatch_timeout=5 netwatch_interval=20 -#meyewatch_disable="true" -meyewatch_timeout=120 -