diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 22:04:05 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 22:04:05 +0300 |
commit | ae908254d22318b9e27acf6e5e28d1a4ab5e2195 (patch) | |
tree | 0d057ad30ca7f77c7c299762d60929e34ff51ab5 /meta-openembedded/meta-filesystems | |
parent | 67327ddc580cb9a85219a534844832a1682780d4 (diff) | |
parent | 66d661a7f7784d58c8a437f1cdeb0c0ab03f0364 (diff) | |
download | openbmc-ae908254d22318b9e27acf6e5e28d1a4ab5e2195.tar.xz |
Merge tag '0.70' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-filesystems')
-rw-r--r-- | meta-openembedded/meta-filesystems/README | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb (renamed from meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.4.bb (renamed from meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb (renamed from meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb) | 10 | ||||
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb (renamed from meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb) | 2 |
6 files changed, 37 insertions, 9 deletions
diff --git a/meta-openembedded/meta-filesystems/README b/meta-openembedded/meta-filesystems/README index edcf8bfee..78a4429ce 100644 --- a/meta-openembedded/meta-filesystems/README +++ b/meta-openembedded/meta-filesystems/README @@ -30,7 +30,7 @@ When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-filesystems][PATCH + --subject-prefix='meta-filesystems][PATCH' Table of Contents @@ -99,4 +99,3 @@ II. Misc --- xfsprogs --- It provides XFS filesystem utilities. - diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb index 1db328465..2debc6d8b 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/libfuse/sshfs" -SRCREV = "8059e2ce630dd2b984f7a6c44a2b5291b0fe2abc" +SRCREV = "9700b353700589dcc462205c638bcb40219a49c2" S = "${WORKDIR}/git" inherit meson ptest diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.4.bb index 72d0cd3e4..32dab3e35 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.4.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "eb8373f208b05a39702f9f437f6e49caf4b1ace26a9acb68110b49912078560f" +SRC_URI[sha256sum] = "9365b74fd8471caecdb3cc5adf25a821f70a931317ee9103d15bd39089e3590d" S = "${WORKDIR}/fuse-${PV}" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch new file mode 100644 index 000000000..c754f21d0 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch @@ -0,0 +1,27 @@ +From b16373da7e5a45cf92df83b39e2fdee939439c84 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 17 Jul 2021 08:55:42 -0700 +Subject: [PATCH] build: Do not build .sgml file + +It needs docbook-to-man tool which we do not have recipe for + +Upstream-Status: OE-Specific [needs native docbook-to-man tool] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 2becb84..858df00 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,4 +14,4 @@ SUFFIXES = .1 + CLEANFILES = $(man_MANS) + + .sgml.1: +- docbook-to-man $< > $@ ++ @echo "Needs docbook-to-man" +-- +2.32.0 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb index 88d495b68..ec7e7f968 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb @@ -1,12 +1,14 @@ SUMMARY = "Resize FAT partitions using libparted" SECTION = "console/tools" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https" -SRCREV = "3f80afc76ad82d4a1b852a6c8dea24cd9f5e7a24" +SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https \ + file://0001-build-Do-not-build-.sgml-file.patch \ + " +SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483" -PV = "1.0.2-11" +PV = "1.1.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb index 509dbd620..c2d059529 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb @@ -12,7 +12,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ file://0001-support-usrmerge.patch \ " -SRC_URI[sha256sum] = "e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9" +SRC_URI[sha256sum] = "bec44445cf18f49e63971d4f27dc4e90a17b118b852714a1104b621ea30e3507" inherit autotools-brokensep PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" |