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

rpi-firmware: post-merge fix

Browse Source
This commit is contained in:
Calin Crisan 2018-11-12 11:40:41 +02:00
parent e4a8de1d55
commit 6cce01fcbb
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/rpi-firmware/rpi-firmware.hash
View File

@ -1,6 +1,3 @@
# Locally computed
<<<<<<< HEAD
sha256 d1f9c58957dfe681fff7e1cf1eabb9e0f6fdc99720f1d059fb24a37750573310 rpi-firmware-5b49caa17e91d0e64024380119ad739bb201c674.tar.gz
=======
sha256 5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055 rpi-firmware-287af2a2be0787a5d45281d1d6183a2161c798d4.tar.gz
>>>>>>> 2018.08.2

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

@ -4,11 +4,7 @@
#
################################################################################
<<<<<<< HEAD
RPI_FIRMWARE_VERSION = 5b49caa17e91d0e64024380119ad739bb201c674
=======
RPI_FIRMWARE_VERSION = 287af2a2be0787a5d45281d1d6183a2161c798d4
>>>>>>> 2018.08.2
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom