Upgrade lsof, libical, lsbinitscripts
v2 cover Upgrade lsof, libical, lsbinitscripts
Changes since v1:
* libical now does not inherit perlnative, but uses host perl
* patched libical CMakeLists.txt so it doesn't try to find perl
The following changes since commit a3d228a484cf471e999b6537987e2897d8a7bd4e:
bitbake: main: Handle RuntimeError exception in list_extension_modules (2015-08-20 22:04:43 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/lsof-lsb-libical
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/lsof-lsb-libical
Jussi Kukkonen (3):
lsof: Upgrade 4.88 -> 4.89
lsbinitscripts: Upgrade 9.63 -> 9.64
libical: Upgrade 1.0.0 -> 1.0.1
...binitscripts_9.63.bb => lsbinitscripts_9.64.bb} | 6 ++--
.../lsof/{lsof_4.88.bb => lsof_4.89.bb} | 4 +--
.../libical/Remove-cmake-check-for-Perl.patch | 33 ++++++++++++++++++++++
.../libical/{libical_1.0.0.bb => libical_1.0.1.bb} | 12 +++++---
4 files changed, 46 insertions(+), 9 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.63.bb => lsbinitscripts_9.64.bb} (81%)
rename meta/recipes-extended/lsof/{lsof_4.88.bb => lsof_4.89.bb} (91%)
create mode 100644 meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
rename meta/recipes-support/libical/{libical_1.0.0.bb => libical_1.0.1.bb} (61%)Signature · 1 line
2.1.4
PATCH v2 1/3 lsof: Upgrade 4.88 -> 4.89
---
meta/recipes-extended/lsof/{lsof_4.88.bb => lsof_4.89.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/lsof/{lsof_4.88.bb => lsof_4.89.bb} (91%)meta/recipes-extended/lsof/lsof_4.89.bb renamed from meta/recipes-extended/lsof/lsof_4.88.bb +2 -2
@@ -6,8 +6,8 @@ LICENSE = "BSD" SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2" -SRC_URI[md5sum] = "1b29c10db4aa88afcaeeaabeef6790db" -SRC_URI[sha256sum] = "fe6f9b0e26b779ccd0ea5a0b6327c2b5c38d207a6db16f61ac01bd6c44e5c99b" +SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386" +SRC_URI[sha256sum] = "81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718" LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" S = "${WORKDIR}/lsof_${PV}_src"
Signature · 1 line
2.1.4
PATCH v2 2/3 lsbinitscripts: Upgrade 9.63 -> 9.64
---
.../lsb/{lsbinitscripts_9.63.bb => lsbinitscripts_9.64.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.63.bb => lsbinitscripts_9.64.bb} (81%)meta/recipes-extended/lsb/lsbinitscripts_9.64.bb renamed from meta/recipes-extended/lsb/lsbinitscripts_9.63.bb +3 -3
@@ -6,13 +6,13 @@ DEPENDS = "popt glib-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.63.tar.bz2/1ae0f15e54a904ac30185548d43daa1c/initscripts-9.63.tar.bz2 \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/9cce2ae1009750e84be37c09a028757e/initscripts-${PV}.tar.bz2 \ file://functions.patch \ file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ " -SRC_URI[md5sum] = "1ae0f15e54a904ac30185548d43daa1c" -SRC_URI[sha256sum] = "39474c3a83e2e03077e27bf9418a4296651c421cf0ba7672e67fe2e3567b36e1" +SRC_URI[md5sum] = "9cce2ae1009750e84be37c09a028757e" +SRC_URI[sha256sum] = "48b59ce8157cfc58bbd4b1dfa58ad1087245761ae11c2033b66ae3864ea7e1cf" inherit update-alternatives
Signature · 1 line
2.1.4
PATCH v2 3/3 libical: Upgrade 1.0.0 -> 1.0.1
In reply to Jussi Kukkonen* Build system changed to cmake.
* Patch build system to not check for perl (we use host perl which won't be found)
---
.../libical/Remove-cmake-check-for-Perl.patch | 33 ++++++++++++++++++++++
.../libical/{libical_1.0.0.bb => libical_1.0.1.bb} | 12 +++++---
2 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
rename meta/recipes-support/libical/{libical_1.0.0.bb => libical_1.0.1.bb} (61%)meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <[email protected]> +Date: Fri, 21 Aug 2015 16:38:05 +0300 +Subject: [PATCH] Remove cmake check for Perl + +We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to +make sure cmake does not find host programs. In this case we actually +are fine with host perl: remove the check. + +Inappropriate [workaround] + +Signed-off-by: Jussi Kukkonen <[email protected]> +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5aad80..5cc9863 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,8 +91,7 @@ if(SHARED_ONLY) + set(LIBRARY_TYPE SHARED) + endif() + +-# must have Perl to create the derived stuff +-find_package(Perl REQUIRED) ++set(PERL_EXECUTABLE perl) + + # MSVC specific definitions + if(WIN32) +-- +2.1.4 +
meta/recipes-support/libical/libical_1.0.1.bb renamed from meta/recipes-support/libical/libical_1.0.0.bb +8 -4
@@ -6,8 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" SECTION = "libs" -SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" -SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2" +SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz \ + file://Remove-cmake-check-for-Perl.patch \ + " +SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a" +SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c" -inherit autotools +inherit cmake + +FILES_${PN}-dev += "${libdir}/cmake/*"
Signature · 1 line
2.1.4
Re: [PATCHv2 3/3] libical: Upgrade 1.0.0 -> 1.0.1
Quoted 4 lines · Jussi Kukkonen
* Build system changed to cmake.
* Patch build system to not check for perl (we use host perl which won't be found)
Two failures on the builders.
If multilib is enabled, almost nothing gets packaged:
ERROR: QA Issue: libical: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libical.so
/usr/lib/libical.a
/usr/lib/libicalss.so.1
/usr/lib/libicalss.a
/usr/lib/libicalvcal.so.1
/usr/lib/libicalss.so
/usr/lib/libicalvcal.so.1.0.1
/usr/lib/libical.so.1
/usr/lib/libicalss.so.1.0.1
/usr/lib/libical.so.1.0.1
/usr/lib/libicalvcal.a
/usr/lib/libicalvcal.so
/usr/lib/cmake
/usr/lib/pkgconfig
/usr/lib/.debug
/usr/lib/cmake/LibIcal /usr/lib/cmake/LibIcal/LibIcalTargets.cmake /usr/lib/cmake/LibIcal/LibIcalConfig.cmake /usr/lib/cmake/LibIcal/LibIcalConfigVersion.cmake /usr/lib/cmake/LibIcal/LibIcalTargets-noconfig.cmake /usr/lib/pkgconfig/libical.pc /usr/lib/.debug/libicalvcal.so.1.0.1 /usr/lib/.debug/libicalss.so.1.0.1 /usr/lib/.debug/libical.so.1.0.1
($libdir is /usr/lib64)
Also a build failed very mysteriously:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/mips32r2-poky-linux/libical/1.0.1-r0/build/src/libical/ical.h:1140:1:
error: expected ',' or '}' before 'typedef'
typedef struct icalparameter_impl icalparameter;
(http://errors.yoctoproject.org/Errors/Details/14845/)
Another build failed with resource issues so it's possible that this is a transient error due to resource limits being hit.
Ross