Compare commits
10 Commits
03ef5c520a
...
fm7110-6.6
| Author | SHA1 | Date | |
|---|---|---|---|
| bcaecca48e | |||
| de1b84802d | |||
| 6d08298c1d | |||
| 3021de4610 | |||
| 57fca21c99 | |||
| 6eab2560b9 | |||
| 9fea7bb777 | |||
| e803ed7951 | |||
| e9498352a8 | |||
| 4ba3fc2ca7 |
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,32 @@
|
||||
From d408d9c51c77db7988badad79ebfa51a7875b667 Mon Sep 17 00:00:00 2001
|
||||
From: Changhuang Liang <changhuang.liang@starfivetech.com>
|
||||
Date: Wed, 27 Mar 2024 14:56:30 +0800
|
||||
Subject: [PATCH] Distinguish between the GPU and the DC nodes
|
||||
|
||||
Skip /dev/dri/card* node if it GPU node.
|
||||
|
||||
Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com>
|
||||
---
|
||||
src/apps/cam/drm.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/apps/cam/drm.cpp b/src/apps/cam/drm.cpp
|
||||
index 8779a713..a5f865cf 100644
|
||||
--- a/src/apps/cam/drm.cpp
|
||||
+++ b/src/apps/cam/drm.cpp
|
||||
@@ -479,8 +479,10 @@ int Device::openCard()
|
||||
continue;
|
||||
}
|
||||
|
||||
- found = true;
|
||||
- break;
|
||||
+ if (cap) {
|
||||
+ found = true;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
closedir(folder);
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
diff -Nurp libkcapi-1.3.1/apps/kcapi-enc.c libkcapi-1.3.1_new/apps/kcapi-enc.c
|
||||
--- libkcapi-1.3.1/apps/kcapi-enc.c 2021-05-17 20:34:44.000000000 +0800
|
||||
+++ libkcapi-1.3.1_new/apps/kcapi-enc.c 2022-01-13 17:12:03.441098213 +0800
|
||||
@@ -731,78 +731,9 @@ static int set_key(struct kcapi_handle *
|
||||
|
||||
/* Transform password into a key using PBKDF2. */
|
||||
if (passwdptr && passwdlen) {
|
||||
- uint8_t *saltbuf = NULL;
|
||||
- uint32_t saltbuflen = 0;
|
||||
-
|
||||
- dolog(KCAPI_LOG_DEBUG, "password %s", passwdptr);
|
||||
-
|
||||
- /* Determine the number of PBKDF2 iterations. */
|
||||
- if (!opts->pbkdf_iterations) {
|
||||
- opts->pbkdf_iterations =
|
||||
- kcapi_pbkdf_iteration_count(opts->pbkdf_hash, 0);
|
||||
-
|
||||
- dolog(KCAPI_LOG_WARN, "PBKDF2 iterations used: %u",
|
||||
- opts->pbkdf_iterations);
|
||||
- }
|
||||
-
|
||||
- /* Convert the salt hex representation into binary. */
|
||||
- if (opts->salt) {
|
||||
- ret = hex2bin_alloc(opts->salt,
|
||||
- (uint32_t)strlen(opts->salt),
|
||||
- &saltbuf, &saltbuflen);
|
||||
- if (ret)
|
||||
- goto out;
|
||||
- } else {
|
||||
- /* No salt provided, generate a random number. */
|
||||
- struct kcapi_handle *rng;
|
||||
- uint32_t j = 0;
|
||||
-
|
||||
- ret = kcapi_rng_init(&rng, "stdrng", 0);
|
||||
- if (ret)
|
||||
- goto out;
|
||||
- ret = kcapi_rng_seed(rng, NULL, 0);
|
||||
- if (ret) {
|
||||
- kcapi_rng_destroy(rng);
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
- saltbuflen = 32;
|
||||
- saltbuf = malloc(saltbuflen);
|
||||
- if (!saltbuf) {
|
||||
- ret = -ENOMEM;
|
||||
- kcapi_rng_destroy(rng);
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
- while (j < saltbuflen) {
|
||||
- ret = kcapi_rng_generate(rng, saltbuf,
|
||||
- saltbuflen);
|
||||
- if (ret < 0) {
|
||||
- kcapi_rng_destroy(rng);
|
||||
- free(saltbuf);
|
||||
- goto out;
|
||||
- }
|
||||
- j += (uint32_t)ret;
|
||||
- }
|
||||
- kcapi_rng_destroy(rng);
|
||||
-
|
||||
- dolog_bin(KCAPI_LOG_WARN, saltbuf, saltbuflen,
|
||||
- "PBKDF2 salt used");
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * PBKDF2 operation: generate a key from password --
|
||||
- * reading of sizeof(keybuf) implies 256 bit key.
|
||||
- */
|
||||
- ret = kcapi_pbkdf(opts->pbkdf_hash, passwdptr, passwdlen,
|
||||
- saltbuf, saltbuflen, opts->pbkdf_iterations,
|
||||
- keybuf, sizeof(keybuf));
|
||||
- free(saltbuf);
|
||||
- if (ret)
|
||||
- goto out;
|
||||
-
|
||||
have_key = 1;
|
||||
- keybuflen = sizeof(keybuf);
|
||||
+ memcpy(keybuf,passwdptr,passwdlen);
|
||||
+ keybuflen = passwdlen;
|
||||
|
||||
dolog(KCAPI_LOG_VERBOSE,
|
||||
"Data Encryption Key derived from Password using PBKDF2 using %s with %u iterations",
|
||||
@@ -1,6 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 8a08dcbb4d05ede4357cdc9d61c7f2a7f2cd96b7ce2eb41b28e45b2e378267ad libkcapi-1.1.5.tar.xz
|
||||
sha256 6b57946eb87bc9cfa544140b6c9a12ef9eefa0a16695578aebf3395f0a78bede libkcapi-1.3.1.tar.xz
|
||||
sha256 15b550c14165a266fa233b485d029d54508da593dfa6d1731ec5d5a285c716e9 libkcapi-1.5.0.tar.xz
|
||||
sha256 c6b8402a68999b0f84560ab43cdf60f9ff33c4a9a8ced6a40db9d3b787ba5b4a COPYING
|
||||
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2
|
||||
sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBKCAPI_VERSION = 1.3.1
|
||||
LIBKCAPI_VERSION = 1.5.0
|
||||
LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz
|
||||
LIBKCAPI_SITE = http://www.chronox.de/libkcapi
|
||||
LIBKCAPI_AUTORECONF = YES
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
# When updating the version, please also update mesa3d-headers
|
||||
MESA3D_VERSION = 22.1.3
|
||||
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
|
||||
MESA3D_SITE = https://archive.mesa3d.org
|
||||
#MESA3D_SITE = https://archive.mesa3d.org
|
||||
MESA3D_SITE = https://archive.mesa3d.org/older-versions/22.x
|
||||
MESA3D_LICENSE = MIT, SGI, Khronos
|
||||
MESA3D_LICENSE_FILES = docs/license.rst
|
||||
MESA3D_CPE_ID_VENDOR = mesa3d
|
||||
|
||||
@@ -1 +1 @@
|
||||
sha256 ab4720e004502a0ef389c5ad6fd0373cc8c959e7c0eb244f8fb7a28ae750db85 libcamera-apps-ae96f800c39c1a8a27eb390e97ea08062eb925eb-br1.tar.gz
|
||||
sha256 b8e518d3c1e5f69c02a1657acac011504982675cac871bed915f7d39c63804a8 libcamera-apps-d88f3b7c9c199d87180b551016bf894bd5196f09-br1.tar.gz
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
LIBCAMERA_APPS_SITE = https://github.com/starfive-tech/libcamera-apps.git
|
||||
LIBCAMERA_APPS_VERSION = ae96f800c39c1a8a27eb390e97ea08062eb925eb
|
||||
LIBCAMERA_APPS_VERSION = d88f3b7c9c199d87180b551016bf894bd5196f09
|
||||
LIBCAMERA_APPS_SITE_METHOD = git
|
||||
LIBCAMERA_APPS_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking signature with RSA key 0xA8041FA839E16E36
|
||||
# https://strace.io/files/5.18/strace-5.18.tar.xz.asc
|
||||
sha256 60293ea79ac9253d600cdc9be077ad2988ca22284a439c9e66be5150db3d1187 strace-5.18.tar.xz
|
||||
sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING
|
||||
# https://strace.io/files/6.6/strace-6.6.tar.xz.asc
|
||||
sha256 421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c strace-6.6.tar.xz
|
||||
sha256 6e5648c0ed522b163f9df1dc500c73491b1743495bd78388e99685cecfa79707 COPYING
|
||||
sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
STRACE_VERSION = 5.18
|
||||
STRACE_VERSION = 6.6
|
||||
STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
|
||||
STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION)
|
||||
STRACE_LICENSE = LGPL-2.1+
|
||||
|
||||
Reference in New Issue
Block a user