mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
ufs-utils: Renames from ufs-tool
Add a patch to fix build with musl/mips64 Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,23 +0,0 @@
|
|||||||
SUMMARY = "Tool to access UFS (Universal Flash Storage) devices"
|
|
||||||
LICENSE = "GPLv2"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
|
|
||||||
|
|
||||||
PV = "1.3+git${SRCPV}"
|
|
||||||
|
|
||||||
BRANCH ?= "dev"
|
|
||||||
|
|
||||||
SRCREV = "8b00e33003b57d7071943f63863fcf8cc48d5be9"
|
|
||||||
|
|
||||||
SRC_URI = "git://github.com/westerndigitalcorporation/ufs-tool.git;protocol=git;branch=${BRANCH}"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}""
|
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
sed -i -e "s|-static$||g" ${S}/Makefile
|
|
||||||
}
|
|
||||||
do_install() {
|
|
||||||
install -d ${D}${bindir}/
|
|
||||||
install -c -m 755 ${S}/ufs-tool ${D}${bindir}/
|
|
||||||
}
|
|
||||||
+54
@@ -0,0 +1,54 @@
|
|||||||
|
From 6cf6f5b9c39dfd0d46f2069c3baeab92ae980367 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sun, 15 Dec 2019 00:58:13 -0800
|
||||||
|
Subject: [PATCH] Replace u_intXX_t with kernel typedefs
|
||||||
|
|
||||||
|
u_intXX_t requires including sys/types.h which might not work in kernel
|
||||||
|
code, if this header is used in a kernel module
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
| In file included from ufs.c:16:
|
||||||
|
| In file included from ./ufs.h:9:
|
||||||
|
| ./scsi_bsg_util.h:131:2: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
|
||||||
|
| u_int16_t result;
|
||||||
|
| ^~~~~~~~~
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/westerndigitalcorporation/ufs-utils/pull/23]
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
scsi_bsg_util.h | 18 +++++++++---------
|
||||||
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scsi_bsg_util.h b/scsi_bsg_util.h
|
||||||
|
index 3f8a482..497c3ae 100644
|
||||||
|
--- a/scsi_bsg_util.h
|
||||||
|
+++ b/scsi_bsg_util.h
|
||||||
|
@@ -121,15 +121,15 @@ struct ufs_bsg_reply {
|
||||||
|
#endif /* SCSI_BSG_UFS_H.*/
|
||||||
|
|
||||||
|
struct rpmb_frame {
|
||||||
|
- u_int8_t stuff[196];
|
||||||
|
- u_int8_t key_mac[32];
|
||||||
|
- u_int8_t data[256];
|
||||||
|
- u_int8_t nonce[16];
|
||||||
|
- u_int32_t write_counter;
|
||||||
|
- u_int16_t addr;
|
||||||
|
- u_int16_t block_count;
|
||||||
|
- u_int16_t result;
|
||||||
|
- u_int16_t req_resp;
|
||||||
|
+ __u8 stuff[196];
|
||||||
|
+ __u8 key_mac[32];
|
||||||
|
+ __u8 data[256];
|
||||||
|
+ __u8 nonce[16];
|
||||||
|
+ __u32 write_counter;
|
||||||
|
+ __u16 addr;
|
||||||
|
+ __u16 block_count;
|
||||||
|
+ __u16 result;
|
||||||
|
+ __u16 req_resp;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define BSG_REPLY_SZ (sizeof(struct ufs_bsg_reply))
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
SUMMARY = "Tool to access UFS (Universal Flash Storage) devices"
|
||||||
|
LICENSE = "GPLv2"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
|
||||||
|
|
||||||
|
PV = "1.6+git${SRCPV}"
|
||||||
|
|
||||||
|
BRANCH ?= "dev"
|
||||||
|
|
||||||
|
SRCREV = "a3cf93b66f4606a46354cf884d24aa966661f848"
|
||||||
|
|
||||||
|
SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=git;branch=${BRANCH} \
|
||||||
|
file://0001-Replace-u_intXX_t-with-kernel-typedefs.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}""
|
||||||
|
|
||||||
|
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__ -D_GNU_SOURCE"
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
sed -i -e "s|-static$||g" ${S}/Makefile
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
install -D -m 755 ${S}/ufs-utils ${D}${bindir}/ufs-utils
|
||||||
|
}
|
||||||
|
|
||||||
|
PROVIDES += "ufs-tool"
|
||||||
|
|
||||||
|
RPROVIDES_${PN} += "ufs-tool"
|
||||||
|
|
||||||
Reference in New Issue
Block a user