From 9deda3bfd25b5f4afac8a0dd3d36ed0b1b6a5363 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 18:10:06 +0100 Subject: [PATCH 01/11] blueman: update to 2.0.8 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../blueman/{blueman_git.bb => blueman_2.0.8.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta-networking/recipes-connectivity/blueman/{blueman_git.bb => blueman_2.0.8.bb} (80%) diff --git a/meta-networking/recipes-connectivity/blueman/blueman_git.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.0.8.bb similarity index 80% rename from meta-networking/recipes-connectivity/blueman/blueman_git.bb rename to meta-networking/recipes-connectivity/blueman/blueman_2.0.8.bb index 947db783607..8993aaa3cb6 100644 --- a/meta-networking/recipes-connectivity/blueman/blueman_git.bb +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.0.8.bb @@ -7,12 +7,11 @@ DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-nat inherit autotools systemd gsettings python3native gtk-icon-cache SRC_URI = " \ - git://github.com/blueman-project/blueman.git \ + https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ " -SRCREV = "c4a03417e81e21543d4568e8e7f7de307582eb50" -PV = "2.0.5+git${SRCPV}" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "51dc07d48125ee9600e7f6168d6e67f6" +SRC_URI[sha256sum] = "04afd07b4c900a401f39e711dedbf8b9cf12000ddeda0d8ef3c3327caf34704e" EXTRA_OECONF = " \ --disable-runtime-deps-check \ From 160b366f660f573ba2539e9e0a8eaa93af929473 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 18:10:23 +0100 Subject: [PATCH 02/11] packagegroup-tools-bluetooth: fix rdepends RDEPENDS are already specified separately for bluez4 and bluez5. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-tools-bluetooth.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb index f2a16dcf71f..913e31111d2 100644 --- a/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb +++ b/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb @@ -31,7 +31,3 @@ RDEPENDS_bluez5 = " \ pulseaudio-module-loopback', \ '', d)} \ " - -# Install bluez4 tools or bluez5 tools depending on what is specified in the distro. -# Otherwise install nothing. -RDEPENDS_${PN} = "${RDEPENDS_${BLUEZ}}" From 8b5f1fd783dbe3b5b37fcc99a915d60523b88788 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 18:22:59 +0100 Subject: [PATCH 03/11] igmpproxy: update to 0.2.1 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../recipes-daemons/igmpproxy/igmpproxy_0.1.bb | 16 ---------------- .../recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb create mode 100644 meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb deleted file mode 100644 index 5424dc455ea..00000000000 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" -HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=1e995e2799bb0d27d63069b97f805420" - -SRC_URI = "http://sourceforge.net/projects/igmpproxy/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ - " - -SRC_URI[md5sum] = "c56f41ec195bc1fe016369bf74efc5a1" -SRC_URI[sha256sum] = "ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae" - -inherit autotools pkgconfig - -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb new file mode 100644 index 00000000000..c99ebe0e9c6 --- /dev/null +++ b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" +HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" + +SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/igmpproxy-${PV}.tar.gz \ + file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ +" +SRC_URI[md5sum] = "3a9c2cb42c1f5ee0cb769a4884545641" +SRC_URI[sha256sum] = "d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1" + +inherit autotools pkgconfig + +CFLAGS += "-D_GNU_SOURCE" From b8159ea3a0a8c03350b3ffe784a957392409c69a Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 21:24:10 +0100 Subject: [PATCH 04/11] libev: update to 4.25 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../libev/{libev_4.24.bb => libev_4.25.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-oe/recipes-connectivity/libev/{libev_4.24.bb => libev_4.25.bb} (79%) diff --git a/meta-oe/recipes-connectivity/libev/libev_4.24.bb b/meta-oe/recipes-connectivity/libev/libev_4.25.bb similarity index 79% rename from meta-oe/recipes-connectivity/libev/libev_4.24.bb rename to meta-oe/recipes-connectivity/libev/libev_4.25.bb index a5838d3686a..9456e51f1bd 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.24.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.25.bb @@ -5,9 +5,8 @@ LICENSE = "BSD-2-Clause | GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" - -SRC_URI[md5sum] = "94459a5a22db041dec6f98424d6efe54" -SRC_URI[sha256sum] = "973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821" +SRC_URI[md5sum] = "911daf566534f745726015736a04f04a" +SRC_URI[sha256sum] = "78757e1c27778d2f3795251d9fe09715d51ce0422416da4abb34af3929c02589" inherit autotools From c67f05d0b3e62ef2d3027f37324c0965079f4cc2 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 21:29:40 +0100 Subject: [PATCH 05/11] libuv: update to 1.27.0 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../libuv/{libuv_1.20.3.bb => libuv_1.27.0.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta-oe/recipes-connectivity/libuv/{libuv_1.20.3.bb => libuv_1.27.0.bb} (66%) diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.20.3.bb b/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb similarity index 66% rename from meta-oe/recipes-connectivity/libuv/libuv_1.20.3.bb rename to meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb index a11ff9d2c4c..c8239443c83 100644 --- a/meta-oe/recipes-connectivity/libuv/libuv_1.20.3.bb +++ b/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb @@ -4,10 +4,9 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -S = "${WORKDIR}/git" -SRCREV = "8cfd67e59195251dff793ee47c185c9d6a8f3818" -BRANCH = "v1.x" -SRC_URI = "git://github.com/libuv/libuv.git;protocol=https;branch=${BRANCH};" +SRC_URI = "https://github.com/libuv/libuv/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "cc2cf259442fbe85404e75691e8244e1" +SRC_URI[sha256sum] = "4afcdc84cd315b77c8e532e7b3fde43d536af0e2e835eafbd0e75518ed26dbed" inherit autotools From f910abb01776c3465b8714efdda3a6e07c49a189 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 21:40:42 +0100 Subject: [PATCH 06/11] cppunit: update to 1.14.0 License checksum has been changed due to the minor indentation change in the COPYING file. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../cppunit/{cppunit_1.13.2.bb => cppunit_1.14.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-test/cppunit/{cppunit_1.13.2.bb => cppunit_1.14.0.bb} (67%) diff --git a/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb b/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb similarity index 67% rename from meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb rename to meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb index 65b08b068dc..04327862ce2 100644 --- a/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb +++ b/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb @@ -2,13 +2,13 @@ DESCRIPTION = "CppUnit is the C++ port of the famous JUnit framework for unit te HOMEPAGE = "http://www.freedesktop.org/wiki/Software/cppunit" LICENSE = "LGPL-2.1" SECTION = "libs" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0e9ef921ff780eb328bdcaeebec3269" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = " \ http://dev-www.libreoffice.org/src/cppunit-${PV}.tar.gz \ file://0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch \ " -SRC_URI[md5sum] = "d1c6bdd5a76c66d2c38331e2d287bc01" -SRC_URI[sha256sum] = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f" +SRC_URI[md5sum] = "7ad93022171710a541bfe4bfd8b4a381" +SRC_URI[sha256sum] = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780" inherit autotools From 56cc86ca1b8587025591aaccfffd6da439f10cf1 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sat, 16 Mar 2019 21:43:42 +0100 Subject: [PATCH 07/11] cxxtest: update to 4.4 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../cxxtest/{cxxtest_4.3.bb => cxxtest_4.4.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename meta-oe/recipes-test/cxxtest/{cxxtest_4.3.bb => cxxtest_4.4.bb} (81%) diff --git a/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb similarity index 81% rename from meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb rename to meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index 29150117310..342fccf4132 100644 --- a/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb +++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -1,12 +1,13 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in spirit to JUnit, CppUnit, and xUnit." HOMEPAGE = "http://cxxtest.com/" -LICENSE = "LGPL-2.0" SECTION = "devel" +LICENSE = "LGPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz" -SRC_URI[md5sum] = "b3a24b3e1aad9acf6adac37f4c3f83ec" -SRC_URI[sha256sum] = "356d0f4810e8eb5c344147a0cca50fc0d84122c286e7644b61cb365c2ee22083" -LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" +SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" +SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" + S = "${WORKDIR}/cxxtest-${PV}/python" inherit distutils From dcfae2999423edce1bc023e7c9ed126c95995ff4 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 17 Mar 2019 22:08:28 -0400 Subject: [PATCH 08/11] libgtop: 2.38.0 -> 2.40.0 Update libgtop from 2.38.0 to 2.40.0 * reset LIBGTOP_LIBS to avoid compile errors which caused by host contamination Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../libgtop/{libgtop_2.38.0.bb => libgtop_2.40.0.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename meta-gnome/recipes-gnome/libgtop/{libgtop_2.38.0.bb => libgtop_2.40.0.bb} (62%) diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb similarity index 62% rename from meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb rename to meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index 6c0297650c2..b594198a4a7 100644 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -8,7 +8,9 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver inherit distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "bb0ce7de6b28694b40405eedac8a31b5" -SRC_URI[archive.sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612" +SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947" +SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" DEPENDS = "glib-2.0 libxau" + +EXTRA_OEMAKE += "LIBGTOP_LIBS=" From 03ea53dbfc3d5b239190c27cf3e055cecc4730b2 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 17 Mar 2019 22:08:29 -0400 Subject: [PATCH 09/11] gvfs: 1.39.92 -> 1.40.0 Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../recipes-gnome/gvfs/{gvfs_1.39.92.bb => gvfs_1.40.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.39.92.bb => gvfs_1.40.0.bb} (94%) diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.92.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb similarity index 94% rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.39.92.bb rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb index c7cdd55578e..7f239c413a4 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.92.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb @@ -9,8 +9,8 @@ DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit sha SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "5b60e70ea5a6421bc72eb339059b1175" -SRC_URI[archive.sha256sum] = "ae44307c127268b6c8cbe5a93bb4a248fb8a6df430d29726e8aeb2ba40bd5513" +SRC_URI[archive.md5sum] = "96ef53ed613e4d223e0db3a7acea44f0" +SRC_URI[archive.sha256sum] = "3739d64b79c95a9f0f9faf2c5f9e5298b4b2ebdd6431435ce656ecd19b31e2f2" EXTRA_OEMESON = " \ From 51d714ccf2696770d1bbb4a567f2f083d61303c5 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Mon, 18 Mar 2019 10:33:16 +0800 Subject: [PATCH 10/11] utilities: Fix build failure with -Werror=maybe-uninitialized Initialize magic_number to zero to avoid such failure. utilities/blob_db/blob_log_format.cc:91:3: error: 'magic_number' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (magic_number != kMagicNumber) { ^~ Signed-off-by: He Zhe Signed-off-by: Khem Raj --- ...ild-failure-with-Werror-maybe-uninit.patch | 35 +++++++++++++++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch new file mode 100644 index 00000000000..ef0429a3c84 --- /dev/null +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch @@ -0,0 +1,35 @@ +From 8996f075e64da0e6ffeda57632ef31f8710defcc Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Fri, 15 Mar 2019 16:47:03 +0800 +Subject: [PATCH] utilities: Fix build failure with -Werror=maybe-uninitialized + +Summary: +Initialize magic_number to zero to avoid such failure. +utilities/blob_db/blob_log_format.cc:91:3: error: 'magic_number' may be used +uninitialized in this function [-Werror=maybe-uninitialized] + if (magic_number != kMagicNumber) { + ^~ + +Upstream-Status: Accepted [expected version 5.19] + +Signed-off-by: He Zhe +--- + utilities/blob_db/blob_log_format.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utilities/blob_db/blob_log_format.cc b/utilities/blob_db/blob_log_format.cc +index 2bf7028..8726cb8 100644 +--- a/utilities/blob_db/blob_log_format.cc ++++ b/utilities/blob_db/blob_log_format.cc +@@ -82,7 +82,7 @@ Status BlobLogFooter::DecodeFrom(Slice src) { + uint32_t src_crc = 0; + src_crc = crc32c::Value(src.data(), BlobLogFooter::kSize - sizeof(uint32_t)); + src_crc = crc32c::Mask(src_crc); +- uint32_t magic_number; ++ uint32_t magic_number = 0; + if (!GetFixed32(&src, &magic_number) || !GetFixed64(&src, &blob_count) || + !GetFixed64(&src, &expiration_range.first) || + !GetFixed64(&src, &expiration_range.second) || !GetFixed32(&src, &crc)) { +-- +2.7.4 + diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 78520f99b02..27c7b20e1bc 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -12,6 +12,7 @@ PV = "5.18.2" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch \ + file://0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch \ " S = "${WORKDIR}/git" From fe927bc059182b09b0e417137ceb038be8e8ea43 Mon Sep 17 00:00:00 2001 From: iddinev Date: Tue, 19 Mar 2019 17:59:52 +0200 Subject: [PATCH 11/11] recipes-support/libutempter: Fix the macro string concatenation. The previous patch 0001-Fix-macro-error.patch erroneously assumes that the 'MACRO1##MACRO2' operation expands the macros before concatination. As a result the UTEMPTER_DEFAULT_PATHNAME always gets the literal RAW_UTEMPTER_PATH value. Signed-off-by: iddinev --- .../libutempter/libutempter.bb | 1 + .../0002-Proper-macro-path-generation.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch diff --git a/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-oe/recipes-support/libutempter/libutempter.bb index 8c84cb376f6..b8a700b7b7b 100644 --- a/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-oe/recipes-support/libutempter/libutempter.bb @@ -12,6 +12,7 @@ PV = "1.1.6-alt2+git${SRCPV}" SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ file://0001-Fix-macro-error.patch \ + file://0002-Proper-macro-path-generation.patch \ file://libutempter-remove-glibc-assumption.patch \ " diff --git a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch new file mode 100644 index 00000000000..2a866c0796b --- /dev/null +++ b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch @@ -0,0 +1,34 @@ +From 48b6bcf9f5d8a05eace4bc463c47e8a4715d3000 Mon Sep 17 00:00:00 2001 +From: iddinev +Date: Mon, 18 Mar 2019 15:45:20 +0200 +Subject: [PATCH] Proper macro path generation. + +Signed-off-by: iddinev +--- + libutempter/iface.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git libutempter/iface.c libutempter/iface.c +index 27793f0..c1c0ee9 100644 +--- libutempter/iface.c ++++ libutempter/iface.c +@@ -44,13 +44,12 @@ + #endif + + #ifdef LIBEXECDIR +-# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 +-# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) ++# define UTEMPTER_DEFAULT_PATHNAME XSTR_PATH(LIBEXECDIR)"/utempter/utempter" + #else +-# define RAW_UTEMPTER_PATH /usr/lib/libtempter/utempter/utempter ++# define UTEMPTER_DEFAULT_PATHNAME STR_PATH(/usr/lib/libtempter/utempter/utempter) + #endif + #define STR_PATH(RAW_STR) #RAW_STR +-#define UTEMPTER_DEFAULT_PATHNAME STR_PATH(RAW_UTEMPTER_PATH) ++#define XSTR_PATH(STR) STR_PATH(STR) + + static const char *utempter_pathname; + static int saved_fd = -1; +-- +2.7.4 +