Skip to contentSkip to conversation

libimobiledevice: update to 1.3.0

PATCH In review Oleksandr Kravchuk 2 participants 5 messages Jul 25, 2020 – Jul 27, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 libimobiledevice: update to 1.3.0

Patch was removed as the issue it was fixing was solved in this version of the library.

---
 .../files/configure-fix-largefile.patch       | 38 -------------------
 ...evice_git.bb => libimobiledevice_1.3.0.bb} | 11 ++----
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch
 rename meta-oe/recipes-connectivity/libimobiledevice/{libimobiledevice_git.bb => libimobiledevice_1.3.0.bb} (61%)
meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch deleted +0 -38
deleted file mode 100644
index 679a8b597a..0000000000
@@ -1,38 +0,0 @@
-Fix configure error in large file checks on 64-bit architectures
-
- configure:17888: checking for native large file support
- configure:17891: error: in `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/libimobiledevice/1.1.4-r0/libimobiledevice-1.1.4':
- configure:17893: error: cannot run test program while cross compiling
-
-configure.ac was using AC_SYS_LARGEFILE macro as is typical, but then
-there was an extra runtime check added beyond that:
-check if off_t is 8 bytes (64 bits) long.
-If that runtime check passed, _FILE_OFFSET_BITS was defined as 64.
-
-Runtime checks need to go away for cross compiling, and luckily this extra
-check was not serving any useful purpose. Note that off_t was *already*
-64 bits, *without* setting _FILE_OFFSET_BITS, which makes _FILE_OFFSET_BITS
-unneeded for large file support. 
-
-If AC_SYS_LARGEFILE macro sets ac_cv_sys_file_offset_bits=no,
-just leave _FILE_OFFSET_BITS undefined!
-
---- libimobiledevice-1.1.4/configure.ac.old	2015-07-15 01:38:50.900143927 -0700
-+++ libimobiledevice-1.1.4/configure.ac	2015-07-15 01:39:13.300144430 -0700
-@@ -174,16 +174,6 @@
- if test "$enable_largefile" != no; then
-     if test "$ac_cv_sys_file_offset_bits" != 'no'; then
- 	LFS_CFLAGS="$LFS_CFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
--    else
--	AC_MSG_CHECKING(for native large file support)
--	AC_RUN_IFELSE([AC_LANG_SOURCE([#include <unistd.h>
--	  int main (int argc, char **argv)
--	  {
--	      exit(!(sizeof(off_t) == 8));
--	  }])],
--	[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
--	 AC_MSG_RESULT(yes)],
--	[AC_MSG_RESULT(no)])
-     fi
-     if test "$ac_cv_sys_large_files" != 'no'; then
- 	LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES=1"
meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb renamed from meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb +3 -8
similarity index 61%
rename from meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
rename to meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb
index 908b98d8c5..bcedd6297e 100644
@@ -4,17 +4,12 @@ LIC_FILES_CHKSUM = "\
     file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
     file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \
 "
-
-HOMEPAGE ="http://www.libimobiledevice.org/"
+HOMEPAGE = "http://www.libimobiledevice.org/"
 
 DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt"
 
-SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0"
-PV = "1.2.0+git${SRCPV}"
-SRC_URI = "\
-    git://github.com/libimobiledevice/libimobiledevice;protocol=https \
-    file://configure-fix-largefile.patch \
-"
+SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566"
+SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https"
 
 S = "${WORKDIR}/git"
 inherit autotools pkgconfig
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/4 libusbmuxd: update to 2.0.2

---
 .../libimobiledevice/{libusbmuxd_git.bb => libusbmuxd_2.0.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/libimobiledevice/{libusbmuxd_git.bb => libusbmuxd_2.0.2.bb} (89%)
meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb renamed from meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb +1 -1
similarity index 89%
rename from meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
rename to meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb
index 36fc5c858c..343d0bc63f 100644
@@ -8,7 +8,7 @@ inherit autotools pkgconfig gitpkgv
 
 PKGV = "${GITPKGVTAG}"
 
-SRCREV = "78df9be5fc8222ed53846cb553de9b5d24c85c6c"
+SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/4 libplist: update to 2.2.0

In reply to Oleksandr Kravchuk
---
 .../{libplist_2.1.0.bb => libplist_2.2.0.bb}   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-extended/libimobiledevice/{libplist_2.1.0.bb => libplist_2.2.0.bb} (70%)
meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb renamed from meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb +9 -9
similarity index 70%
rename from meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb
rename to meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb
index 36659e752d..408fa8ac0e 100644
@@ -1,5 +1,5 @@
 SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML"
-
+HOMEPAGE = "https://github.com/libimobiledevice/libplist"
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
                     file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7"
@@ -8,9 +8,8 @@ DEPENDS = "libxml2 glib-2.0 swig python3"
 
 inherit autotools pkgconfig python3native
 
-SRCREV = "3df02d4d0e9008771e8622fdc10de8333b3f0d85"
-SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \
-           "
+SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd"
+SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https"
 
 S = "${WORKDIR}/git"
 
@@ -20,10 +19,11 @@ do_install_append () {
     fi
 }
 
-PACKAGES =+ "${PN}-utils ${PN}++ ${PN}-python"
-FILES_${PN} = "${libdir}/libplist${SOLIBS}"
-FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}"
+PACKAGES =+ "${PN}-utils \
+             ${PN}++ \
+             ${PN}-python"
+
+FILES_${PN} = "${libdir}/libplist-2.0${SOLIBS}"
+FILES_${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}"
 FILES_${PN}-utils = "${bindir}/*"
 FILES_${PN}-python = "${libdir}/python*/site-packages/*"
-
-
Signature · 1 line
2.25.1
#3 lore raw

Re: [oe] [PATCH][meta-oe 3/4] libplist: update to 2.2.0

this fails ifuse build https://errors.yoctoproject.org/Errors/Details/424949/

Quoted 54 lines · Oleksandr Kravchuk
---
 .../{libplist_2.1.0.bb => libplist_2.2.0.bb}   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-extended/libimobiledevice/{libplist_2.1.0.bb => libplist_2.2.0.bb} (70%)
meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb renamed from meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb +9 -10
similarity index 70%
rename from meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb
rename to meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb
index 36659e752d..408fa8ac0e 100644
@@ -1,5 +1,5 @@
 SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML"
-
+HOMEPAGE = "https://github.com/libimobiledevice/libplist"
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
                     file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7"
@@ -8,9 +8,8 @@ DEPENDS = "libxml2 glib-2.0 swig python3"
 
 inherit autotools pkgconfig python3native
 
-SRCREV = "3df02d4d0e9008771e8622fdc10de8333b3f0d85"
-SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \
-           "
+SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd"
+SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https"
 
 S = "${WORKDIR}/git"
 
@@ -20,10 +19,11 @@ do_install_append () {
     fi
 }
 
-PACKAGES =+ "${PN}-utils ${PN}++ ${PN}-python"
-FILES_${PN} = "${libdir}/libplist${SOLIBS}"
-FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}"
+PACKAGES =+ "${PN}-utils \
+             ${PN}++ \
+             ${PN}-python"
+
+FILES_${PN} = "${libdir}/libplist-2.0${SOLIBS}"
+FILES_${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}"
 FILES_${PN}-utils = "${bindir}/*"
 FILES_${PN}-python = "${libdir}/python*/site-packages/*"
-
-
--

2.25.1

#4 lore raw

PATCH 4/4 usbmuxd: update to 1.1.1

In reply to Oleksandr Kravchuk
---
 .../usbmuxd/{usbmuxd_git.bb => usbmuxd_1.1.1.bb}               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-connectivity/usbmuxd/{usbmuxd_git.bb => usbmuxd_1.1.1.bb} (85%)
meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb renamed from meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +2 -1
similarity index 85%
rename from meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
rename to meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb
index 7284234326..3860fd8b99 100644
@@ -1,4 +1,5 @@
 DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch."
+HOMEPAGE = "https://github.com/libimobiledevice/usbmuxd"
 LICENSE = "GPLv3 & GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \
                     file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504"
@@ -9,7 +10,7 @@ inherit autotools pkgconfig gitpkgv systemd
 
 PKGV = "${GITPKGVTAG}"
 
-SRCREV = "ee85938c21043ef5f7cd4dfbc7677f385814d4d8"
+SRCREV = "79c8b38d1488a6b07e1e68f39d8caec3f1a45622"
 SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1