From 5ecd2a2d5de57abf082fe9bdb0555f26211cbd5d Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Fri, 4 Sep 2020 15:27:23 +0200 Subject: [PATCH 1/3] gvfs: adjust fuse packageconfig to fuse3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust fuse packageconfig to depend on fuse3, which is the only supported option in gvfs ≥ 1.41. https://gitlab.gnome.org/GNOME/gvfs/-/commit/7a0a06186b6fef07b8fce2360c04fd075fc84ed1 Signed-off-by: Diego Rondini Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb index f04246f168a..4f5784f26db 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb @@ -62,7 +62,7 @@ PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" # needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" # libcdio-paranoia recipe doesn't exist yet PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" From 8484bea31c3a11c54253207b7c93df3eaa6be243 Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Tue, 25 Aug 2020 17:45:24 +0200 Subject: [PATCH 2/3] libeigen: update SRC_URI to use gitlab git Update SRC_URI to use gitlab git repository and fix: WARNING: libeigen-3.3.7-r0 do_fetch: Failed to fetch URL https://bitbucket.org/eigen/eigen/get/3.3.7.tar.bz2;downloadfilename=libeigen-3.3.7.tar.bz2, attempting MIRRORS if available As discussed here gitlab archive stability is not fully guaranteed, so repository is preferred: https://forum.gitlab.com/t/gitlab-release-tarball-stability/41888/3 Signed-off-by: Diego Rondini Signed-off-by: Khem Raj --- meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb index f638848d151..6ce318d0b59 100644 --- a/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ b/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb @@ -4,11 +4,11 @@ HOMEPAGE = "http://eigen.tuxfamily.org/" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI = "https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2;downloadfilename=${BP}.tar.bz2" -SRC_URI[md5sum] = "05b1f7511c93980c385ebe11bd3c93fa" -SRC_URI[sha256sum] = "9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce" +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" -S = "${WORKDIR}/eigen-eigen-323c052e1731" +SRCREV = "21ae2afd4edaa1b69782c67a54182d34efe43f9c" + +S = "${WORKDIR}/git" inherit cmake From 4647c9b15c9d2a3e1fc64c75acaf84987ab0cd55 Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Thu, 10 Sep 2020 21:09:56 +0200 Subject: [PATCH 3/3] hplip: use libexecdir In oe-core commit: 2ce6ef29b9bb4f16ed9d78e166d455b7a6d968bf cups crossscripts have been fixed to report the correct serverbin folder, so backend, filters, etc, need to go in ${libexecdir} now. Signed-off-by: Diego Rondini Signed-off-by: Khem Raj --- meta-oe/recipes-extended/hplip/hplip_3.19.12.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb b/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb index 883a6ffe954..457a974534e 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb @@ -39,8 +39,8 @@ EXTRA_OECONF += "\ --enable-foomatic-drv-install \ --disable-foomatic-ppd-install \ --disable-foomatic-rip-hplip-install \ - --with-cupsbackenddir=${libdir}/cups/backend \ - --with-cupsfilterdir=${libdir}/cups/filter \ + --with-cupsbackenddir=${libexecdir}/cups/backend \ + --with-cupsfilterdir=${libexecdir}/cups/filter \ " EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" @@ -52,7 +52,7 @@ do_install_append() { sed -i -e "s|/usr/bin/python|/usr/bin/env python3|g" ${D}${datadir}/hplip/*.py } -PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" +PACKAGE_BEFORE_PN += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" RDEPENDS_${PN} += " \ python3\ @@ -70,15 +70,15 @@ RDEPENDS_${PN}-filter += "perl" # need to snag the debug file or OE will fail on backend package FILES_${PN}-dbg += "\ - ${libdir}/cups/backend/.debug \ + ${libexecdir}/cups/backend/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug \ - ${libdir}/cups/filter/.debug " + ${libexecdir}/cups/filter/.debug " FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" FILES_${PN}-ppd = "${datadir}/ppd" FILES_${PN}-cups = "${datadir}/cups" -FILES_${PN}-backend = "${libdir}/cups/backend" -FILES_${PN}-filter = "${libdir}/cups/filter" +FILES_${PN}-backend = "${libexecdir}/cups/backend" +FILES_${PN}-filter = "${libexecdir}/cups/filter" FILES_${PN}-hal = "${datadir}/hal" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"