diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-extended/libimobiledevice | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/libimobiledevice')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch | 51 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch | 21 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb) | 10 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb | 16 |
4 files changed, 20 insertions, 78 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch deleted file mode 100644 index f8114a0634..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 18 Oct 2016 21:31:40 +0000 -Subject: [PATCH] Fix warnings found with clang - -| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type] -| if (!buf) return; -| ^ -| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type] -| if (len <= 0) return; - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libcnary/node.c | 2 +- - src/base64.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libcnary/node.c b/libcnary/node.c -index 1f9f669..d6f3f63 100644 ---- a/libcnary/node.c -+++ b/libcnary/node.c -@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) { - - int node_insert(node_t* parent, unsigned int index, node_t* child) - { -- if (!parent || !child) return; -+ if (!parent || !child) return -1; - child->isLeaf = TRUE; - child->isRoot = FALSE; - child->parent = parent; -diff --git a/src/base64.c b/src/base64.c -index 65c6061..531a06a 100644 ---- a/src/base64.c -+++ b/src/base64.c -@@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da - - unsigned char *base64decode(const char *buf, size_t *size) - { -- if (!buf) return; -+ if (!buf) return 0; - size_t len = strlen(buf); -- if (len <= 0) return; -+ if (len <= 0) return 0; - unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3); - - unsigned char *line; --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch deleted file mode 100644 index f6ef6f4f8b..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001 -From: Nikias Bassen -Date: Mon, 09 Jul 2012 21:17:15 +0000 -Subject: Fix building with parallel build makeopts - ---- -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bad840..155994e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil ) - ADD_SUBDIRECTORY( include ) - ADD_SUBDIRECTORY( test ) - -+ADD_DEPENDENCIES( plist libcnary ) -+ - IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) - ADD_SUBDIRECTORY( swig ) - ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) --- -cgit v0.9.0.2 diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb index f78979619f..43c1fd5cab 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb @@ -6,15 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ DEPENDS = "libxml2 glib-2.0 swig python" -inherit cmake pkgconfig +inherit autotools pkgconfig pythonnative -SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ - file://fix-parallel-make.patch \ - file://0001-Fix-warnings-found-with-clang.patch \ +SRCREV = "62ec804736435fa34e37e66e228e17e2aacee1d7" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \ " -SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" -SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" +S = "${WORKDIR}/git" do_install_append () { if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb new file mode 100644 index 0000000000..36fc5c858c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" + +DEPENDS = "udev libusb1 libplist" + +inherit autotools pkgconfig gitpkgv + +PKGV = "${GITPKGVTAG}" + +SRCREV = "78df9be5fc8222ed53846cb553de9b5d24c85c6c" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${base_libdir}/udev/rules.d/" |