From 90ca747aa04f375af7ff86462a52028245b174b9 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 20 Aug 2019 09:15:15 -0400 Subject: meta-openembedded: subtree update: c95842cdca..509d40153d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andreas Müller (13): xfce4-whiskermenu-plugin: upgrade 2.3.2 -> 2.3.3 xfmpc: upgrade 0.2.3 -> 0.3.0 xfce4-cpugraph-plugin: upgrade 1.0.5 -> 1.1.0 xfce4-terminal: upgrase 0.8.7.4 -> 0.8.8 gtksourceview3: upgrade 3.24.10 -> 3.24.11 mousepad: move to gtk3 mousepad: upgrade 0.4.1 -> 0.4.2 ristretto: upgrade 0.8.4 -> 0.10.0 catfish: upgrade 1.4.7 -> 1.4.8 xfce4-datetime-plugin: upgrade 0.7.1 -> 0.8.0 xfce4-places-plugin: 1.8.0 -> 1.8.1 xfce4-pulseaudio-plugin: upgrade 0.4.1 -> 0.4.2 parole: upgrade 1.0.2 -> 1.0.4 Brad Bishop (1): cli11: Remove dev pkg dep to main pkg Kai Kang (1): packagegroup-tools-bluetooth: correct RDEPENDS Khem Raj (8): libopus: Limit forcing ARM mode ISA to v5 only mime-construct,libextutils-parsexs-perl: add runtime dependency on perl webmin: Add perl to rdeps for modules hplip: Add python to rdeps klibc: Disable bcmp builtin for clang on glibc as well python3-blivet: Add python3 to rdeps grubby: Add bash to rdeps ufs-tool: Do not force static linking Martin Jansa (10): nodejs: fix QA error about /usr/bin/python dependency iotop: add runtime dependency on python-core freeradius: add runtime dependency on perl scsirastools: add runtime dependency on bash libcec: add runtime dependency on python3-core dnf-plugin-tui: add runtime dependency on bash edac-utils: add runtime dependency on perl lmsensors: add runtime dependency on bash libdbi-perl: add runtime dependency on perl scsirastools: add runtime dependency on bash II Piotr Tworek (4): telepathy-glib: Update to version 0.24.1 telepathy-glib: Enable vala bindings gnome-themes-standard: Update to version 3.28 libgdata: Update to version 0.17.10. Slater, Joseph (1): php: zlib and zip support Yuan Chao (3): xfsprogs: upgrade 5.1.0 -> 5.2.0 xfsdump: fix error to work with xfsprogs 5.2.0 python-pymongo: upgrade 3.8.0 -> 3.9.0 Change-Id: I9450310b0c5abd766ecd0ee21c9338159b36e940 Signed-off-by: Brad Bishop --- .../recipes-utils/ufs-tool/ufs-tool_git.bb | 5 +- .../files/work-with-new-version-of-xfsprogs.patch | 28 +++++++++ .../recipes-utils/xfsdump/xfsdump_3.1.8.bb | 1 + .../recipes-utils/xfsprogs/xfsprogs_5.1.0.bb | 73 ---------------------- .../recipes-utils/xfsprogs/xfsprogs_5.2.0.bb | 73 ++++++++++++++++++++++ 5 files changed, 106 insertions(+), 74 deletions(-) create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb (limited to 'meta-openembedded/meta-filesystems') diff --git a/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb index e074b51971..208ac3c58b 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/ufs-tool/ufs-tool_git.bb @@ -12,8 +12,11 @@ SRC_URI = "git://github.com/westerndigitalcorporation/ufs-tool.git;protocol=git; S = "${WORKDIR}/git" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}"" +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}/ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch new file mode 100644 index 0000000000..4ce23d7172 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/work-with-new-version-of-xfsprogs.patch @@ -0,0 +1,28 @@ +Make it work with xfsprogs 5.2.0. + +"xfs_fsop_geom_v1_t" has changed to "struct xfs_fsop_geom_v1" +in xfsprogs since version 5.2.0. + +Upstream-Status: Pending + +Signed-off-by: Yuan Chao +--- + common/fs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/fs.c b/common/fs.c +index 60cf0fd..2cc7031 100644 +--- a/common/fs.c ++++ b/common/fs.c +@@ -204,7 +204,7 @@ fs_mounted( char *typs, char *chrs, char *mnts, uuid_t *idp ) + int + fs_getid( char *mnts, uuid_t *idb ) + { +- xfs_fsop_geom_v1_t geo; ++ struct xfs_fsop_geom_v1 geo; + int fd; + + fd = open( mnts, O_RDONLY ); +-- +2.7.4 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb index 54ab30cbbb..0421aa06d4 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb @@ -12,6 +12,7 @@ DEPENDS = "xfsprogs attr" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ file://remove-install-as-user.patch \ + file://work-with-new-version-of-xfsprogs.patch \ " SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb deleted file mode 100644 index 0130fd2274..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.1.0.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" -DEPENDS = "util-linux util-linux-native" -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://remove_flags_from_build_flags.patch \ - file://0001-build-Check-for-sync_file_range-libc-function.patch \ - file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ - file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ - " -SRC_URI[md5sum] = "7199b7aaf088d82fc8a1660ffeb63626" -SRC_URI[sha256sum] = "ca8b4e73dfc5b6227bb6d4e73d019035a1975b83ea41e218cdff15058a9f6c45" - -inherit autotools-brokensep - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" - -DEPENDS += "util-linux" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_${PN}-repair = "${base_sbindir}/xfs_repair" - -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no \ - --enable-scrub=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - ac_cv_header_aio_h=yes \ - ac_cv_lib_rt_lio_listio=yes \ -" - -DISABLE_STATIC = "" -EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" - -PACKAGECONFIG ??= "readline blkid" - -PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" -PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" - -export DEBUG="-DNDEBUG" -export BUILD_VERBOSE="1" -export tagname="CC" - -EXTRA_OEMAKE = "DIST_ROOT='${D}'" - -do_configure () { - export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure - # Recreate configure script. - oe_runmake configure - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -do_install_append() { - oe_runmake 'DESTDIR=${D}' install-dev - rm ${D}${libdir}/*.la - rmdir --ignore-fail-on-non-empty ${D}${libdir} - - ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a - ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so -} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb new file mode 100644 index 0000000000..10d1b70d57 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.0.bb @@ -0,0 +1,73 @@ +SUMMARY = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2 & LGPLv2.1" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" +DEPENDS = "util-linux util-linux-native" +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ + file://remove_flags_from_build_flags.patch \ + file://0001-build-Check-for-sync_file_range-libc-function.patch \ + file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ + file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + " +SRC_URI[md5sum] = "e38032818aa3b1ef224a69b6184fc12a" +SRC_URI[sha256sum] = "e41cdaa43d92b38c8a12ce9cb612ab911ba0e019c2e0762c494a8a601f533fd6" + +inherit autotools-brokensep + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" + +DEPENDS += "util-linux" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_${PN}-repair = "${base_sbindir}/xfs_repair" + +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no \ + --enable-scrub=no \ + INSTALL_USER=root \ + INSTALL_GROUP=root \ + ac_cv_header_aio_h=yes \ + ac_cv_lib_rt_lio_listio=yes \ +" + +DISABLE_STATIC = "" +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" + +PACKAGECONFIG ??= "readline blkid" + +PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" + +export DEBUG="-DNDEBUG" +export BUILD_VERBOSE="1" +export tagname="CC" + +EXTRA_OEMAKE = "DIST_ROOT='${D}'" + +do_configure () { + export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure + # Recreate configure script. + oe_runmake configure + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +do_install_append() { + oe_runmake 'DESTDIR=${D}' install-dev + rm ${D}${libdir}/*.la + rmdir --ignore-fail-on-non-empty ${D}${libdir} + + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so +} -- cgit v1.2.3