jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Calin Crisan 2017-08-27 14:14:28 +03:00
commit 63e3262d22
36 changed files with 143 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/common/cleanups.sh
View File

@ -5,7 +5,7 @@ if [ -z "$TARGET" ]; then
exit 1
fi
rm -f $TARGET/boot/.gitkeep
find $TARGET -name '.empty' | xargs -r rm
# /etc stuff
rm -rf $TARGET/etc/network/

0
board/common/overlay/etc/adminpasswd.d/.empty Normal file
View File

5
board/common/overlay/etc/adminpasswd.d/samba Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
mkdir -p /var/lib/samba/private
echo -e "$PASSWORD\n$PASSWORD\n" | /usr/bin/smbpasswd -a admin -s > /dev/null

13
board/common/overlay/etc/init.d/S00datapart
View File

@ -43,15 +43,16 @@ case "$1" in
test $? == 0 && msg_done || msg_fail
msg_begin "Creating required data files"
mkdir /data/etc
mkdir /data/log
mkdir -m 775 /data/media
mkdir -m 775 /data/output
cp -pur /usr/share/dataskel/* /data
cp /etc/version /data/etc/version
ln -s /usr/share/zoneinfo/UTC /data/etc/localtime
touch /data/etc/adjtime
sync
msg_done
msg_begin "Setting empty root password"
PASSWORD="" adminpasswd
msg_done
# mount other partitions depending on data
mount -T /etc/fstab.disk -a
@ -67,5 +68,5 @@ case "$1" in
exit 1
esac
exit $?
# always exit with a successful status
exit 0

2
board/common/overlay/etc/init.d/S04syslog
View File

@ -9,7 +9,7 @@ case "$1" in
msg_begin "Starting syslogd"
syslogd
test $? == 0 && msg_done || msg_fail
echo "---- booting $os_name $os_version----" >> $dmesg_log
echo "---- booting $os_name $os_version ----" >> $dmesg_log
dmesg -T -w >> $dmesg_log &
;;

48
board/common/overlay/etc/init.d/S21passwd
View File

@ -1,48 +0,0 @@
#!/bin/bash
test -n "$os_version" || source /etc/init.d/base
case "$1" in
start)
# make sure root and admin users exist in shadow file
touch /data/etc/shadow
chmod go-rwx /data/etc/shadow
if ! grep root /data/etc/shadow &>/dev/null; then
echo 'root::::::::' >> /data/etc/shadow
fi
if ! grep admin /data/etc/shadow &>/dev/null; then
echo 'admin::::::::' >> /data/etc/shadow
fi
# remove shadow backups
rm -f /data/etc/shadow+
rm -f /data/etc/shadow-
if [ -x /etc/init.d/adminpw ]; then
# set root and admin passwords (admin is just an alias for root)
password=$(/etc/init.d/adminpw)
msg_begin "Setting root password"
echo -en "$password\n$password\n" | passwd &>/dev/null # root
echo -en "$password\n$password\n" | passwd admin &>/dev/null # admin
sed -r -i 's/root:([^:]+):[[:digit:]]+:/root:\1::/' /data/etc/shadow # removes pwd expiration
sed -r -i 's/admin:([^:]+):[[:digit:]]+:/admin:\1::/' /data/etc/shadow # removes pwd expiration
msg_done
fi
sync
;;
stop)
true
;;
*)
echo "Usage: $0 {start}"
exit 1
esac
exit $?

3
board/common/overlay/etc/init.d/S35wifi
View File

@ -32,6 +32,9 @@ fi
test -f $conf || exit 0
# we want only Unix newlines here
sed -i 's/\r//g' $conf
ssid=$(cat $conf | grep ssid | grep -v scan_ssid | cut -d '"' -f 2)
test -n "$ssid" || exit 0

6
board/common/overlay/etc/init.d/S37bluetooth
View File

@ -18,9 +18,13 @@ test -n "$os_version" || source /etc/init.d/base
hci=hci0
bluetoothd=/usr/libexec/bluetooth/bluetoothd
run_conf="/var/lib/bluetooth.conf"
data_dir=/var/lib/bluetooth
run_data_dir=/data/bluetooth
run_conf=/var/lib/bluetooth.conf
configure() {
mkdir -p $run_data_dir
ln -sf $run_data_dir $data_dir
cp $conf $run_conf
# if no specific name configured, use hostname

6
board/common/overlay/etc/init.d/S62smb
View File

@ -8,15 +8,9 @@ test -n "$os_debug" || source /etc/init.d/conf
test "$os_networkless" == "true" && exit 0
start() {
msg_begin "Setting smb admin password"
mkdir -p /var/log/samba
mkdir -p /var/lib/samba/private
password=$(/etc/init.d/adminpw)
echo -e "$password\n$password\n" | /usr/bin/smbpasswd -a admin -s > /dev/null
test $? == 0 && msg_done || msg_fail
msg_begin "Starting smbd"
smbd -D
test $? == 0 && msg_done || msg_fail

6
board/common/overlay/etc/init.d/adminpw
View File

@ -1,6 +0,0 @@
#!/bin/bash
if [ -f /data/etc/motion.conf ]; then
cat /data/etc/motion.conf | grep admin_password | grep -v _hash | cut -d ' ' -f 3-
fi

2
board/common/overlay/etc/init.d/rcS
View File

@ -1,7 +1,7 @@
#!/bin/sh
boot_log=/var/log/boot.log
tmp_boot_log=/tmp/boot.log
tmp_boot_log=/tmp/_boot.log
pid_file=/tmp/rc.pid
source /etc/init.d/base

1
board/common/overlay/etc/motioneye.conf
View File

@ -21,4 +21,5 @@ enable_update true
smtp_timeout 60
zip_timeout 500
add_remove_cameras true
password_hook /usr/libexec/meyepasswd

2
board/common/overlay/etc/samba/smb.conf
View File

@ -12,8 +12,6 @@
printing = bsd
printcap name = /dev/null
disable spoolss = yes
bind interfaces only = yes
interfaces = eth0 wlan0
log level = 0
syslog = 0
preferred master = no

2
board/common/overlay/etc/version
View File

@ -1,4 +1,4 @@
os_name="motionEyeOS"
os_short_name="motioneyeos"
os_prefix="meye"
os_version="20170710"
os_version="20170827"

5
board/common/overlay/usr/libexec/meyepasswd Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
test "$MEYE_USERNAME" == "admin" || exit 0
PASSWORD="$MEYE_PASSWORD" /usr/sbin/adminpasswd

38
board/common/overlay/usr/sbin/adminpasswd Executable file
View File

@ -0,0 +1,38 @@
#!/bin/bash
# we verify the presence of the PASSWORD variable using env,
# as it can also have an empty string value
if ! env | grep PASSWORD &>/dev/null; then
echo "You must set the PASSWORD environment variable."
exit 1
fi
# make sure root and admin users exist in shadow file
touch /data/etc/shadow
chmod go-rwx /data/etc/shadow
if ! grep root /data/etc/shadow &>/dev/null; then
echo 'root::::::::' >> /data/etc/shadow
fi
if ! grep admin /data/etc/shadow &>/dev/null; then
echo 'admin::::::::' >> /data/etc/shadow
fi
# remove shadow backups
rm -f /data/etc/shadow+
rm -f /data/etc/shadow-
# set root and admin passwords (admin is just an alias for root)
echo -en "$PASSWORD\n$PASSWORD\n" | passwd &>/dev/null # root
echo -en "$PASSWORD\n$PASSWORD\n" | passwd admin &>/dev/null # admin
sed -r -i 's/root:([^:]+):[[:digit:]]+:/root:\1::/' /data/etc/shadow # removes pwd expiration
sed -r -i 's/admin:([^:]+):[[:digit:]]+:/admin:\1::/' /data/etc/shadow # removes pwd expiration
# call admin password hooks in /etc/adminpasswd.d
if [ -d /etc/adminpasswd.d ]; then
for script in /etc/adminpasswd.d/*; do
test -x $script && $script
done
fi

0
board/common/overlay/usr/share/dataskel/etc/.empty Normal file
View File

0
board/common/overlay/usr/share/dataskel/log/.empty Normal file
View File

0
board/common/overlay/usr/share/dataskel/media/.empty Normal file
View File

0
board/common/overlay/usr/share/dataskel/output/.keep Normal file
View File

0
board/common/overlay/usr/share/dataskel/varlib/.empty Normal file
View File

5
board/common/overlay/usr/share/post-upgrade/20170827.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
# add password_hook motioneye setting
grep password_hook /data/etc/motioneye.conf &>/dev/null || echo -e 'password_hook /usr/libexec/meyepasswd' >> /data/etc/motioneye.conf

4
board/common/postscript.sh
View File

@ -11,7 +11,7 @@ mkdir -p $BOOT_DIR
test -x $BOARD_DIR/postscript.sh && $BOARD_DIR/postscript.sh
# transform /var contents into symlinks
# transform /var contents as needed
rm -rf $TARGET/var/cache
rm -rf $TARGET/var/lib
rm -rf $TARGET/var/lock
@ -21,7 +21,7 @@ rm -rf $TARGET/var/spool
rm -rf $TARGET/var/tmp
ln -s /tmp $TARGET/var/cache
ln -s /tmp $TARGET/var/lib
ln -s /data/varlib $TARGET/var/lib
ln -s /tmp $TARGET/var/lock
ln -s /data/log $TARGET/var/log
ln -s /tmp $TARGET/var/run

5
configs/bananapi_defconfig
View File

@ -78,6 +78,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -90,8 +91,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

4
configs/odroidc1_defconfig
View File

@ -24,7 +24,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc1/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/hardkernel/linux/archive/647316d8199babad4cd22309849842e035494f2b.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/395190984bce09f63b93a7f71bcf362a72ec8018.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="odroidc"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@ -71,6 +71,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_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_HASHLIB=y
@ -82,6 +83,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y

7
configs/odroidc2_defconfig
View File

@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/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/hardkernel/linux/archive/1b4fefdf20a84b17d5b666c0686a12a29adcb848.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/6ead4210bf3235f0c11526afd1c077a07c5d1478.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2"
@ -70,6 +70,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -82,8 +83,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

7
configs/odroidxu4_defconfig
View File

@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidxu4/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/hardkernel/linux/archive/d3d2fb3a7aa850aea3033b6b342d28dba1a4499f.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/de1a48357a7b9cff8ba07176fc9b8aac632f8ff6.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="odroidxu3"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
@ -72,6 +72,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -84,8 +85,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

5
configs/pine64_defconfig
View File

@ -69,6 +69,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -81,8 +82,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

15
configs/pine64_initramfs_defconfig Normal file
View File

@ -0,0 +1,15 @@
BR2_aarch64=y
BR2_DL_DIR="$(TOPDIR)/.download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-pine64-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/pine64/overlay-initramfs"
BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
BR2_TARGET_ROOTFS_CPIO=y
BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
# BR2_TARGET_ROOTFS_TAR is not set

7
configs/raspberrypi2_defconfig
View File

@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/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/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"
@ -78,6 +78,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -90,8 +91,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

7
configs/raspberrypi3_defconfig
View File

@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/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/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
@ -78,6 +78,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -90,8 +91,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

8
configs/raspberrypi_defconfig
View File

@ -5,7 +5,6 @@ BR2_CCACHE=y
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"
@ -16,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/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/raspberrypi/linux/archive/04c8e47067d4873c584395e5cb260b4f170a99ea.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
@ -81,6 +80,7 @@ BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_NETTLE=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_JPEG=y
@ -94,8 +94,10 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y

2
package/motioneye/motioneye.mk
View File

@ -4,7 +4,7 @@
#
#############################################################
MOTIONEYE_VERSION = 488081061dee4f5692bfd3f62b39f7bb3db772b2
MOTIONEYE_VERSION = 9d546ec1aa8da1fe27ad5c0ad212bdb2baf8dce1
MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
MOTIONEYE_LICENSE = GPLv3

15
package/pulseaudio/pulseaudio.mk
View File

@ -31,7 +31,6 @@ PULSEAUDIO_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
$(if $(BR2_PACKAGE_DBUS),dbus) \
$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
$(if $(BR2_PACKAGE_FFTW),fftw) \
$(if $(BR2_PACKAGE_SYSTEMD),systemd)
@ -80,6 +79,20 @@ else
PULSEAUDIO_CONF_OPTS += --without-soxr
endif
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy)
PULSEAUDIO_CONF_OPTS += --enable-bluez4
PULSEAUDIO_DEPENDENCIES += bluez_utils sbc
else
PULSEAUDIO_CONF_OPTS += --disable-bluez4
endif
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy)
PULSEAUDIO_CONF_OPTS += --enable-bluez5
PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc
else
PULSEAUDIO_CONF_OPTS += --disable-bluez5
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
PULSEAUDIO_CONF_OPTS += --enable-udev
PULSEAUDIO_DEPENDENCIES += udev

2
package/rpi-firmware/rpi-firmware.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RPI_FIRMWARE_VERSION = b51046a2b2bb69771579a549d157205d9982f858
RPI_FIRMWARE_VERSION = b2420fc150ae4616f5d9ec24bdaedc630586a529
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3c
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

2
package/rpi-userland/rpi-userland.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RPI_USERLAND_VERSION = cdb5da59f939eb4078e90ed0e3c231c498ba9957
RPI_USERLAND_VERSION = 3caf0cd4a61f46b71eff49422c36e1cd2727ab45
RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
RPI_USERLAND_LICENSE = BSD-3c
RPI_USERLAND_LICENSE_FILES = LICENCE