From aae237c7912a74ceaa0dbb69919cb545cf936123 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 25 Dec 2017 20:56:39 +0200 Subject: [PATCH 1/3] python-picamera: force detection of raspberrypi --- package/python-picamera/python-picamera.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-picamera/python-picamera.mk b/package/python-picamera/python-picamera.mk index 4de04b8c37..29709f8507 100644 --- a/package/python-picamera/python-picamera.mk +++ b/package/python-picamera/python-picamera.mk @@ -7,6 +7,7 @@ PYTHON_PICAMERA_VERSION = 1.13 PYTHON_PICAMERA_SOURCE = picamera-$(PYTHON_PICAMERA_VERSION).tar.gz PYTHON_PICAMERA_SITE = https://pypi.python.org/packages/79/c4/80afe871d82ab1d5c9d8f0c0258228a8a0ed96db07a78ef17e7fba12fda8 +PYTHON_PICAMERA_ENV = READTHEDOCS=True PYTHON_PICAMERA_SETUP_TYPE = distutils From 99b4f065db25685e6bf09739b32a2b5202180fd8 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 27 Dec 2017 00:44:38 +0200 Subject: [PATCH 2/3] remove bluetooth package selection and make them optional --- configs/bananapi_defconfig | 5 ++--- configs/odroidc2_defconfig | 5 ++--- configs/odroidxu4_defconfig | 5 ++--- configs/pine64_defconfig | 5 ++--- configs/raspberrypi2_defconfig | 5 ++--- configs/raspberrypi3_defconfig | 5 ++--- configs/raspberrypi_defconfig | 5 ++--- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig index 297f5ce3df..29cb6a8fae 100644 --- a/configs/bananapi_defconfig +++ b/configs/bananapi_defconfig @@ -48,6 +48,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_SUNXI_BOARDS=y BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/Bananapi.fex" +BR2_PACKAGE_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y @@ -56,9 +57,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -88,4 +88,3 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DTC=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index 185fd45e70..5c114d0650 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -40,6 +40,7 @@ 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_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y @@ -48,9 +49,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -74,4 +74,3 @@ BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig index 980778b167..85c1153194 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -42,6 +42,7 @@ 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_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y @@ -50,9 +51,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -76,4 +76,3 @@ BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index 4d1608a14b..e55644d62d 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -39,6 +39,7 @@ 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_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y @@ -47,9 +48,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -73,4 +73,3 @@ BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index d9ab983990..4b2fee04d9 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -44,6 +44,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_DBUS=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y @@ -53,9 +54,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -79,4 +79,3 @@ BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index f3ef129e9d..8d62b93e29 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -44,6 +44,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_DBUS=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y @@ -53,9 +54,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -79,4 +79,3 @@ BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 9b2ea1468b..ab02c74cbf 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -46,6 +46,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_DBUS=y BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y @@ -56,9 +57,8 @@ BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y +BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_AUTOSSH=y -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y @@ -82,4 +82,3 @@ BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y -BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y From e8eb7ad9f3623add07c29237b0688fb5dbcd91c0 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 27 Dec 2017 00:59:00 +0200 Subject: [PATCH 3/3] update cleanups.sh --- board/common/cleanups.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh index 2639fe1777..86469d5a0e 100755 --- a/board/common/cleanups.sh +++ b/board/common/cleanups.sh @@ -22,7 +22,6 @@ rm -rf $TARGET/etc/logrotate.d rm -f $TARGET/etc/rc_maps.cfg rm -f $TARGET/etc/udev/hwdb.d/20-pci-vendor-model.hwdb -rm -f $TARGET/etc/motion-dist.conf rm -f $TARGET/etc/hostname rm -f $TARGET/etc/os-release rm -f $TARGET/etc/hostapd.conf @@ -119,16 +118,15 @@ rm -f $TARGET/bin/zmore rm -f $TARGET/bin/znew rm -f $TARGET/bin/gzexe rm -f $TARGET/bin/uncompress -rm -f $TARGET/usr/bin/v4l2-compliance rm -f $TARGET/usr/bin/slogin rm -f $TARGET/usr/bin/ssh-keyscan rm -f $TARGET/usr/bin/ssh-add rm -f $TARGET/usr/bin/ssh-agent +rm -f $TARGET/usr/bin/xmllint rm -f $TARGET/usr/libexec/ssh-keysign rm -f $TARGET/usr/libexec/ssh-pkcs11-helper rm -f $TARGET/usr/libexec/rmt -rm -rf $TARGET/libexec # samba4 unneeded stuff rm -f $TARGET/usr/bin/cifsdd @@ -136,6 +134,7 @@ rm -f $TARGET/usr/bin/containers_* rm -f $TARGET/usr/bin/ctdb* rm -f $TARGET/usr/bin/dbwrap_tool rm -f $TARGET/usr/bin/eventlogadm +rm -f $TARGET/usr/bin/event_rpcgen.py rm -f $TARGET/usr/bin/gentest rm -f $TARGET/usr/bin/ldb* rm -f $TARGET/usr/bin/locktest @@ -153,6 +152,7 @@ rm -f $TARGET/usr/bin/ping_pong rm -f $TARGET/usr/bin/profiles rm -f $TARGET/usr/bin/reg* rm -f $TARGET/usr/bin/rpcclient +rm -f $TARGET/usr/bin/samba-regedit rm -f $TARGET/usr/bin/sharesec rm -f $TARGET/usr/bin/smbcacls rm -f $TARGET/usr/bin/smbcontrol @@ -167,17 +167,30 @@ rm -f $TARGET/usr/bin/smnotify rm -f $TARGET/usr/bin/tdb* rm -f $TARGET/usr/bin/testparm rm -f $TARGET/usr/bin/wbinfo -rm -f $TARGET/usr/sbin/ctdb* rm -f $TARGET/usr/sbin/winbindd -rm -f $TARGET/usr/share/perl5 +rm -rf $TARGET/usr/share/ctdb # useless mongodb binaries rm -f $TARGET/usr/bin/mongos rm -f $TARGET/usr/bin/mongoperf +# v4l-utils +rm -f $TARGET/usr/bin/cec-compliance +rm -f $TARGET/usr/bin/cec-ctl +rm -f $TARGET/usr/bin/cec-follower +rm -f $TARGET/usr/bin/dvb-fe-tool +rm -f $TARGET/usr/bin/dvb-format-convert +rm -f $TARGET/usr/bin/dvbv5-daemon +rm -f $TARGET/usr/bin/dvbv5-scan +rm -f $TARGET/usr/bin/dvbv5-zap +rm -f $TARGET/usr/bin/media-ctl +rm -f $TARGET/usr/bin/rds-ctl +rm -f $TARGET/usr/bin/v4l2-compliance + # unused python folders rm -rf $TARGET/usr/lib/python2.7/site-packages/samba/ rm -rf $TARGET/usr/lib/python2.7/ensurepip/ +rm -rf $TARGET/usr/lib/python2.7/config/ # buildroot default startup scripts rm -f $TARGET/etc/init.d/S01logging