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-connectivity/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-connectivity/libimobiledevice')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch | 31 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb (renamed from meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb) | 13 |
2 files changed, 6 insertions, 38 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch deleted file mode 100644 index 9a7895fd4..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix link error with gcc 5 toolchains - - afc.c:258: error: undefined reference to 'debug_buffer' - collect2: error: ld returned 1 exit status - -debug.h header was declaring things inline without providing a definition. -Files that included this header then failed to link against the corresponding -external symbol in debug.c, because the linker took the 'inline' keyword -seriously rather than ignoring it. - ---- libimobiledevice-1.1.4/src/debug.h.orig 2015-10-03 16:24:08.758740386 -0700 -+++ libimobiledevice-1.1.4/src/debug.h 2015-10-03 16:24:22.706740355 -0700 -@@ -44,14 +44,14 @@ - #define debug_plist(a) - #endif - --LIBIMOBILEDEVICE_INTERNAL inline void debug_info_real(const char *func, -+LIBIMOBILEDEVICE_INTERNAL void debug_info_real(const char *func, - const char *file, - int line, - const char *format, ...); - --LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer(const char *data, const int length); --LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer_to_file(const char *file, const char *data, const int length); --LIBIMOBILEDEVICE_INTERNAL inline void debug_plist_real(const char *func, -+LIBIMOBILEDEVICE_INTERNAL void debug_buffer(const char *data, const int length); -+LIBIMOBILEDEVICE_INTERNAL void debug_buffer_to_file(const char *file, const char *data, const int length); -+LIBIMOBILEDEVICE_INTERNAL void debug_plist_real(const char *func, - const char *file, - int line, - plist_t plist); diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb index 32aca96fd..908b98d8c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -7,17 +7,16 @@ LIC_FILES_CHKSUM = "\ HOMEPAGE ="http://www.libimobiledevice.org/" -DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt" +DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" -SRC_URI = " \ - http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \ +SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0" +PV = "1.2.0+git${SRCPV}" +SRC_URI = "\ + git://github.com/libimobiledevice/libimobiledevice;protocol=https \ file://configure-fix-largefile.patch \ - file://inline-without-definition.patch \ " -SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183" -SRC_URI[sha256sum] = "67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8" - +S = "${WORKDIR}/git" inherit autotools pkgconfig EXTRA_OECONF = " --without-cython " |