From 1cbd1bc195017312ba8cf670b340f61a2ac6207b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 30 Jun 2017 03:25:24 -0400 Subject: unionfs-fuse: 0.26 -> 2.0 - Fix 0.26's do_compile failure by inheriting cmake and pkgconfig - Update upstream to github Signed-off-by: Hongxu Jia Signed-off-by: Martin Jansa --- .../files/0001-support-cross-compiling.patch | 32 ++++++++++++++++++++++ .../unionfs-fuse/unionfs-fuse_0.26.bb | 19 ------------- .../unionfs-fuse/unionfs-fuse_2.0.bb | 18 ++++++++++++ 3 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch delete mode 100644 meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb create mode 100644 meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb (limited to 'meta-filesystems/recipes-filesystems') diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch b/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch new file mode 100644 index 0000000000..bf363ca1b7 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch @@ -0,0 +1,32 @@ +From 449cec34c123b86b792627553c6ec7471d2ee7ed Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 30 Jun 2017 14:46:51 +0800 +Subject: [PATCH] support cross compiling + +Do not override OE CMAKE variables + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,9 +10,9 @@ IF(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + ENDIF(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + + # Select flags. +-SET(CMAKE_C_FLAGS "-pipe -W -Wall -DFORTIFY_SOURCE=2") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -DFORTIFY_SOURCE=2") + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") +-SET(CMAKE_C_FLAGS_RELEASE "-O2") ++SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2") + SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG") + + if (UNIX AND APPLE) +-- +2.8.1 + diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb deleted file mode 100644 index 25204293ad..0000000000 --- a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A FUSE based implemention of unionfs" -HOMEPAGE = "http://podgorny.cz/moin/UnionFsFuse" -SECTION = "console/network" -LICENSE = "BSD-3-Clause" -DEPENDS = "fuse" -LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8abab00b483a1b7943a32" - -SRC_URI = "http://podgorny.cz/unionfs-fuse/releases/${BP}.tar.xz" - -SRC_URI[md5sum] = "689c636484756f6f7a728ef354cbeac2" -SRC_URI[sha256sum] = "8d5c9dcb51ecb9a9b03890e16d17e37d602b0c1f23ed6a9ddec2b0f719c9f662" - -do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} -} - -RDEPENDS_${PN} += "bash" - -PNBLACKLIST[unionfs-fuse] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130648/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb new file mode 100644 index 0000000000..b89d8db15b --- /dev/null +++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "A FUSE based implemention of unionfs" +HOMEPAGE = "https://github.com/rpodgorny/unionfs-fuse" +SECTION = "console/network" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8abab00b483a1b7943a32 \ + file://LICENSE;md5=7e5a37fce17307066eec6b23546da3b3 \ +" + +SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master \ + file://0001-support-cross-compiling.patch \ +" +SRCREV = "c8d23a9a75f1a62988593671839e8a168a79f3e5" + +DEPENDS = "fuse" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig -- cgit 1.2.3-korg