From 0a6087c60302e94ae95cbe64d99fe2246c97cdb8 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 24 Feb 2023 19:11:58 +0800 Subject: ufs-utils: upgrade 1.9 -> 3.12.3 Drop 0001-Use-asm-type.h-for-kernel-types.patch as it has been merged upstream. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../0001-Use-asm-type.h-for-kernel-types.patch | 65 ---------------------- .../recipes-utils/ufs-utils/ufs-utils_1.9.bb | 32 ----------- .../recipes-utils/ufs-utils/ufs-utils_3.12.3.bb | 31 +++++++++++ 3 files changed, 31 insertions(+), 97 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch delete mode 100644 meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb create mode 100644 meta-filesystems/recipes-utils/ufs-utils/ufs-utils_3.12.3.bb diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch deleted file mode 100644 index 08cf870169..0000000000 --- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils/0001-Use-asm-type.h-for-kernel-types.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 517f841ccac59b0579e706dd768d6c7b1a7e7552 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 12 Mar 2021 10:37:21 -0800 -Subject: [PATCH] Use asm/type.h for kernel types - -This ensures that right headers for types is included otherwise it can -conflict for some platforms e.g. ppc64 where it includes the underlying -files conditionally - -asm/types.h is - -if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) && !defined(__KERNEL__) - include -else - include -endif - -Upstream-Status: Submitted [https://github.com/westerndigitalcorporation/ufs-utils/pull/29] -Signed-off-by: Khem Raj ---- - ufs.h | 1 - - ufs_cmds.h | 2 +- - ufs_ffu.c | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/ufs.h b/ufs.h -index dc51367..0321c54 100644 ---- a/ufs.h -+++ b/ufs.h -@@ -4,7 +4,6 @@ - - #ifndef UFS_H_ - #define UFS_H_ --#include - #include "ioctl.h" - #include "scsi_bsg_util.h" - -diff --git a/ufs_cmds.h b/ufs_cmds.h -index 1e7e24d..5c5b045 100644 ---- a/ufs_cmds.h -+++ b/ufs_cmds.h -@@ -5,7 +5,7 @@ - #define UFS_CMNDS_H_ - - #include "options.h" --#include -+#include - - - enum field_width { -diff --git a/ufs_ffu.c b/ufs_ffu.c -index 2bcec44..99b479c 100644 ---- a/ufs_ffu.c -+++ b/ufs_ffu.c -@@ -12,7 +12,6 @@ - #include - #include - #include --#include - - #include "ufs.h" - #include "ufs_cmds.h" --- -2.30.2 - diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb deleted file mode 100644 index f6aa872fde..0000000000 --- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Tool to access UFS (Universal Flash Storage) devices" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -BRANCH ?= "dev" - -SRCREV = "517c0b01e47d4441cc45be351509fb4c96843d5a" - -SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \ - file://0001-Use-asm-type.h-for-kernel-types.patch \ -" - -UPSTREAM_CHECK_COMMITS = "1" - -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" - diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_3.12.3.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_3.12.3.bb new file mode 100644 index 0000000000..342661c9a5 --- /dev/null +++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_3.12.3.bb @@ -0,0 +1,31 @@ +SUMMARY = "Tool to access UFS (Universal Flash Storage) devices" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +BRANCH ?= "dev" + +SRCREV = "40c0bdfa7f4e922a4bcdf431ef72b321648d2d9f" + +SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \ + " + +UPSTREAM_CHECK_COMMITS = "1" + +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" + -- cgit v1.2.3-54-g00ecf