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

Merge remote-tracking branch 'thingos/dev' into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-10-23 21:57:49 +03:00
commit 8d76a7b9da
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
board/common/overlay/usr/libexec/list-versions-s3
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# expected final S3 URL: # expected final S3 URL:
# https://s3.amazonaws.com/${bucket}/${path}/${version}/${os_short_name}-${board}-${version}.img.xz # https://{bucket}.s3.amazonaws.com/${path}/${version}/${os_short_name}-${board}-${version}.img.xz
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Usage: $0 <bucket/path>" 1>&2 echo "Usage: $0 <bucket/path>" 1>&2
@ -14,21 +14,21 @@ path=${bucket_path:${#bucket} + 1}
opts="-s -S -f" opts="-s -S -f"
test -n "${FW_USERNAME}" && opts+=" --user ${FW_USERNAME}:${FW_PASSWORD}" test -n "${FW_USERNAME}" && opts+=" --user ${FW_USERNAME}:${FW_PASSWORD}"
url=https://s3.amazonaws.com/${bucket} url="https://${bucket}.s3.amazonaws.com"
xml_result=$(curl ${opts} ${url}) xml_result=$(curl ${opts} "${url}?list-type=2&prefix=${path}")
keys=$(echo "${xml_result}" | grep -oE '<Key>[^<]+<\/Key>' | sed 's/<Key>\(.*\)<\/Key>/\1/') keys=$(echo "${xml_result}" | grep -oE '<Key>[^<]+<\/Key>' | sed 's/<Key>\(.*\)<\/Key>/\1/')
dates=$(echo "${xml_result}" | grep -oE '<LastModified>[^<]+<\/LastModified>' | sed 's/<LastModified>\(.*\)<\/LastModified>/\1/') dates=$(echo "${xml_result}" | grep -oE '<LastModified>[^<]+<\/LastModified>' | sed 's/<LastModified>\(.*\)<\/LastModified>/\1/')
dates=(${dates}) dates=(${dates})
files=$(echo "${keys}" | grep "^${path}/" | sed "s,^${path}\/,," | sed '/^$/d') files=(${keys})
i=0 i=0
for file in ${files}; do for file in ${files[*]}; do
version=$(echo ${file} | cut -d '/' -f 1) version=$(echo ${file:${#path} + 1} | cut -d '/' -f 1)
fname=$(echo ${file} | cut -d '/' -f 2) fname=$(basename ${file})
i=$((i + 1)) i=$((i + 1))
if [[ -z "${fname}" ]]; then if [[ -z "${fname}" ]]; then
continue # version folder continue
fi fi
prerelease=false prerelease=false
@ -44,4 +44,3 @@ for file in ${files}; do
echo "${version}|${prerelease}|${board}|${final_url}|${date}" echo "${version}|${prerelease}|${board}|${final_url}|${date}"
done | sort -t '|' -k 5,3 -r done | sort -t '|' -k 5,3 -r

11
board/odroidxu4/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch Normal file
View File

@ -0,0 +1,11 @@
diff -rupEbwBN linux-custom.org/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c linux-custom/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
--- linux-custom.org/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c 2019-06-19 03:22:19.000000000 +1000
+++ linux-custom/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c 2019-10-22 10:51:38.006560436 +1100
@@ -1067,7 +1066,6 @@ static int vidioc_try_fmt(struct file *f
} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
fmt = find_format(f, MFC_FMT_RAW);
if (!fmt) {
- mfc_err("failed to try output format\n");
return -EINVAL;
}
if ((dev->variant->version_bit & fmt->versions) == 0) {

1
configs/odroidxu4_defconfig
View File

@ -13,6 +13,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/4.14.127-164.tar.gz" BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/4.14.127-164.tar.gz"
BR2_LINUX_KERNEL_PATCH="board/odroidxu4/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch"
BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4" BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4"
BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4" BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"