diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/obexftp')
4 files changed, 9 insertions, 5 deletions
diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch index 1f6de87c8d..7a19b6172f 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch +++ b/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch @@ -9,6 +9,8 @@ they are required to be added to link line explicitly. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + apps/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch index 8b73af32e8..23e92885e8 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch +++ b/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch @@ -1,6 +1,6 @@ Signed-off-by: Jun Zhu <R01007@freescale.com> -Upstream-Status: Not applicable +Upstream-Status: Inappropriate [embedded specific] diff -Nru obexftp-0.23/apps.orig/obexftpd.c obexftp-0.23/apps/obexftpd.c --- obexftp-0.23/apps.orig/obexftpd.c 2013-11-08 10:42:20.816631583 +0800 diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch b/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch index 84b143bf51..25f2a7d9e7 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch +++ b/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: obexftp-0.24.2-Source/CMakeLists.txt =================================================================== --- obexftp-0.24.2-Source.orig/CMakeLists.txt diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index b4a914d929..f7a98fb61e 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "A tool for transfer files to/from any OBEX enabled device" -LICENSE = "GPLv2 & PD & LGPLv2.1" +LICENSE = "GPL-2.0-only & PD & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ file://GPL-2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://License.txt;md5=fcbddc3c1debed80dd80da2d3e5f0dc1 \ @@ -23,7 +23,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[fuse] = "-DENABLE_FUSE=ON,-DENABLE_FUSE=OFF,fuse" PACKAGECONFIG[swig] = "-DENABLE_SWIG=ON,-DENABLE_SWIG=OFF,swig" -DEPENDS_remove_class-native = "fuse-native" +DEPENDS:remove:class-native = "fuse-native" S = "${WORKDIR}/${BP}-Source" @@ -32,11 +32,11 @@ EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON \ -DENABLE_RUBY=OFF -DENABLE_TCL=OFF \ " -do_compile_class-native () { +do_compile:class-native () { oe_runmake crctable } -do_install_class-native () { +do_install:class-native () { install -D -m 0755 ${B}/bfb/crctable ${D}${bindir}/crctable } |