* [PATCH 02/27] oe-core: take UPSTREAM_CHECK_COMMITS into use where possible
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 03/27] python-scons: fix upstream version check Alexander Kanavin
` (24 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
This greatly reduces the amount of recipes for which upstream
version check fails: from about 30 to about 8.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-core/dbus-wait/dbus-wait_git.bb | 2 +-
meta/recipes-core/psplash/psplash_git.bb | 2 +-
meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +-
meta/recipes-devtools/build-compare/build-compare_git.bb | 2 +-
meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +-
meta/recipes-devtools/llvm/llvm_git.bb | 2 +-
meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 +-
meta/recipes-devtools/prelink/prelink_git.bb | 3 +--
meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 2 +-
meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +-
meta/recipes-graphics/fstests/fstests_git.bb | 2 +-
meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +-
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 2 +-
.../xcursor-transparent-theme/xcursor-transparent-theme_git.bb | 2 +-
meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb | 2 +-
meta/recipes-graphics/xorg-proto/calibrateproto_git.bb | 2 +-
meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb | 2 +-
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 2 +-
meta/recipes-multimedia/gstreamer/gst-player_git.bb | 2 +-
meta/recipes-multimedia/x264/x264_git.bb | 2 +-
meta/recipes-sato/puzzles/puzzles_git.bb | 2 +-
22 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
index 4afb90c20a5..c24295b5370 100644
--- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb
+++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
@@ -11,7 +11,7 @@ PV = "0.1+git${SRCPV}"
PR = "r2"
SRC_URI = "git://git.yoctoproject.org/${BPN}"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 3b7f818fc56..aab2c0360de 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -12,7 +12,7 @@ PR = "r15"
SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://psplash-init \
${SPLASH_IMAGES}"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default"
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index 6fc6f6e1abe..76d4312d881 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/philb/update-rc.d.git \
file://check-if-symlinks-are-valid.patch \
file://fix-to-handle-priority-numbers-correctly.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/build-compare/build-compare_git.bb b/meta/recipes-devtools/build-compare/build-compare_git.bb
index 84d04cfa0d3..efcf6b6dd3c 100644
--- a/meta/recipes-devtools/build-compare/build-compare_git.bb
+++ b/meta/recipes-devtools/build-compare/build-compare_git.bb
@@ -22,7 +22,7 @@ SRC_URI = "git://github.com/openSUSE/build-compare.git \
SRCREV = "c5352c054c6ef15735da31b76d6d88620f4aff0a"
PE = "1"
PV = "2015.02.10+git${SRCPV}"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 4fded60f197..8de81381276 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -14,7 +14,7 @@ PV = "20150728+git${SRCPV}"
SRC_URI = "git://git.savannah.gnu.org/config.git \
file://gnu-configize.in"
S = "${WORKDIR}/git"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
CLEANBROKEN = "1"
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index b3069ec1fbb..de06e12ae46 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -26,7 +26,7 @@ SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=release_50;protocol=http
file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
file://0002-llvm-allow-env-override-of-exe-path.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 50acdb1cc2a..efaabc11482 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -9,7 +9,7 @@ SRCREV = "37c86e60c0442fef570b75cd81aeb1db4d0cbafd"
PV = "0.1"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH}"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 570ef36a3cc..cc93bcc384f 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -32,8 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink \
file://prelink.cron.daily \
file://prelink.default \
file://macros.prelink"
-UPSTREAM_CHECK_GITTAGREGEX = "upstream has no usable tags"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
TARGET_OS_ORIG := "${TARGET_OS}"
OVERRIDES_append = ":${TARGET_OS_ORIG}"
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 0f991706c1e..a8baca51e3f 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \
file://fix-compat.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"
SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e"
diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
index 6d6789ae852..ab70ea98a32 100644
--- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
+++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
SRC_URI = "git://${GO_IMPORT}"
SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
GO_IMPORT = "github.com/golang/example"
GO_INSTALL = "${GO_IMPORT}/hello"
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb
index 9e09cd2685b..69f217830af 100644
--- a/meta/recipes-graphics/fstests/fstests_git.bb
+++ b/meta/recipes-graphics/fstests/fstests_git.bb
@@ -8,7 +8,7 @@ SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0"
PV = "0.1+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/${BPN}"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655"
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
index cab68fffb43..4265f8a8dc1 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315
SRCREV = "0d8de4ce3a03f36af1817f9b0586d132ad2c5d2e"
SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index d274a8fbd56..bbe9a88969e 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -6,7 +6,7 @@ SRC_URI = "git://anongit.freedesktop.org/piglit \
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
# From 2017-07-03
SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff"
diff --git a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
index 0b8943508b8..5fc9c2dba75 100644
--- a/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \
file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \
file://0001-Fix-build-on-x86.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "18df00c7b4677b0889486e16977857aa987947e2"
UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
index 733ebce7450..a4ab7f6eb81 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
@@ -11,7 +11,7 @@ SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06"
PV = "0.1.1+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
index 7c7fa3ddb3c..0fe65318bea 100644
--- a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
@@ -16,7 +16,7 @@ PV = "0.0+git${SRCPV}"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \
file://fix-xcb.patch"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
index 3a989262c1d..eb4b4224cae 100644
--- a/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
+++ b/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
@@ -17,5 +17,5 @@ PR = "r2"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \
file://fix.patch;apply=yes"
S = "${WORKDIR}/git"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
index 2667dd899d9..1d275a0042c 100644
--- a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
+++ b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
@@ -8,7 +8,7 @@ SRCREV = "7d38b881e99eb74169d292b40f7164e461a65092"
PV = "0.1+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/test-xvideo"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index ddad491c151..7908b3aa759 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -189,7 +189,7 @@ SRC_URI += "https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.
SRC_URI[iwlwifi-19.md5sum] = "132fbaee36beec5e98714f0bd66f7a1d"
SRC_URI[iwlwifi-19.sha256sum] = "2034470df64d323b827c4f2d4d0d55be2846b7360179b5574aa28ff77b6c9471"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
index 4fe8fdef4a2..ee11e2ba10d 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/sdroege/gst-player.git \
SRCREV = "ee3c226c82767a089743e4e06058743e67f73cdb"
PV = "0.0.1+git${SRCPV}"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index c5476c7a9b3..bc9775ab2a1 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
file://don-t-default-to-cortex-a9-with-neon.patch \
file://Fix-X32-build-by-disabling-asm.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "2b741f81e51f92d053d87a49f59ff1026553a0f6"
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index decd2a8b300..6148e40adaa 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://0001-Clarify-conditions-to-avoid-compiler-errors.patch \
file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
+UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3"
PE = "1"
PV = "0.0+git${SRCPV}"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 03/27] python-scons: fix upstream version check
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
2017-11-14 14:57 ` [PATCH 02/27] oe-core: take UPSTREAM_CHECK_COMMITS into use where possible Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 04/27] i2c-tools: " Alexander Kanavin
` (23 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/python/python-scons_3.0.0.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python-scons_3.0.0.bb b/meta/recipes-devtools/python/python-scons_3.0.0.bb
index 33bfb45e2e4..8fe74f4b3c1 100644
--- a/meta/recipes-devtools/python/python-scons_3.0.0.bb
+++ b/meta/recipes-devtools/python/python-scons_3.0.0.bb
@@ -10,7 +10,8 @@ SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME
SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb"
SRC_URI[sha256sum] = "aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e"
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/"
+UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
S = "${WORKDIR}/${SRCNAME}-${PV}"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 04/27] i2c-tools: fix upstream version check
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
2017-11-14 14:57 ` [PATCH 02/27] oe-core: take UPSTREAM_CHECK_COMMITS into use where possible Alexander Kanavin
2017-11-14 14:57 ` [PATCH 03/27] python-scons: fix upstream version check Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 05/27] python3-pycairo: " Alexander Kanavin
` (22 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb b/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
index c01725229bb..45d3d6d10ae 100644
--- a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
+++ b/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.bz2 \
file://Module.mk \
"
+UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/i/i2c-tools/"
+UPSTREAM_CHECK_REGEX = "i2c-tools_(?P<pver>.+)\.orig"
SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962"
SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 05/27] python3-pycairo: fix upstream version check
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (2 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 04/27] i2c-tools: " Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 06/27] libcheck: " Alexander Kanavin
` (21 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/python/python3-pycairo_1.15.3.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb b/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
index 7863ad2af16..9022482fd5c 100644
--- a/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
+++ b/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
DEPENDS = "cairo"
SRC_URI = "https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz"
+UPSTREAM_CHECK_URI = "https://github.com/pygobject/pycairo/releases/"
SRC_URI[md5sum] = "7390cd413271fe5569f6eef73d72bf7a"
SRC_URI[sha256sum] = "8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 06/27] libcheck: fix upstream version check
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (3 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 05/27] python3-pycairo: " Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 07/27] rpm: upstream version is now known Alexander Kanavin
` (20 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-support/libcheck/libcheck_0.12.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
index e684958925f..e646d439681 100644
--- a/meta/recipes-support/libcheck/libcheck_0.12.0.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz"
SRC_URI[md5sum] = "31b17c6075820a434119592941186f70"
SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234"
+UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/"
S = "${WORKDIR}/check-${PV}"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 07/27] rpm: upstream version is now known
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (4 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 06/27] libcheck: " Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 08/27] glib-2.0: update to 2.54.2 Alexander Kanavin
` (19 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/rpm/rpm_git.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index 7866314ad4b..57b9c2d6acc 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -44,7 +44,6 @@ SRC_URI = "git://github.com/rpm-software-management/rpm \
file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
file://0001-perl-disable-auto-reqs.patch \
"
-UPSTREAM_VERSION_UNKNOWN = "1"
PV = "4.13.90+git${SRCPV}"
PE = "1"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 08/27] glib-2.0: update to 2.54.2
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (5 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 07/27] rpm: upstream version is now known Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 09/27] glib-networking: update to 2.54.1 Alexander Kanavin
` (18 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
LGPL version has been updated from 2.0 to 2.1, adjust the checksums accordingly.
Rebase various patches.
A few tools have been rewritten from perl (or C) to python, so
add a patch that avoids hardcoding the python path in the shebang,
and remove previous patching with sed.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...warning-about-deprecated-paths-in-schemas.patch | 25 +++++++-----
...t-hardcode-python-path-into-various-tools.patch | 46 ++++++++++++++++++++++
.../Enable-more-tests-while-cross-compiling.patch | 30 ++++++++------
.../glib-2.0/glib-2.0/configure-libtool.patch | 38 ++++--------------
.../{glib-2.0_2.52.3.bb => glib-2.0_2.54.2.bb} | 5 ++-
meta/recipes-core/glib-2.0/glib.inc | 16 +++-----
6 files changed, 95 insertions(+), 65 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.52.3.bb => glib-2.0_2.54.2.bb} (79%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 41a190eddfa..67ca6240bc8 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -1,7 +1,7 @@
-From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001
+From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 12 Jun 2015 17:08:46 +0300
-Subject: [PATCH] Remove the warning about deprecated paths in schemas
+Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas
Some schemas in gsettings-desktop-schemas (such as proxy and locale)
are still using deprecated paths, as of 3.16.1. This causes warning
@@ -11,26 +11,33 @@ Upstream-Status: Inappropriate
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- gio/glib-compile-schemas.c | 6 ------
- 1 file changed, 6 deletions(-)
+ gio/glib-compile-schemas.c | 13 -------------
+ 1 file changed, 13 deletions(-)
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index e42949b..ec79d7c 100644
+index b8de090..130f89b 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
-@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state,
+@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state,
return;
}
- if (path && (g_str_has_prefix (path, "/apps/") ||
- g_str_has_prefix (path, "/desktop/") ||
- g_str_has_prefix (path, "/system/")))
-- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
-- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
+- {
+- gchar *message = NULL;
+- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
+- "Paths starting with "
+- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
+- id, path);
+- g_printerr ("%s\n", message);
+- g_free (message);
+- }
-
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
--
-2.1.4
+2.14.1
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
new file mode 100644
index 00000000000..697d63d5feb
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -0,0 +1,46 @@
+From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 3 Oct 2017 10:45:55 +0300
+Subject: [PATCH 10/10] Do not hardcode python path into various tools
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
+ gobject/glib-genmarshal.in | 2 +-
+ gobject/glib-mkenums.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..e693ef3 100644
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env @PYTHON@
++#!/usr/bin/env python3
+
+ # GDBus - GLib D-Bus Library
+ #
+diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
+index 09e8408..b2f9d99 100755
+--- a/gobject/glib-genmarshal.in
++++ b/gobject/glib-genmarshal.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env @PYTHON@
++#!/usr/bin/env python3
+
+ # pylint: disable=too-many-lines, missing-docstring, invalid-name
+
+diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
+index d4bfd11..051fce4 100755
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env @PYTHON@
++#!/usr/bin/env python3
+
+ # If the code below looks horrible and unpythonic, do not panic.
+ #
+--
+2.14.1
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
index 9b4ded14d58..b98f933dae3 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
@@ -1,7 +1,7 @@
-From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001
+From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 9 Nov 2015 11:07:27 +0200
-Subject: [PATCH] Enable more tests while cross-compiling
+Subject: [PATCH 06/10] Enable more tests while cross-compiling
Upstream disables a few tests while cross-compiling because their build requires
running other built binaries. This usually makes sense but in the cross-compile
@@ -9,16 +9,17 @@ case we can depend on glib-2.0-native.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+
---
- gio/tests/Makefile.am | 8 +++-----
- tests/gobject/Makefile.am | 8 +++-----
- 2 files changed, 6 insertions(+), 10 deletions(-)
+ gio/tests/Makefile.am | 10 ++++++----
+ tests/gobject/Makefile.am | 8 +++++---
+ 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 868873f..533e454 100644
+index acc1da4..9176640 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -503,10 +503,9 @@ test_programs += \
+@@ -516,10 +516,9 @@ test_programs += \
endif
# -----------------------------------------------------------------------------
@@ -31,7 +32,7 @@ index 868873f..533e454 100644
test_programs += resources
resources_SOURCES = resources.c
nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h
-@@ -528,7 +527,11 @@ if !ENABLE_INSTALLED_TESTS
+@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS
libresourceplugin_la_LDFLAGS += -rpath /
endif
@@ -41,18 +42,18 @@ index 868873f..533e454 100644
+glib_compile_resources=glib-compile-resources
+endif
- resources.o: test_resources2.h
- test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml)
-@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
+ test-generated.txt: test1.txt
+ $(AM_V_GEN) echo "Generated" > $@ && \
+@@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
-endif # !CROSS_COMPILING
- BUILT_SOURCES += giotypefuncs.c
+ BUILT_SOURCES += giotypefuncs.inc
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
-index 16f2827..4c2208e 100644
+index 656941d..68555ff 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP
@@ -79,3 +80,6 @@ index 16f2827..4c2208e 100644
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
+--
+2.14.1
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
index aa5de27d125..59b891347da 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
@@ -1,7 +1,7 @@
-From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001
+From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 28 Apr 2012 18:24:50 +0200
-Subject: [PATCH] configure: use $host_alias-libtool instead of libtool
+Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool
directly
Poky renames libtool to $host_alias-libtool.
@@ -18,24 +18,16 @@ Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com>
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
---
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 1af90c5..f6b7a73 100644
+index 6fa6eb0..b6f78a6 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then
- G_MODULE_LDFLAGS=
- else
- export SED
-- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- fi
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override
- G_MODULE_NEED_USCORE=0
-@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
+@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
echo "void glib_plugin_test(void) { }" > plugin.c
@@ -47,20 +39,6 @@ index 1af90c5..f6b7a73 100644
${LDFLAGS} -module -o plugin.la -export-dynamic \
-shrext ".o" -avoid-version plugin.lo \
-rpath /dont/care >/dev/null 2>&1
-- eval `./libtool --config | grep ^objdir`
-+ eval `./$host_alias-libtool --config | grep ^objdir`
- AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
- glib_cv_rtldglobal_broken,[
- AC_TRY_RUN([
-@@ -1506,7 +1506,7 @@ fi
-
- AC_MSG_CHECKING(for the suffix of module shared libraries)
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
- eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
--
-1.9.1
+2.14.1
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb
similarity index 79%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb
index b1fe600992c..60ce1b5f7fb 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb
@@ -15,9 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0001-Test-for-pthread_getname_np-before-using-it.patch \
+ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"
-SRC_URI[md5sum] = "89265d0289a436e99cad54491eb21ef4"
-SRC_URI[sha256sum] = "25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128"
+SRC_URI[md5sum] = "50f83e08f080f99b1e2f0ad2b760fb81"
+SRC_URI[sha256sum] = "bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 8434b7dae38..42ab5f1562d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -4,11 +4,11 @@ HOMEPAGE = "https://developer.gnome.org/glib/"
# pcre is under BSD;
# docs/reference/COPYING is with a 'public domai'-like license!
-LICENSE = "LGPLv2+ & BSD & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
- file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \
+LICENSE = "LGPLv2.1+ & BSD & PD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
+ file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \
file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
@@ -95,12 +95,6 @@ do_install_append () {
rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
- # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
- # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
- if [ -f ${D}${bindir}/glib-mkenums ]; then
- sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
- fi
-
if [ -e ${D}${libdir}/charset.alias ]; then
rm -f ${D}${libdir}/charset.alias
fi
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 09/27] glib-networking: update to 2.54.1
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (6 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 08/27] glib-2.0: update to 2.54.2 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 10/27] dtc: update to 1.4.5 Alexander Kanavin
` (17 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../{glib-networking_2.50.0.bb => glib-networking_2.54.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.50.0.bb => glib-networking_2.54.1.bb} (88%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.54.1.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.50.0.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.54.1.bb
index 2782bd95c4c..2a6f8af2b46 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.54.1.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "libs"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "4d06d0224646f274918b1cb6da9a07f6"
-SRC_URI[archive.sha256sum] = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"
+SRC_URI[archive.md5sum] = "99867463f182c2767bce0c74bc9cc981"
+SRC_URI[archive.sha256sum] = "eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f"
PACKAGECONFIG ??= "ca-certificates gnutls"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 10/27] dtc: update to 1.4.5
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (7 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 09/27] glib-networking: update to 2.54.1 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 11/27] libdnf: update to 0.11.1 Alexander Kanavin
` (16 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Also fix upstream check and disable newly added python2-only bindings
(as there is no clear need for them and python 2 is deprecated).
Add a backported patch to address format errors when compiling.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-kernel/dtc/dtc.inc | 6 ++-
...cks-Use-proper-format-modifier-for-size_t.patch | 43 ++++++++++++++++++++++
.../dtc/{dtc_1.4.4.bb => dtc_1.4.5.bb} | 2 +-
3 files changed, 48 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
rename meta/recipes-kernel/dtc/{dtc_1.4.4.bb => dtc_1.4.5.bb} (81%)
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index d75994661a6..d259c57e8d9 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -7,9 +7,11 @@ DEPENDS = "flex-native bison-native"
SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
file://make_install.patch \
- "
+ file://0001-checks-Use-proper-format-modifier-for-size_t.patch \
+ "
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"'
+EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"'
S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch b/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
new file mode 100644
index 00000000000..cab384dd99a
--- /dev/null
+++ b/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
@@ -0,0 +1,43 @@
+From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001
+From: Thierry Reding <treding@nvidia.com>
+Date: Wed, 27 Sep 2017 15:04:09 +0200
+Subject: [PATCH] checks: Use proper format modifier for size_t
+
+The size of size_t can vary between architectures, so using %ld isn't
+going to work on 32-bit builds. Use the %zu modifier to make sure it is
+always correct.
+
+Upstream-Status: Backport
+Signed-off-by: Thierry Reding <treding@nvidia.com>
+Acked-by: Rob Herring <robh@kernel.org>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ checks.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/checks.c b/checks.c
+index 902f2e3..08a3a29 100644
+--- a/checks.c
++++ b/checks.c
+@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c,
+ int cell, cellsize = 0;
+
+ if (prop->val.len % sizeof(cell_t)) {
+- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+ return;
+ }
+@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c,
+ return;
+
+ if (irq_prop->val.len % sizeof(cell_t))
+- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+ node->fullpath);
+
+--
+2.15.0
+
diff --git a/meta/recipes-kernel/dtc/dtc_1.4.4.bb b/meta/recipes-kernel/dtc/dtc_1.4.5.bb
similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.4.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.5.bb
index eadb7bab6f7..0e46cfbeb4f 100644
--- a/meta/recipes-kernel/dtc/dtc_1.4.4.bb
+++ b/meta/recipes-kernel/dtc/dtc_1.4.5.bb
@@ -3,7 +3,7 @@ require dtc.inc
LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
-SRCREV = "558cd81bdd432769b59bff01240c44f82cfb1a9d"
+SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
S = "${WORKDIR}/git"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 11/27] libdnf: update to 0.11.1
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (8 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 10/27] dtc: update to 1.4.5 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 12/27] librepo: update to 1.8.1 Alexander Kanavin
` (15 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | 11 ++++++-----
...Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 11 ++++++-----
.../libdnf/{libdnf_0.9.3.bb => libdnf_0.11.1.bb} | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
rename meta/recipes-devtools/libdnf/{libdnf_0.9.3.bb => libdnf_0.11.1.bb} (95%)
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
index 280edb7a651..cbd0362c8b0 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
@@ -1,7 +1,8 @@
-From 3012a93745223751cc979e3770207a09a075bec6 Mon Sep 17 00:00:00 2001
+From 2bf0666544293dcfac2f67b678e24353acdcd4e7 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 7 Feb 2017 12:16:03 +0200
-Subject: [PATCH 5/5] Get parameters for both libsolv and libsolvext (libdnf is
+Subject: [PATCH 2/2] Get parameters for both libsolv and libsolvext (libdnf is
+
using both)
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
@@ -12,12 +13,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b2ab9a..e2d33d7 100644
+index ca280f3..6ab9827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED)
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
- PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)
+ PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
@@ -25,5 +26,5 @@ index 8b2ab9a..e2d33d7 100644
if (ENABLE_RHSM_SUPPORT)
pkg_check_modules (RHSM REQUIRED librhsm)
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
index 1ea93108933..6cf48a49f36 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
@@ -1,7 +1,8 @@
-From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001
+From bcea5c5063a2d5f07dbe6f40aee30370fc4ba656 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:24:50 +0200
-Subject: [PATCH 4/5] Set libsolv variables with pkg-config (cmake's own module
+Subject: [PATCH 1/2] Set libsolv variables with pkg-config (cmake's own module
+
doesn't work properly).
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
@@ -12,12 +13,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a75df04..8b2ab9a 100644
+index 8875bbf..ca280f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED)
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
- PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)
+ PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
@@ -26,5 +27,5 @@ index a75df04..8b2ab9a 100644
pkg_check_modules (RHSM REQUIRED librhsm)
include_directories (${RHSM_INCLUDE_DIRS})
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.9.3.bb b/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
similarity index 95%
rename from meta/recipes-devtools/libdnf/libdnf_0.9.3.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
index 01d9346d9ad..4fc1d6defef 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.9.3.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
"
-SRCREV = "1b19950e82d88eec28d01b4e7c1da712c941201d"
+SRCREV = "60f979bd8db651229c559c1412f1eb880257127d"
S = "${WORKDIR}/git"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 12/27] librepo: update to 1.8.1
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (9 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 11/27] libdnf: update to 0.11.1 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 13/27] dnf: update to 2.7.5 Alexander Kanavin
` (14 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Drop upstreamed patches, rebase the PYTHON_INSTALL_DIR patch.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...ly-set-the-library-installation-directory.patch | 28 -------------
...to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 49 +++++++++++++++-------
...-race-when-deleting-temporary-directories.patch | 41 ------------------
...rrect-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch | 40 ------------------
.../librepo/{librepo_git.bb => librepo_1.8.1.bb} | 6 +--
5 files changed, 36 insertions(+), 128 deletions(-)
delete mode 100644 meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
delete mode 100644 meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
delete mode 100644 meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
rename meta/recipes-devtools/librepo/{librepo_git.bb => librepo_1.8.1.bb} (68%)
diff --git a/meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch b/meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
deleted file mode 100644
index 08a58f17554..00000000000
--- a/meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 36d87919223db9b054862ad38cdda8d9222a2bab Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 30 Dec 2016 18:04:35 +0200
-Subject: [PATCH 1/4] Correctly set the library installation directory
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/110]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- librepo/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/librepo/CMakeLists.txt b/librepo/CMakeLists.txt
-index 2fe76d8..5026def 100644
---- a/librepo/CMakeLists.txt
-+++ b/librepo/CMakeLists.txt
-@@ -60,7 +60,8 @@ CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY)
- IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
- SET (LIB_SUFFIX "64")
- ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
--SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-+#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
-
- INSTALL(FILES ${librepo_HEADERS} DESTINATION include/librepo)
- INSTALL(TARGETS librepo LIBRARY DESTINATION ${LIB_INSTALL_DIR})
---
-2.11.0
-
diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
index 7138dfce21d..d69deb5110d 100644
--- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
+++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
@@ -1,41 +1,62 @@
-From 1570ad33dd7e5d83f3ee80bd104b114709ac1e34 Mon Sep 17 00:00:00 2001
+From 5b6849d9d7e030c3a521b5245d86f853b0271a61 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:05:36 +0200
-Subject: [PATCH 2/4] Do not try to obtain PYTHON_INSTALL_DIR by running
+Subject: [PATCH 1/2] Do not try to obtain PYTHON_INSTALL_DIR by running
python.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
- librepo/python/python2/CMakeLists.txt | 2 +-
- librepo/python/python3/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ librepo/python/python2/CMakeLists.txt | 12 ++++++------
+ librepo/python/python3/CMakeLists.txt | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt
-index 3615e17..cffa99f 100644
+index 5ffbd62..90d3c22 100644
--- a/librepo/python/python2/CMakeLists.txt
+++ b/librepo/python/python2/CMakeLists.txt
-@@ -1,6 +1,6 @@
+@@ -1,11 +1,11 @@
FIND_PACKAGE (PythonLibs 2 )
FIND_PACKAGE (PythonInterp 2 REQUIRED)
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
-+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
+-from sys import stdout
+-from distutils import sysconfig
+-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
+-stdout.write(path)"
+-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
++#from sys import stdout
++#from distutils import sysconfig
++#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
++#stdout.write(path)"
++#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt
-index dfecac9..38bcc72 100644
+index 47559f7..b39adc2 100644
--- a/librepo/python/python3/CMakeLists.txt
+++ b/librepo/python/python3/CMakeLists.txt
-@@ -10,7 +10,7 @@ message("--- ${PYTHON_INCLUDE_DIR}")
+@@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}")
FIND_PACKAGE(PythonLibs 3.0)
FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
-+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
+-from sys import stdout
+-from distutils import sysconfig
+-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
+-stdout.write(path)"
+-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
++#from sys import stdout
++#from distutils import sysconfig
++#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
++#stdout.write(path)"
++#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")
--
-2.11.0
+2.14.1
diff --git a/meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch b/meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
deleted file mode 100644
index 89ca60e8186..00000000000
--- a/meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b1a5c92dbd1d11f1afdc094fccea64de334d2783 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 30 Dec 2016 18:06:24 +0200
-Subject: [PATCH 3/4] tests: fix a race when deleting temporary directories
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/110]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- tests/python/tests/test_yum_repo_downloading.py | 2 +-
- tests/python/tests/test_yum_repo_locating.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/python/tests/test_yum_repo_downloading.py b/tests/python/tests/test_yum_repo_downloading.py
-index ad597dc..4a32519 100644
---- a/tests/python/tests/test_yum_repo_downloading.py
-+++ b/tests/python/tests/test_yum_repo_downloading.py
-@@ -32,7 +32,7 @@ class TestCaseYumRepoDownloading(TestCaseWithFlask):
- os.environ.pop('GNUPGHOME')
- else:
- os.environ['GNUPGHOME'] = self._gnupghome
-- shutil.rmtree(self.tmpdir)
-+ shutil.rmtree(self.tmpdir, True)
-
- def test_download_repo_01(self):
- h = librepo.Handle()
-diff --git a/tests/python/tests/test_yum_repo_locating.py b/tests/python/tests/test_yum_repo_locating.py
-index 8f4bea5..db4294c 100644
---- a/tests/python/tests/test_yum_repo_locating.py
-+++ b/tests/python/tests/test_yum_repo_locating.py
-@@ -34,7 +34,7 @@ class TestCaseYumRepoLocating(TestCase):
- os.environ.pop('GNUPGHOME')
- else:
- os.environ['GNUPGHOME'] = self._gnupghome
-- shutil.rmtree(self.tmpdir)
-+ shutil.rmtree(self.tmpdir, True)
-
- def test_read_mirrorlist(self):
- h = librepo.Handle()
---
-2.11.0
-
diff --git a/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch b/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
deleted file mode 100644
index b0c7d1ca309..00000000000
--- a/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a4bbbccce6edc1a2d1bd475506e2975fd7696c88 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 8 Jun 2017 16:31:30 +0800
-Subject: [PATCH] Fix typo: correct LRO_SSLVERIFYHOST with
- CURLOPT_SSL_VERIFYHOST
-
-In commit 51d32c6cd88ba0139c32793183fd6a236c1ef456
----
-Author: Tomas Mlcoch <tmlcoch@redhat.com>
-Date: Mon May 5 14:31:35 2014 +0200
-
- Add LRO_SSLVERIFYPEER and LRO_SSLVERIFYHOST options (RhBug: 1093014)
----
-
-It incorrectly setopt CURLOPT_SSL_VERIFYPEER for LRO_SSLVERIFYHOST.
-Use CURLOPT_SSL_VERIFYHOST to correct.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- librepo/handle.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/librepo/handle.c b/librepo/handle.c
-index ccea79b..ff39db4 100644
---- a/librepo/handle.c
-+++ b/librepo/handle.c
-@@ -629,7 +629,7 @@ lr_handle_setopt(LrHandle *handle,
-
- case LRO_SSLVERIFYHOST:
- handle->sslverifyhost = va_arg(arg, long) ? 2 : 0;
-- c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYPEER, handle->sslverifyhost);
-+ c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYHOST, handle->sslverifyhost);
- break;
-
- case LRO_SSLCLIENTCERT:
---
-2.7.4
-
diff --git a/meta/recipes-devtools/librepo/librepo_git.bb b/meta/recipes-devtools/librepo/librepo_1.8.1.bb
similarity index 68%
rename from meta/recipes-devtools/librepo/librepo_git.bb
rename to meta/recipes-devtools/librepo/librepo_1.8.1.bb
index 3238b14face..0324104a37a 100644
--- a/meta/recipes-devtools/librepo/librepo_git.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.8.1.bb
@@ -3,15 +3,11 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/rpm-software-management/librepo.git \
- file://0001-Correctly-set-the-library-installation-directory.patch \
file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
- file://0003-tests-fix-a-race-when-deleting-temporary-directories.patch \
file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
- file://0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch \
"
-PV = "1.7.20+git${SRCPV}"
-SRCREV = "e1137cbbda78fecb192146300790680a5bc811b1"
+SRCREV = "7b9b7bf388f3f059529c6f50c40b30919fef30f9"
S = "${WORKDIR}/git"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 13/27] dnf: update to 2.7.5
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (10 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 12/27] librepo: update to 1.8.1 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 14/27] gobject-introspection: update to 1.54.1 Alexander Kanavin
` (13 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Drop upstreamed patch.
Rebase the other patches.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...eck-conf.releasever-instead-of-releasever.patch | 31 ----------------------
...Corretly-install-tmpfiles.d-configuration.patch | 7 ++---
...hardcode-etc-and-systemd-unit-directories.patch | 9 ++++---
...005-Do-not-prepend-installroot-to-logdir.patch} | 14 +++++-----
...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 9 ++++---
.../dnf/0030-Run-python-scripts-using-env.patch | 11 ++++----
.../dnf/{dnf_2.6.3.bb => dnf_2.7.5.bb} | 10 +++----
7 files changed, 32 insertions(+), 59 deletions(-)
delete mode 100644 meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
rename meta/recipes-devtools/dnf/dnf/{0001-Do-not-prepend-installroot-to-logdir.patch => 0005-Do-not-prepend-installroot-to-logdir.patch} (67%)
rename meta/recipes-devtools/dnf/{dnf_2.6.3.bb => dnf_2.7.5.bb} (92%)
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch b/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
deleted file mode 100644
index 05f31415174..00000000000
--- a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 166833a88a928a574bf9143b9b65f544be482c77 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 18 Aug 2017 15:55:15 +0300
-Subject: [PATCH] Check conf.releasever instead of releasever
-
-The substitutions may actually set the conf.releasever correctly,
-and so the check should use that instead of the passed-in function
-parameter.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/901]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- dnf/cli/cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
-index 2d63420c..167943b8 100644
---- a/dnf/cli/cli.py
-+++ b/dnf/cli/cli.py
-@@ -914,7 +914,7 @@ class Cli(object):
- conf.releasever = releasever
- subst = conf.substitutions
- subst.update_from_etc(conf.installroot)
-- if releasever is None:
-+ if conf.releasever is None:
- logger.warning(_("Unable to detect release version (use '--releasever' to specify "
- "release version)"))
-
---
-2.14.1
-
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
index c9df4589746..6692b41a160 100644
--- a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
+++ b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
@@ -1,10 +1,11 @@
-From 8ce181714640315d2dd37ee794acbb22063cd669 Mon Sep 17 00:00:00 2001
+From 05e059cd4e9910c00b32d377f4f98e3c8dde6bc6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 26 Jan 2017 16:36:20 +0200
-Subject: [PATCH] Corretly install tmpfiles.d configuration
+Subject: [PATCH 4/5] Corretly install tmpfiles.d configuration
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
etc/tmpfiles.d/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -17,5 +18,5 @@ index f69c773e..3eb6d0e8 100644
-INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/)
+INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/)
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
index 0f261e5c5d6..15a7bfc7329 100644
--- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
+++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
@@ -1,16 +1,17 @@
-From 4313ced1320594013795f11f6db00381e3f4cc45 Mon Sep 17 00:00:00 2001
+From a8ef81c115a45f05dad145c98e10f3c4940e4e29 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 26 Jan 2017 16:25:47 +0200
-Subject: [PATCH] Do not hardcode /etc and systemd unit directories
+Subject: [PATCH 3/5] Do not hardcode /etc and systemd unit directories
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a319935..db20ccd4 100644
+index 650b624a..10199618 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED)
@@ -25,5 +26,5 @@ index 6a319935..db20ccd4 100644
if (${PYTHON_DESIRED} STREQUAL "2")
FIND_PACKAGE (PythonInterp REQUIRED)
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
similarity index 67%
rename from meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch
rename to meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
index a90e77cbf10..aa20009cef5 100644
--- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch
+++ b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
@@ -1,7 +1,7 @@
-From 31653d324cf8c7b1f2f9e49d22676bd2ac546331 Mon Sep 17 00:00:00 2001
+From 6365389074a1b86962f3d8b22a2ead2202026a98 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 11 Jan 2017 15:10:13 +0200
-Subject: [PATCH] Do not prepend installroot to logdir.
+Subject: [PATCH 5/5] Do not prepend installroot to logdir.
This would otherwise write the logs into rootfs/var/log
(whereas we want them in $T),
@@ -14,12 +14,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
-index b764801a..893f4bda 100644
+index d2d9c082..82270ecf 100644
--- a/dnf/cli/cli.py
+++ b/dnf/cli/cli.py
-@@ -881,7 +881,7 @@ class Cli(object):
- subst = conf.substitutions
- subst.update_from_etc(conf.installroot)
+@@ -920,7 +920,7 @@ class Cli(object):
+ logger.warning(_("Unable to detect release version (use '--releasever' to specify "
+ "release version)"))
- for opt in ('cachedir', 'logdir', 'persistdir'):
+ for opt in ('cachedir', 'persistdir'):
@@ -27,5 +27,5 @@ index b764801a..893f4bda 100644
self.base._logging._setup_from_dnf_conf(conf)
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 8c59f9f670e..6e011915df0 100644
--- a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -1,16 +1,17 @@
-From 3ddaa930cda57a62a2174faebcc87aebc59591d1 Mon Sep 17 00:00:00 2001
+From 7205033e44d8fba1d3b18b490e7eaab82da1ffa3 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:29:07 +0200
-Subject: [PATCH 29/30] Do not set PYTHON_INSTALL_DIR by running python
+Subject: [PATCH 1/5] Do not set PYTHON_INSTALL_DIR by running python
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a319935..466ca1e6 100644
+index 23e5f889..650b624a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ else()
@@ -23,5 +24,5 @@ index 6a319935..466ca1e6 100644
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
index 1abd880da9b..eedbb5723fa 100644
--- a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
+++ b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
@@ -1,19 +1,20 @@
-From 9c8d545152b35d8943be72b9503414a53e1ebf7c Mon Sep 17 00:00:00 2001
+From 8d97b72a1d77149e2f9048d1ca6cef66da1a8aa5 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:29:37 +0200
-Subject: [PATCH 30/30] Run python scripts using env
+Subject: [PATCH 2/5] Run python scripts using env
Otherwise the build tools hardcode the python path into them.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
bin/dnf-automatic.in | 2 +-
bin/dnf.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in
-index 5b06aa26..9f6f703e 100755
+index 5b06aa26..891b4c24 100755
--- a/bin/dnf-automatic.in
+++ b/bin/dnf-automatic.in
@@ -1,4 +1,4 @@
@@ -23,7 +24,7 @@ index 5b06aa26..9f6f703e 100755
#
# Copyright (C) 2014-2016 Red Hat, Inc.
diff --git a/bin/dnf.in b/bin/dnf.in
-index 645d0f06..ab141abd 100755
+index 645d0f06..bdf7b3c4 100755
--- a/bin/dnf.in
+++ b/bin/dnf.in
@@ -1,4 +1,4 @@
@@ -33,5 +34,5 @@ index 645d0f06..ab141abd 100755
#
# Copyright (C) 2012-2016 Red Hat, Inc.
--
-2.11.0
+2.14.2
diff --git a/meta/recipes-devtools/dnf/dnf_2.6.3.bb b/meta/recipes-devtools/dnf/dnf_2.7.5.bb
similarity index 92%
rename from meta/recipes-devtools/dnf/dnf_2.6.3.bb
rename to meta/recipes-devtools/dnf/dnf_2.7.5.bb
index 3ed6a74570f..fbd3bd45719 100644
--- a/meta/recipes-devtools/dnf/dnf_2.6.3.bb
+++ b/meta/recipes-devtools/dnf/dnf_2.7.5.bb
@@ -5,15 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
"
SRC_URI = "git://github.com/rpm-software-management/dnf.git \
+ file://0001-Corretly-install-tmpfiles.d-configuration.patch \
+ file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
+ file://0005-Do-not-prepend-installroot-to-logdir.patch \
file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0030-Run-python-scripts-using-env.patch \
- file://0001-Do-not-prepend-installroot-to-logdir.patch \
- file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
- file://0001-Corretly-install-tmpfiles.d-configuration.patch \
- file://0001-Check-conf.releasever-instead-of-releasever.patch \
"
-SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065"
+SRCREV = "564c44667c7014843fa6f1732621093114ec59b2"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
@@ -46,6 +45,7 @@ do_install_append_class-native() {
}
SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
+ dnf-automatic.service dnf-automatic.timer \
dnf-automatic-download.service dnf-automatic-download.timer \
dnf-automatic-install.service dnf-automatic-install.timer \
dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 14/27] gobject-introspection: update to 1.54.1
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (11 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 13/27] dnf: update to 2.7.5 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 15/27] gstreamer1.0-plugins: disable introspection on mips64 Alexander Kanavin
` (12 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...ect-introspection_1.52.1.bb => gobject-introspection_1.54.1.bb} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.52.1.bb => gobject-introspection_1.54.1.bb} (97%)
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.52.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
similarity index 97%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.52.1.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
index 3fe71a3896c..156dac7ca78 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.52.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
@@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \
file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/1.52/${BPN}-${PV}.tar.xz \
+SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \
file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
file://0003-giscanner-add-use-binary-wrapper-option.patch \
file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \
file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
"
-SRC_URI[md5sum] = "34157073991f9eeb0ed953351b65eb61"
-SRC_URI[sha256sum] = "2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4"
+SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41"
+SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e"
inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even
BBCLASSEXTEND = "native"
@@ -132,6 +132,7 @@ FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib"
# .gir files go to dev package, as they're needed for developing (but not for running)
# things that depends on introspection.
FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir"
+FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc"
# These are used by gobject-based packages
# to generate transient introspection binaries
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 15/27] gstreamer1.0-plugins: disable introspection on mips64
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (12 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 14/27] gobject-introspection: update to 1.54.1 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 16/27] gnome-desktop3: Update to 3.26.2 Alexander Kanavin
` (11 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
The failure is weird and difficult to diagnoze, so disable the
introspection for now:
qemu-mips64: error while loading shared libraries: .../recipe-sysroot/usr/lib/libgthread-2.0.so.0: ELF file data encoding not little-endian
Note that it shows up only for one specific library (gstaudio), and only
on mips64. Introspection data for other libraries is generated just fine.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 4 ++++
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 3 +++
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc | 2 ++
3 files changed, 9 insertions(+)
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
index 4c877982b74..26ae91c4847 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
@@ -15,3 +15,7 @@ PACKAGES =+ "${PN}-examples"
FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so"
FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
+
+# Needs to be disable due to a dependency on gstreamer-plugins introspection files
+EXTRA_OECONF_append_mips64 = " --disable-introspection "
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 3f6d4c37038..c40d3989119 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -49,3 +49,6 @@ patch_gtk_doc_makefiles() {
do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
PACKAGES_DYNAMIC = "^${PN}-.*"
+
+# qemu-mips64: error while loading shared libraries: .../recipe-sysroot/usr/lib/libgthread-2.0.so.0: ELF file data encoding not little-endian
+EXTRA_OECONF_append_mips64 = " --disable-introspection "
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
index 7191f9892d7..68173ce7d94 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
@@ -36,3 +36,5 @@ patch_gtk_doc_makefiles() {
do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
+# Needs to be disable due to a dependency on gstreamer-plugins introspection files
+EXTRA_OECONF_append_mips64 = " --disable-introspection "
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 16/27] gnome-desktop3: Update to 3.26.2
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (13 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 15/27] gstreamer1.0-plugins: disable introspection on mips64 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 17/27] webkitgtk: update to 2.18.3 Alexander Kanavin
` (10 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Add a patch to disable libseccomp (not currently used in Yocto).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...ble-libseccomp-sycall-filtering-mechanism.patch | 38 ++++++++++++++++++++++
...op-thumbnail-don-t-convert-time_t-to-long.patch | 31 +++++++++---------
...desktop3_3.24.2.bb => gnome-desktop3_3.26.2.bb} | 14 ++++----
3 files changed, 62 insertions(+), 21 deletions(-)
create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.24.2.bb => gnome-desktop3_3.26.2.bb} (66%)
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
new file mode 100644
index 00000000000..10b07435c42
--- /dev/null
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
@@ -0,0 +1,38 @@
+From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 5 Oct 2017 14:54:17 +0300
+Subject: [PATCH] Disable libseccomp (sycall filtering mechanism)
+
+Upstream forgot to make it optional, and it is not currently used in Yocto
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.ac | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86bcf1f..8911f19 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,17 +157,6 @@ else
+ fi
+
+ SECCOMP_PKG=""
+-dnl Check for bubblewrap compatible platform
+-case $host_os in
+- linux*)
+- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp])
+- SECCOMP_PKG="libseccomp"
+- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions])
+- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available])
+- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp])
+- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix])
+- ;;
+-esac
+
+ dnl pkg-config dependency checks
+
+--
+2.14.1
+
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
index 18a069fadc7..c1a7d4f40f5 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
@@ -1,31 +1,32 @@
-From adfa0c8f9fec1faac4bea6a94d947ea32e585923 Mon Sep 17 00:00:00 2001
+From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Tue, 13 Dec 2016 20:39:51 -0700
-Subject: [PATCH] gnome-desktop-thumbnail: don't convert time_t to long
+Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long
Explicitly use strftime+strptime rather than snprintf+atol. This fixes the
build for X32, where long's size doesn't match that of time_t.
Upstream-Status: Pending
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+
---
libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
-index 3946309..b756333 100644
+index e56c3d7..5d96bf3 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -126,6 +126,8 @@
+@@ -120,6 +120,8 @@
* Since: 2.2
*/
+#define _XOPEN_SOURCE
+
#include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -1483,6 +1485,7 @@ save_thumbnail (GdkPixbuf *pixbuf,
+
+ #include <glib.h>
+@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf,
char *tmp_path = NULL;
int tmp_fd;
char mtime_str[21];
@@ -33,11 +34,11 @@ index 3946309..b756333 100644
gboolean ret = FALSE;
GError *error = NULL;
const char *width, *height;
-@@ -1502,7 +1505,11 @@ save_thumbnail (GdkPixbuf *pixbuf,
+@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf,
goto out;
close (tmp_fd);
-- g_snprintf (mtime_str, 21, "%ld", mtime);
+- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);
+ tmp_mtime = localtime (&mtime);
+ if (!tmp_mtime)
+ goto out;
@@ -46,15 +47,15 @@ index 3946309..b756333 100644
width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
-@@ -1695,6 +1702,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
+@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
{
const char *thumb_uri, *thumb_mtime_str;
time_t thumb_mtime;
+ struct tm tmp_mtime;
-
+
thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");
- if (!thumb_uri)
-@@ -1705,7 +1713,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
+ if (g_strcmp0 (uri, thumb_uri) != 0)
+@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
if (!thumb_mtime_str)
return FALSE;
@@ -66,7 +67,7 @@ index 3946309..b756333 100644
+ return FALSE;
if (mtime != thumb_mtime)
return FALSE;
-
+
--
-2.8.0
+2.14.1
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
similarity index 66%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
index 5c1c213002d..cd6c194c1b7 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
BPN = "gnome-desktop"
inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93"
-SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"
-
-SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \
- file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
-"
+SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3"
+SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"
+
+SRC_URI += " \
+ file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \
+ file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
+ file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \
+ "
DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 17/27] webkitgtk: update to 2.18.3
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (14 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 16/27] gnome-desktop3: Update to 3.26.2 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 18/27] psmisc: update to 23.0 Alexander Kanavin
` (9 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no
longer present in upstream tree. However, a patch with different musl fixes
has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
Disable Gstreamer GL support on x86 due to clashing headers problem.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../webkitgtk/0001-Fix-build-with-musl.patch | 77 +++++++++
...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 23 +--
...c-settings-so-that-gtkdoc-generation-work.patch | 21 +--
...bKitMacros-Append-to-I-and-not-to-isystem.patch | 182 ++++++++-------------
...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 24 +--
.../detect-atomics-during-configure.patch | 26 ++-
meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 ---
.../recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 ------
.../webkit/webkitgtk/ppc-musl-fix.patch | 26 ---
.../{webkitgtk_2.16.6.bb => webkitgtk_2.18.3.bb} | 13 +-
10 files changed, 209 insertions(+), 254 deletions(-)
create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc7.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.16.6.bb => webkitgtk_2.18.3.bb} (93%)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
new file mode 100644
index 00000000000..7cc4514fccc
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
@@ -0,0 +1,77 @@
+From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 6 Oct 2017 17:00:08 +0300
+Subject: [PATCH] Fix build with musl
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
+ Source/WTF/wtf/Platform.h | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
+index 95080b9..2bb689c 100644
+--- a/Source/JavaScriptCore/runtime/MachineContext.h
++++ b/Source/JavaScriptCore/runtime/MachineContext.h
+@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+
+ #if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 5a2863b..b36c3ff 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -680,7 +680,7 @@
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+
+--
+2.14.1
+
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
index 615fe4f4025..896890b4334 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -1,19 +1,20 @@
-From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001
+From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 29 Aug 2016 16:38:11 +0300
-Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
+Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
- Source/WebKit2/PlatformGTK.cmake | 9 +++++----
+ Source/WebKit/PlatformGTK.cmake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
-diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
-index adaa010..f18cf8a 100644
---- a/Source/WebKit2/PlatformGTK.cmake
-+++ b/Source/WebKit2/PlatformGTK.cmake
-@@ -906,8 +906,9 @@ endif ()
+diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
+index a33c6a86..d83a2e77 100644
+--- a/Source/WebKit/PlatformGTK.cmake
++++ b/Source/WebKit/PlatformGTK.cmake
+@@ -1122,8 +1122,9 @@ endif ()
string(REGEX MATCHALL "-L[^ ]*"
INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
@@ -25,7 +26,7 @@ index adaa010..f18cf8a 100644
DEPENDS WebKit2
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
-@@ -950,7 +951,7 @@ add_custom_command(
+@@ -1168,7 +1169,7 @@ add_custom_command(
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -34,7 +35,7 @@ index adaa010..f18cf8a 100644
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
-@@ -1004,7 +1005,7 @@ add_custom_command(
+@@ -1225,7 +1226,7 @@ add_custom_command(
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
@@ -44,5 +45,5 @@ index adaa010..f18cf8a 100644
)
--
-2.9.3
+2.14.1
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
index 586dd2375c9..e1b69b2a214 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
@@ -1,8 +1,8 @@
-From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001
+From 3cc0e5900515cbcedd0447e0bdf487cc8d9a0f8c Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 11 Aug 2016 17:13:51 +0300
-Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
- OpenEmbedded build system
+Subject: [PATCH 5/9] Tweak gtkdoc settings so that gtkdoc generation works
+ under OpenEmbedded build system
This requires setting a few environment variables so that the transient
binary is build and linked correctly, and disabling the tweaks to RUN
@@ -10,26 +10,27 @@ variable from gtkdoc.py script so that our qemu wrapper is taken into use.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
Source/PlatformGTK.cmake | 2 +-
Tools/gtk/gtkdoc.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
-index af4d2e3..b7b93c7 100644
+index 50b5393f..7a31db51 100644
--- a/Source/PlatformGTK.cmake
+++ b/Source/PlatformGTK.cmake
-@@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
+@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
DEPENDS ${DocumentationDependencies}
-- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
-+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
+- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
++ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc -v ${_extra_args}
COMMAND touch ${_stamp_name}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
- )
+ VERBATIM
diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
-index 4c8237b..c0205f0 100644
+index 48f862a3..18240e42 100644
--- a/Tools/gtk/gtkdoc.py
+++ b/Tools/gtk/gtkdoc.py
@@ -318,9 +318,9 @@ class GTKDoc(object):
@@ -45,5 +46,5 @@ index 4c8237b..c0205f0 100644
if ldflags:
--
-2.8.1
+2.14.1
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
index d6f0ce3cd63..dfdc1160182 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -1,7 +1,7 @@
-From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001
+From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 17 Apr 2016 12:35:41 -0700
-Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
+Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem
gcc-6 has now introduced stdlib.h in libstdc++ for better
compliance and its including the C library stdlib.h using
@@ -15,68 +15,34 @@ and ends up with compile errors e.g.
/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
- Source/cmake/WebKitMacros.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+---
+ Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
+ Source/WebCore/PlatformGTK.cmake | 6 +++---
+ Source/WebKit/PlatformGTK.cmake | 2 +-
+ Source/cmake/WebKitMacros.cmake | 2 +-
+ Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
+ Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
+ 6 files changed, 8 insertions(+), 8 deletions(-)
-Index: webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.5.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
-+++ webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
-@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugIn_SYSTEM_INCL
- )
-
- include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
-
- set(WebKitTestNetscapePlugIn_LIBRARIES
- ${X11_LIBRARIES}
-Index: webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.5.orig/Tools/ImageDiff/CMakeLists.txt
-+++ webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt
-@@ -9,6 +9,6 @@ set(IMAGE_DIFF_LIBRARIES
- WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
- include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
- target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
-Index: webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.5.orig/Tools/MiniBrowser/gtk/CMakeLists.txt
-+++ webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -57,7 +57,7 @@ endif ()
- add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
-
- include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(MiniBrowser ${MiniBrowser_SOURCES})
- target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
-
-Index: webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.5.orig/Tools/WebKitTestRunner/CMakeLists.txt
-+++ webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt
-@@ -106,7 +106,7 @@ GENERATE_BINDINGS(WebKitTestRunnerBindin
- WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
- include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
+diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
+index bc37dd31..4e49871f 100644
+--- a/Source/JavaScriptCore/shell/CMakeLists.txt
++++ b/Source/JavaScriptCore/shell/CMakeLists.txt
+@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+ WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
+ WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
+ include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
+-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
++include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
+ add_executable(jsc ${JSC_SOURCES})
+ target_link_libraries(jsc ${JSC_LIBRARIES})
- add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
- target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
-Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.16.5.orig/Source/WebCore/PlatformGTK.cmake
-+++ webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
-@@ -321,7 +321,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
+index 73506c74..8eb8b415 100644
+--- a/Source/WebCore/PlatformGTK.cmake
++++ b/Source/WebCore/PlatformGTK.cmake
+@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
${GTK2_INCLUDE_DIRS}
${GDK2_INCLUDE_DIRS}
)
@@ -85,7 +51,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
)
target_link_libraries(WebCorePlatformGTK2
-@@ -346,7 +346,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP
+@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
target_include_directories(WebCorePlatformGTK PRIVATE
${WebCore_INCLUDE_DIRECTORIES}
)
@@ -94,7 +60,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
${GTK_INCLUDE_DIRS}
${GDK_INCLUDE_DIRS}
-@@ -362,7 +362,7 @@ include_directories(
+@@ -321,7 +321,7 @@ include_directories(
"${WEBCORE_DIR}/bindings/gobject/"
)
@@ -103,37 +69,11 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
)
-Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/PlatformGTK.cmake
-+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake
-@@ -20,7 +20,7 @@ include_directories(
- ${WEBKIT2_DIR}/UIProcess/API/gtk
- )
-
--include_directories(SYSTEM
-+include_directories(
- ${GDK3_INCLUDE_DIRS}
- ${GLIB_INCLUDE_DIRS}
- ${GTK3_INCLUDE_DIRS}
-Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
-+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
-@@ -21,7 +21,7 @@ include_directories(
- ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
- )
-
--include_directories(SYSTEM
-+include_directories(
- ${ATSPI_INCLUDE_DIRS}
- ${GLIB_INCLUDE_DIRS}
- ${GSTREAMER_INCLUDE_DIRS}
-Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.16.5.orig/Source/WebKit2/PlatformGTK.cmake
-+++ webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
-@@ -1156,7 +1156,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
+diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
+index d83a2e77..401246f4 100644
+--- a/Source/WebKit/PlatformGTK.cmake
++++ b/Source/WebKit/PlatformGTK.cmake
+@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
target_include_directories(WebKitPluginProcess2 PRIVATE
${WebKit2CommonIncludeDirectories}
)
@@ -142,29 +82,45 @@ Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
${WebKit2CommonSystemIncludeDirectories}
${GTK2_INCLUDE_DIRS}
${GDK2_INCLUDE_DIRS}
-Index: webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.5.orig/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
- WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(jsc ${JSC_SOURCES})
- target_link_libraries(jsc ${JSC_LIBRARIES})
-
-Index: webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake
-===================================================================
---- webkitgtk-2.16.5.orig/Source/cmake/WebKitMacros.cmake
-+++ webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake
-@@ -277,7 +277,7 @@ macro(WEBKIT_WRAP_SOURCELIST)
+diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
+index 7bc89543..d9818fa4 100644
+--- a/Source/cmake/WebKitMacros.cmake
++++ b/Source/cmake/WebKitMacros.cmake
+@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target)
endmacro()
macro(WEBKIT_FRAMEWORK _target)
- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
- add_library(${_target} ${${_target}_LIBRARY_TYPE}
+ target_sources(${_target} PRIVATE
${${_target}_HEADERS}
${${_target}_SOURCES}
+diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
+index e832a86d..ce92c864 100644
+--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
++++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
+@@ -57,7 +57,7 @@ endif ()
+ add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
+
+ include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
++include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
+ add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+ target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
+
+diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
+index 1be3dd52..7bdddf37 100644
+--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
++++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
+@@ -20,7 +20,7 @@ include_directories(
+ ${WEBKIT2_DIR}/UIProcess/API/gtk
+ )
+
+-include_directories(SYSTEM
++include_directories(
+ ${GDK3_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+--
+2.14.1
+
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
index 3f71297f504..fb4c4dc9325 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
@@ -1,23 +1,24 @@
-From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001
+From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 28 Oct 2015 14:18:57 +0200
-Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
- compiler flags.
+Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to
+ the compiler flags.
g-ir-compiler is using a C compiler internally, so it needs to set
the proper flags for it.
Upstream-Status: Pending [review on oe-core list]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
- Source/WebKit2/PlatformGTK.cmake | 4 ++--
+ Source/WebKit/PlatformGTK.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
-===================================================================
---- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake
-+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
-@@ -910,7 +910,7 @@ add_custom_command(
+diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
+index 7f92ae72..a33c6a86 100644
+--- a/Source/WebKit/PlatformGTK.cmake
++++ b/Source/WebKit/PlatformGTK.cmake
+@@ -1126,7 +1126,7 @@ add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
DEPENDS WebKit2
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -26,7 +27,7 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
${INTROSPECTION_SCANNER}
--quiet
-@@ -951,7 +951,7 @@ add_custom_command(
+@@ -1169,7 +1169,7 @@ add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -35,3 +36,6 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
${INTROSPECTION_SCANNER}
+--
+2.14.1
+
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
index 12836f28f2e..c6157e10378 100644
--- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
@@ -1,22 +1,31 @@
+From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 17 May 2017 22:34:24 -0700
+Subject: [PATCH 8/9] webkitgtk: Fix build for armv5
+
Taken from
https://bugs.webkit.org/show_bug.cgi?id=161900
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt
-===================================================================
---- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt
-+++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt
-@@ -182,7 +182,6 @@ set(WTF_HEADERS
+---
+ Source/WTF/wtf/CMakeLists.txt | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
+index 6b5e45b9..46ee3c22 100644
+--- a/Source/WTF/wtf/CMakeLists.txt
++++ b/Source/WTF/wtf/CMakeLists.txt
+@@ -205,7 +205,6 @@ set(WTF_HEADERS
set(WTF_SOURCES
Assertions.cpp
- Atomics.cpp
AutomaticThread.cpp
BitVector.cpp
- ClockType.cpp
-@@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC)
+ CPUTime.cpp
+@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC)
list(APPEND WTF_LIBRARIES bmalloc)
endif ()
@@ -32,3 +41,6 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt
list(APPEND WTF_SOURCES
unicode/icu/CollatorICU.cpp
)
+--
+2.14.1
+
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch
deleted file mode 100644
index aee29a9a72d..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Imported from
-https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch
-
-Add to CXX flags since webkitgtk uses c++ compiler by default
-Fixes
-Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 'JSC::JSGenericTypedArrayView<Adaptor>::vector() const'
-| return bitwise_cast<const typename Adaptor::Type*>(vector());
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com
-Upstream-Status: Pending
-
-diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake
---- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100
-+++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100
-@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
- endif ()
-
- if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
diff --git a/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
deleted file mode 100644
index 4fdd56fea04..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Replace __GLIBC__ with __linux__ since musl also supports it
-so checking __linux__ is more accomodating
-
-See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-===================================================================
---- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers:
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__) && ENABLE(JIT)
-+#elif defined(__linux__) && ENABLE(JIT)
-
- #if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
-@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers:
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif defined(__linux__) // glibc and musl
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers:
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif defined(__linux__) // glibc and musl
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers:
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif defined(__linux__) // glibc and musl
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
diff --git a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
deleted file mode 100644
index a1ad248aac0..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-ucontext structure is different between musl and glibc for ppc
-therefore its not enough just to check for arch alone, we also
-need to check for libc type.
-
-Fixes errors like
-
-Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
- thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-===================================================================
---- webkitgtk-2.16.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -88,7 +88,7 @@ static void pthreadSignalHandlerSuspendR
- }
-
- ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
--#if CPU(PPC)
-+#if CPU(PPC) && defined(__GLIBC__)
- threadData->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
- #else
- threadData->suspendedMachineContext = userContext->uc_mcontext;
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb
similarity index 93%
rename from meta/recipes-sato/webkit/webkitgtk_2.16.6.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.18.3.bb
index 0f126cba813..00b5a15e085 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.18.3.bb
@@ -13,19 +13,17 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
- file://musl-fixes.patch \
- file://ppc-musl-fix.patch \
file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
file://x32_support.patch \
file://cross-compile.patch \
- file://gcc7.patch \
file://detect-atomics-during-configure.patch \
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
+ file://0001-Fix-build-with-musl.patch \
"
-SRC_URI[md5sum] = "0e2d142a586e4ff79cf0324f4fdbf20c"
-SRC_URI[sha256sum] = "fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21"
+SRC_URI[md5sum] = "264a22d7467deae606e42b6eb5dd65af"
+SRC_URI[sha256sum] = "e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e"
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
@@ -37,7 +35,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
pango icu bison-native gawk intltool-native libwebp \
atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
ruby-native libnotify gstreamer1.0-plugins-bad \
- gettext-native glib-2.0 glib-2.0-native \
+ gettext-native glib-2.0 glib-2.0-native libtasn1 \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
@@ -66,6 +64,9 @@ EXTRA_OECMAKE = " \
-DPYTHON_EXECUTABLE=`which python` \
"
+# GL/GLES header clash: both define the same thing, differently, on 32 bit x86
+EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF "
+
# Javascript JIT is not supported on powerpc
EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF "
EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF "
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 18/27] psmisc: update to 23.0
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (15 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 17/27] webkitgtk: update to 2.18.3 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-17 0:25 ` Burton, Ross
2017-11-14 14:57 ` [PATCH 19/27] btrfs-tools: update to 4.13.3 Alexander Kanavin
` (8 subsequent siblings)
25 siblings, 1 reply; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Switch to gitlab, as that's where development now happens.
Drop two upstreamed patches, add two patches to avoid newly
introduced build errors.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46 ----------------------
.../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 --------------
...-create-src-directory-before-attempting-t.patch | 30 ++++++++++++++
...efile.am-do-not-recurse-into-po-directory.patch | 30 ++++++++++++++
meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 ------
meta/recipes-extended/psmisc/psmisc_23.0.bb | 11 ++++++
6 files changed, 71 insertions(+), 87 deletions(-)
delete mode 100644 meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
delete mode 100644 meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
create mode 100644 meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
create mode 100644 meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.21.bb
create mode 100644 meta/recipes-extended/psmisc/psmisc_23.0.bb
diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
deleted file mode 100644
index e57d60f6a34..00000000000
--- a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Fri, 28 Feb 2014 21:55:02 +1100
-Subject: [PATCH] Typo in fuser makes -M on all the time
-
-Brad found that fuser had the -M option on all the time.
-A simple but significant typo caused this, thanks the the patch.
-
-Bug-Debian: http://bugs.debian.org/740275
-
-Upstream-Status: Backport
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
- ChangeLog | 4 ++++
- src/fuser.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+ * Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- * Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- usage(_("No process specification given"));
-
- /* Check if -M flag was used and if so check mounts */
-- if (opts * OPT_ISMOUNTPOINT) {
-+ if (opts & OPT_ISMOUNTPOINT) {
- check_mountpoints(&mounts, &names_head, &names_tail);
- }
-
---
-1.8.4.2
-
diff --git a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch b/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
deleted file mode 100644
index c8afcac8a8b..00000000000
--- a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001
-From: Paul Barker <paul@paulbarker.me.uk>
-Date: Wed, 20 Aug 2014 10:31:37 +0000
-Subject: [PATCH] Include <limits.h> for PATH_MAX
-
-When building against musl libc, PATH_MAX is defined in <limits.h>.
-
-Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
-
-Upstream-Status: Accepted (Should be in next release after 22.21)
----
- src/pstree.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pstree.c b/src/pstree.c
-index 071e6c4..0d28260 100644
---- a/src/pstree.c
-+++ b/src/pstree.c
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <limits.h>
-
- #include "i18n.h"
- #include "comm.h"
---
-2.0.4
-
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
new file mode 100644
index 00000000000..4d44495fd3f
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
@@ -0,0 +1,30 @@
+From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 2 Nov 2017 16:21:22 +0200
+Subject: [PATCH] Makefile.am: create src directory before attempting to write
+ there
+
+Otherwise out of tree builds will fail.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9f61ab4..b4ced7f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md
+ CLEANFILES = src/signames.h
+
+ src/signames.h: src/signames.c Makefile
+- export LC_ALL=C ; \
++ export LC_ALL=C ; mkdir -p src ; \
+ @CPP@ -dM $< |\
+ tr -s '\t ' ' ' | sort -n -k 3 | sed \
+ 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \
+--
+2.14.2
+
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
new file mode 100644
index 00000000000..72f993a1702
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
@@ -0,0 +1,30 @@
+From bbd69f375a0eaeba3bfa17008f8ff41e836c1688 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 2 Nov 2017 16:39:59 +0200
+Subject: [PATCH] Makefile.am: do not recurse into po directory
+
+Some broken autoconf logic results in a missing Makefile - let's
+just skip the directory with translations, as users of psmisc are unlikely
+to need those anyway.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b4ced7f..0d343a6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,6 @@ ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = \
+ doc \
+- po \
+ icons \
+ testsuite
+
+--
+2.14.2
+
diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/meta/recipes-extended/psmisc/psmisc_22.21.bb
deleted file mode 100644
index 1c6473ebf43..00000000000
--- a/meta/recipes-extended/psmisc/psmisc_22.21.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require psmisc.inc
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-
-SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
-SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
- file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \
- file://0002-Include-limits.h-for-PATH_MAX.patch \
- file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
- "
diff --git a/meta/recipes-extended/psmisc/psmisc_23.0.bb b/meta/recipes-extended/psmisc/psmisc_23.0.bb
new file mode 100644
index 00000000000..e036ae25508
--- /dev/null
+++ b/meta/recipes-extended/psmisc/psmisc_23.0.bb
@@ -0,0 +1,11 @@
+require psmisc.inc
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
+ file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
+ file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \
+ file://0001-Makefile.am-do-not-recurse-into-po-directory.patch \
+ "
+SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80"
+S = "${WORKDIR}/git"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* Re: [PATCH 18/27] psmisc: update to 23.0
2017-11-14 14:57 ` [PATCH 18/27] psmisc: update to 23.0 Alexander Kanavin
@ 2017-11-17 0:25 ` Burton, Ross
2017-11-17 0:35 ` Burton, Ross
0 siblings, 1 reply; 35+ messages in thread
From: Burton, Ross @ 2017-11-17 0:25 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 9421 bytes --]
I'm not sure that disabling translations entirely is a suitable fix for
upstreams makefile being broken (or our recipe breaking)...
Did you look at the upstream repo to see if they've a fix, or how
complicated the fix would be?
Ross
On 14 November 2017 at 14:57, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:
> Switch to gitlab, as that's where development now happens.
> Drop two upstreamed patches, add two patches to avoid newly
> introduced build errors.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46
> ----------------------
> .../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 --------------
> ...-create-src-directory-before-attempting-t.patch | 30 ++++++++++++++
> ...efile.am-do-not-recurse-into-po-directory.patch | 30 ++++++++++++++
> meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 ------
> meta/recipes-extended/psmisc/psmisc_23.0.bb | 11 ++++++
> 6 files changed, 71 insertions(+), 87 deletions(-)
> delete mode 100644 meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-
> makes-M-on-all-the-time.patch
> delete mode 100644 meta/recipes-extended/psmisc/
> files/0002-Include-limits.h-for-PATH_MAX.patch
> create mode 100644 meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-
> create-src-directory-before-attempting-t.patch
> create mode 100644 meta/recipes-extended/psmisc/
> psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
> delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.21.bb
> create mode 100644 meta/recipes-extended/psmisc/psmisc_23.0.bb
>
> diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in-
> fuser-makes-M-on-all-the-time.patch b/meta/recipes-extended/
> psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
> deleted file mode 100644
> index e57d60f6a34..00000000000
> --- a/meta/recipes-extended/psmisc/files/0001-Typo-in-
> fuser-makes-M-on-all-the-time.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
> -From: Brad Jorsch <anomie@users.sourceforge.net>
> -Date: Fri, 28 Feb 2014 21:55:02 +1100
> -Subject: [PATCH] Typo in fuser makes -M on all the time
> -
> -Brad found that fuser had the -M option on all the time.
> -A simple but significant typo caused this, thanks the the patch.
> -
> -Bug-Debian: http://bugs.debian.org/740275
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Craig Small <csmall@enc.com.au>
> ----
> - ChangeLog | 4 ++++
> - src/fuser.c | 2 +-
> - 2 files changed, 5 insertions(+), 1 deletion(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index fd1cccf..e5f784c 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,3 +1,7 @@
> -+Changes in 22.22
> -+================
> -+ * Fixed typo in fuser which has -M on Debian #740275
> -+
> - Changes in 22.21
> - ================
> - * Missing comma in fuser(1) added Debian #702391
> -diff --git a/src/fuser.c b/src/fuser.c
> -index b485f65..389b302 100644
> ---- a/src/fuser.c
> -+++ b/src/fuser.c
> -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
> - usage(_("No process specification given"));
> -
> - /* Check if -M flag was used and if so check mounts */
> -- if (opts * OPT_ISMOUNTPOINT) {
> -+ if (opts & OPT_ISMOUNTPOINT) {
> - check_mountpoints(&mounts, &names_head, &names_tail);
> - }
> -
> ---
> -1.8.4.2
> -
> diff --git a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
> b/meta/recipes-extended/psmisc/files/0002-Include-
> limits.h-for-PATH_MAX.patch
> deleted file mode 100644
> index c8afcac8a8b..00000000000
> --- a/meta/recipes-extended/psmisc/files/0002-Include-
> limits.h-for-PATH_MAX.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001
> -From: Paul Barker <paul@paulbarker.me.uk>
> -Date: Wed, 20 Aug 2014 10:31:37 +0000
> -Subject: [PATCH] Include <limits.h> for PATH_MAX
> -
> -When building against musl libc, PATH_MAX is defined in <limits.h>.
> -
> -Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> -
> -Upstream-Status: Accepted (Should be in next release after 22.21)
> ----
> - src/pstree.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/src/pstree.c b/src/pstree.c
> -index 071e6c4..0d28260 100644
> ---- a/src/pstree.c
> -+++ b/src/pstree.c
> -@@ -41,6 +41,7 @@
> - #include <sys/types.h>
> - #include <sys/stat.h>
> - #include <sys/ioctl.h>
> -+#include <limits.h>
> -
> - #include "i18n.h"
> - #include "comm.h"
> ---
> -2.0.4
> -
> diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.
> am-create-src-directory-before-attempting-t.patch b/meta/recipes-extended/
> psmisc/psmisc/0001-Makefile.am-create-src-directory-
> before-attempting-t.patch
> new file mode 100644
> index 00000000000..4d44495fd3f
> --- /dev/null
> +++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.
> am-create-src-directory-before-attempting-t.patch
> @@ -0,0 +1,30 @@
> +From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Thu, 2 Nov 2017 16:21:22 +0200
> +Subject: [PATCH] Makefile.am: create src directory before attempting to
> write
> + there
> +
> +Otherwise out of tree builds will fail.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + Makefile.am | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 9f61ab4..b4ced7f 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md
> + CLEANFILES = src/signames.h
> +
> + src/signames.h: src/signames.c Makefile
> +- export LC_ALL=C ; \
> ++ export LC_ALL=C ; mkdir -p src ; \
> + @CPP@ -dM $< |\
> + tr -s '\t ' ' ' | sort -n -k 3 | sed \
> + 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1"
> },:p;d' | \
> +--
> +2.14.2
> +
> diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.
> am-do-not-recurse-into-po-directory.patch b/meta/recipes-extended/
> psmisc/psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
> new file mode 100644
> index 00000000000..72f993a1702
> --- /dev/null
> +++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.
> am-do-not-recurse-into-po-directory.patch
> @@ -0,0 +1,30 @@
> +From bbd69f375a0eaeba3bfa17008f8ff41e836c1688 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Thu, 2 Nov 2017 16:39:59 +0200
> +Subject: [PATCH] Makefile.am: do not recurse into po directory
> +
> +Some broken autoconf logic results in a missing Makefile - let's
> +just skip the directory with translations, as users of psmisc are unlikely
> +to need those anyway.
> +
> +Upstream-Status: Inappropriate [oe-core specific]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + Makefile.am | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index b4ced7f..0d343a6 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -11,7 +11,6 @@ ACLOCAL_AMFLAGS = -I m4
> +
> + SUBDIRS = \
> + doc \
> +- po \
> + icons \
> + testsuite
> +
> +--
> +2.14.2
> +
> diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb
> b/meta/recipes-extended/psmisc/psmisc_22.21.bb
> deleted file mode 100644
> index 1c6473ebf43..00000000000
> --- a/meta/recipes-extended/psmisc/psmisc_22.21.bb
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -require psmisc.inc
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
> -
> -SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
> -SRC_URI[sha256sum] = "97323cad619210845b696d7d722c38
> 3852b2acb5c49b5b0852c4f29c77a8145a"
> -
> -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
> - file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \
> - file://0002-Include-limits.h-for-PATH_MAX.patch \
> - file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
> - "
> diff --git a/meta/recipes-extended/psmisc/psmisc_23.0.bb
> b/meta/recipes-extended/psmisc/psmisc_23.0.bb
> new file mode 100644
> index 00000000000..e036ae25508
> --- /dev/null
> +++ b/meta/recipes-extended/psmisc/psmisc_23.0.bb
> @@ -0,0 +1,11 @@
> +require psmisc.inc
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
> +
> +SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
> + file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
> + file://0001-Makefile.am-create-src-directory-before-
> attempting-t.patch \
> + file://0001-Makefile.am-do-not-recurse-into-po-directory.patch
> \
> + "
> +SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80"
> +S = "${WORKDIR}/git"
> --
> 2.15.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 12506 bytes --]
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 18/27] psmisc: update to 23.0
2017-11-17 0:25 ` Burton, Ross
@ 2017-11-17 0:35 ` Burton, Ross
2017-11-17 7:10 ` Alexander Kanavin
0 siblings, 1 reply; 35+ messages in thread
From: Burton, Ross @ 2017-11-17 0:35 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 10871 bytes --]
Boom.
packages/corei7-64-poky-linux/psmisc: PACKAGES: removed "psmisc-locale",
added "psmisc-locale-uk psmisc-locale-sv psmisc-locale-el psmisc-locale-ro
psmisc-locale-da psmisc-locale-hr psmisc-locale-cs psmisc-locale-eo
psmisc-locale-id psmisc-locale-sr psmisc-locale-it psmisc-locale-pt-br
psmisc-locale-eu psmisc-locale-fi psmisc-locale-ca psmisc-locale-fr
psmisc-locale-zh-tw psmisc-locale-pt psmisc-locale-de psmisc-locale-nl
psmisc-locale-zh-cn psmisc-locale-bg psmisc-locale-vi psmisc-locale-nb
psmisc-locale-hu psmisc-locale-pl psmisc-locale-ja psmisc-locale-ru"
Upstream has a custom autogen.sh which invokes po/update-potfiles as they
don't ship a po/POTFILES.in (which is silly). Without that file gettext
doesn't believe po/ is a gettext directory and won't generate po/Makefile.
We also disable autopoint by default in autotools.bbclass so that needs to
be re-enabled (I've a long-standing branch to fix that but need to finish
it off).
This fixes the build:
EXTRA_AUTORECONF=""
do_configure_prepend() {
( cd ${S} && po/update-potfiles )
}
Ross
On 17 November 2017 at 00:25, Burton, Ross <ross.burton@intel.com> wrote:
> I'm not sure that disabling translations entirely is a suitable fix for
> upstreams makefile being broken (or our recipe breaking)...
>
> Did you look at the upstream repo to see if they've a fix, or how
> complicated the fix would be?
>
> Ross
>
> On 14 November 2017 at 14:57, Alexander Kanavin <alexander.kanavin@linux.
> intel.com> wrote:
>
>> Switch to gitlab, as that's where development now happens.
>> Drop two upstreamed patches, add two patches to avoid newly
>> introduced build errors.
>>
>> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>> ---
>> ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46
>> ----------------------
>> .../files/0002-Include-limits.h-for-PATH_MAX.patch | 29 --------------
>> ...-create-src-directory-before-attempting-t.patch | 30 ++++++++++++++
>> ...efile.am-do-not-recurse-into-po-directory.patch | 30 ++++++++++++++
>> meta/recipes-extended/psmisc/psmisc_22.21.bb | 12 ------
>> meta/recipes-extended/psmisc/psmisc_23.0.bb | 11 ++++++
>> 6 files changed, 71 insertions(+), 87 deletions(-)
>> delete mode 100644 meta/recipes-extended/psmisc/f
>> iles/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
>> delete mode 100644 meta/recipes-extended/psmisc/f
>> iles/0002-Include-limits.h-for-PATH_MAX.patch
>> create mode 100644 meta/recipes-extended/psmisc/p
>> smisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
>> create mode 100644 meta/recipes-extended/psmisc/p
>> smisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
>> delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.21.bb
>> create mode 100644 meta/recipes-extended/psmisc/psmisc_23.0.bb
>>
>> diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
>> b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-
>> makes-M-on-all-the-time.patch
>> deleted file mode 100644
>> index e57d60f6a34..00000000000
>> --- a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-
>> makes-M-on-all-the-time.patch
>> +++ /dev/null
>> @@ -1,46 +0,0 @@
>> -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
>> -From: Brad Jorsch <anomie@users.sourceforge.net>
>> -Date: Fri, 28 Feb 2014 21:55:02 +1100
>> -Subject: [PATCH] Typo in fuser makes -M on all the time
>> -
>> -Brad found that fuser had the -M option on all the time.
>> -A simple but significant typo caused this, thanks the the patch.
>> -
>> -Bug-Debian: http://bugs.debian.org/740275
>> -
>> -Upstream-Status: Backport
>> -
>> -Signed-off-by: Craig Small <csmall@enc.com.au>
>> ----
>> - ChangeLog | 4 ++++
>> - src/fuser.c | 2 +-
>> - 2 files changed, 5 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index fd1cccf..e5f784c 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,3 +1,7 @@
>> -+Changes in 22.22
>> -+================
>> -+ * Fixed typo in fuser which has -M on Debian #740275
>> -+
>> - Changes in 22.21
>> - ================
>> - * Missing comma in fuser(1) added Debian #702391
>> -diff --git a/src/fuser.c b/src/fuser.c
>> -index b485f65..389b302 100644
>> ---- a/src/fuser.c
>> -+++ b/src/fuser.c
>> -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
>> - usage(_("No process specification given"));
>> -
>> - /* Check if -M flag was used and if so check mounts */
>> -- if (opts * OPT_ISMOUNTPOINT) {
>> -+ if (opts & OPT_ISMOUNTPOINT) {
>> - check_mountpoints(&mounts, &names_head, &names_tail);
>> - }
>> -
>> ---
>> -1.8.4.2
>> -
>> diff --git a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch
>> b/meta/recipes-extended/psmisc/files/0002-Include-limits.h-
>> for-PATH_MAX.patch
>> deleted file mode 100644
>> index c8afcac8a8b..00000000000
>> --- a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-
>> for-PATH_MAX.patch
>> +++ /dev/null
>> @@ -1,29 +0,0 @@
>> -From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001
>> -From: Paul Barker <paul@paulbarker.me.uk>
>> -Date: Wed, 20 Aug 2014 10:31:37 +0000
>> -Subject: [PATCH] Include <limits.h> for PATH_MAX
>> -
>> -When building against musl libc, PATH_MAX is defined in <limits.h>.
>> -
>> -Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
>> -
>> -Upstream-Status: Accepted (Should be in next release after 22.21)
>> ----
>> - src/pstree.c | 1 +
>> - 1 file changed, 1 insertion(+)
>> -
>> -diff --git a/src/pstree.c b/src/pstree.c
>> -index 071e6c4..0d28260 100644
>> ---- a/src/pstree.c
>> -+++ b/src/pstree.c
>> -@@ -41,6 +41,7 @@
>> - #include <sys/types.h>
>> - #include <sys/stat.h>
>> - #include <sys/ioctl.h>
>> -+#include <limits.h>
>> -
>> - #include "i18n.h"
>> - #include "comm.h"
>> ---
>> -2.0.4
>> -
>> diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-
>> create-src-directory-before-attempting-t.patch
>> b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-
>> create-src-directory-before-attempting-t.patch
>> new file mode 100644
>> index 00000000000..4d44495fd3f
>> --- /dev/null
>> +++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-
>> create-src-directory-before-attempting-t.patch
>> @@ -0,0 +1,30 @@
>> +From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001
>> +From: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Date: Thu, 2 Nov 2017 16:21:22 +0200
>> +Subject: [PATCH] Makefile.am: create src directory before attempting to
>> write
>> + there
>> +
>> +Otherwise out of tree builds will fail.
>> +
>> +Upstream-Status: Pending
>> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> +---
>> + Makefile.am | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/Makefile.am b/Makefile.am
>> +index 9f61ab4..b4ced7f 100644
>> +--- a/Makefile.am
>> ++++ b/Makefile.am
>> +@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md
>> + CLEANFILES = src/signames.h
>> +
>> + src/signames.h: src/signames.c Makefile
>> +- export LC_ALL=C ; \
>> ++ export LC_ALL=C ; mkdir -p src ; \
>> + @CPP@ -dM $< |\
>> + tr -s '\t ' ' ' | sort -n -k 3 | sed \
>> + 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\
>> \2,"\1" },:p;d' | \
>> +--
>> +2.14.2
>> +
>> diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-
>> not-recurse-into-po-directory.patch b/meta/recipes-extended/psmisc
>> /psmisc/0001-Makefile.am-do-not-recurse-into-po-directory.patch
>> new file mode 100644
>> index 00000000000..72f993a1702
>> --- /dev/null
>> +++ b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-do-
>> not-recurse-into-po-directory.patch
>> @@ -0,0 +1,30 @@
>> +From bbd69f375a0eaeba3bfa17008f8ff41e836c1688 Mon Sep 17 00:00:00 2001
>> +From: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Date: Thu, 2 Nov 2017 16:39:59 +0200
>> +Subject: [PATCH] Makefile.am: do not recurse into po directory
>> +
>> +Some broken autoconf logic results in a missing Makefile - let's
>> +just skip the directory with translations, as users of psmisc are
>> unlikely
>> +to need those anyway.
>> +
>> +Upstream-Status: Inappropriate [oe-core specific]
>> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> +---
>> + Makefile.am | 1 -
>> + 1 file changed, 1 deletion(-)
>> +
>> +diff --git a/Makefile.am b/Makefile.am
>> +index b4ced7f..0d343a6 100644
>> +--- a/Makefile.am
>> ++++ b/Makefile.am
>> +@@ -11,7 +11,6 @@ ACLOCAL_AMFLAGS = -I m4
>> +
>> + SUBDIRS = \
>> + doc \
>> +- po \
>> + icons \
>> + testsuite
>> +
>> +--
>> +2.14.2
>> +
>> diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb
>> b/meta/recipes-extended/psmisc/psmisc_22.21.bb
>> deleted file mode 100644
>> index 1c6473ebf43..00000000000
>> --- a/meta/recipes-extended/psmisc/psmisc_22.21.bb
>> +++ /dev/null
>> @@ -1,12 +0,0 @@
>> -require psmisc.inc
>> -LICENSE = "GPLv2"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
>> -
>> -SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
>> -SRC_URI[sha256sum] = "97323cad619210845b696d7d722c3
>> 83852b2acb5c49b5b0852c4f29c77a8145a"
>> -
>> -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
>> - file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \
>> - file://0002-Include-limits.h-for-PATH_MAX.patch \
>> - file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
>> - "
>> diff --git a/meta/recipes-extended/psmisc/psmisc_23.0.bb
>> b/meta/recipes-extended/psmisc/psmisc_23.0.bb
>> new file mode 100644
>> index 00000000000..e036ae25508
>> --- /dev/null
>> +++ b/meta/recipes-extended/psmisc/psmisc_23.0.bb
>> @@ -0,0 +1,11 @@
>> +require psmisc.inc
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
>> +
>> +SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
>> + file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
>> + file://0001-Makefile.am-create-src-directory-before-attempti
>> ng-t.patch \
>> + file://0001-Makefile.am-do-not-recurse-into-po-directory.patch
>> \
>> + "
>> +SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80"
>> +S = "${WORKDIR}/git"
>> --
>> 2.15.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>
[-- Attachment #2: Type: text/html, Size: 14502 bytes --]
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 18/27] psmisc: update to 23.0
2017-11-17 0:35 ` Burton, Ross
@ 2017-11-17 7:10 ` Alexander Kanavin
0 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-17 7:10 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 11/17/2017 02:35 AM, Burton, Ross wrote:
> This fixes the build:
>
> EXTRA_AUTORECONF=""
> do_configure_prepend() {
> ( cd ${S} && po/update-potfiles )
> }
Thanks for looking! I admit I try to avoid becoming better at autotools :)
There's also the question of me being the de facto maintainer of jku's
recipes, which means I cut corners a bit more than I otherwise would.
Alex
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 19/27] btrfs-tools: update to 4.13.3
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (16 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 18/27] psmisc: update to 23.0 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 20/27] expect: update to 5.45.3 Alexander Kanavin
` (7 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../btrfs-tools/{btrfs-tools_4.13.2.bb => btrfs-tools_4.13.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.13.2.bb => btrfs-tools_4.13.3.bb} (96%)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
similarity index 96%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
index 43924d874d1..263fc657550 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
@@ -14,7 +14,7 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"
-SRCREV = "37f1faef159ebcf91846e7126879b1a413cb29a5"
+SRCREV = "a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
file://0001-Makefile-build-mktables-using-native-gcc.patch \
file://0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch \
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 20/27] expect: update to 5.45.3
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (17 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 19/27] btrfs-tools: update to 4.13.3 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 21/27] libpciaccess: update to 0.14 Alexander Kanavin
` (6 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-devtools/expect/{expect_5.45.bb => expect_5.45.3.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/expect/{expect_5.45.bb => expect_5.45.3.bb} (95%)
diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.3.bb
similarity index 95%
rename from meta/recipes-devtools/expect/expect_5.45.bb
rename to meta/recipes-devtools/expect/expect_5.45.3.bb
index c9f5aba8970..445eca5742d 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.3.bb
@@ -18,8 +18,6 @@ RDEPENDS_${PN} = "tcl"
inherit autotools update-alternatives
-PR = "r1"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
file://0001-configure.in.patch \
file://0002-tcl.m4.patch \
@@ -28,8 +26,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
file://0001-Resolve-string-formatting-issues.patch \
file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
"
-SRC_URI[md5sum] = "44e1a4f4c877e9ddc5a542dfa7ecc92b"
-SRC_URI[sha256sum] = "b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040"
+SRC_URI[md5sum] = "a8855cd41c1ef004b9794db9e2a57a9d"
+SRC_URI[sha256sum] = "c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/expect/files/Expect/"
UPSTREAM_CHECK_REGEX = "/Expect/(?P<pver>(\d+[\.\-_]*)+)/"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 21/27] libpciaccess: update to 0.14
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (18 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 20/27] expect: update to 5.45.3 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 22/27] icu: update to 60.1 Alexander Kanavin
` (5 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../xorg-lib/{libpciaccess_0.13.5.bb => libpciaccess_0.14.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.13.5.bb => libpciaccess_0.14.bb} (74%)
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
similarity index 74%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
index a3b682b09b6..a44a5c89279 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
@@ -9,8 +9,8 @@ SRC_URI += "\
file://0004-Don-t-include-sys-io.h-on-arm.patch \
"
-SRC_URI[md5sum] = "d810ab17e24c1418dedf7207fb2841d4"
-SRC_URI[sha256sum] = "752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999"
+SRC_URI[md5sum] = "8f436e151d5106a9cfaa71857a066d33"
+SRC_URI[sha256sum] = "3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4"
LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 22/27] icu: update to 60.1
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (19 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 21/27] libpciaccess: update to 0.14 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 23/27] harfbuzz: update to 1.7.0 Alexander Kanavin
` (4 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Rebase a couple of patches.
LICENSE checksum change due to typo fix.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../icu/icu/0001-i18n-Drop-include-xlocale.h.patch | 28 ++++++++++++----------
.../recipes-support/icu/icu/fix-install-manx.patch | 25 ++++++++++++-------
.../icu/{icu_59.1.bb => icu_60.1.bb} | 6 ++---
3 files changed, 35 insertions(+), 24 deletions(-)
rename meta/recipes-support/icu/{icu_59.1.bb => icu_60.1.bb} (78%)
diff --git a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
index add0d765b7f..0c61893d7c1 100644
--- a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
+++ b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
@@ -1,31 +1,33 @@
-From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001
+From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 24 Jun 2017 22:52:40 -0700
-Subject: [PATCH] i18n: Drop include <xlocale.h>
+Subject: [PATCH 3/4] i18n: Drop include <xlocale.h>
glibc 2.26 drops this header
Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
- i18n/digitlst.cpp | 6 +-----
+---
+ source/i18n/digitlst.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
-Index: source/i18n/digitlst.cpp
-===================================================================
---- source.orig/i18n/digitlst.cpp
-+++ source/i18n/digitlst.cpp
-@@ -61,11 +61,7 @@
+diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp
+index 8e86fa7..0bdbb2c 100644
+--- a/i18n/digitlst.cpp
++++ b/i18n/digitlst.cpp
+@@ -62,11 +62,7 @@
#endif
#if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
--# include <locale.h>
--# else
+-# if U_HAVE_XLOCALE_H
-# include <xlocale.h>
+-# else
+-# include <locale.h>
-# endif
+# include <locale.h>
#endif
// ***************************************************************************
+--
+2.14.2
+
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch
index ec63f50c469..8186fb41227 100644
--- a/meta/recipes-support/icu/icu/fix-install-manx.patch
+++ b/meta/recipes-support/icu/icu/fix-install-manx.patch
@@ -1,3 +1,8 @@
+From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Fri, 9 Oct 2015 17:50:41 +0100
+Subject: [PATCH 2/4] icu: fix install race
+
The generic recursive target calls target-local so also adding it to the
dependency list results in races due to install-local being executed twice in
parallel. For example, install-manx can fail if the two install processes race
@@ -9,12 +14,15 @@ in the install command.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ source/Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/Makefile.in b/Makefile.in
-index 9db6c52..3441afa 100644
+diff --git a/source/Makefile.in b/source/Makefile.in
+index c1db15b..4948deb 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -71,7 +71,7 @@ EXTRA_DATA =
+@@ -73,7 +73,7 @@ EXTRA_DATA =
## List of phony targets
.PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \
@@ -23,7 +31,7 @@ index 9db6c52..3441afa 100644
distclean-local distclean-recursive doc dist dist-local dist-recursive \
check check-local check-recursive clean-recursive-with-twist install-icu \
doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \
-@@ -82,10 +82,10 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist
+@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist
## List of standard targets
all: all-local all-recursive
@@ -31,13 +39,11 @@ index 9db6c52..3441afa 100644
+install: install-recursive
clean: clean-recursive-with-twist clean-local
-distclean : distclean-recursive distclean-local
--dist: dist-recursive dist-local
+distclean : distclean-recursive
-+dist: dist-recursive
+ dist: dist-recursive
check: all check-recursive
check-recursive: all
- xcheck: all xcheck-recursive
-@@ -352,7 +352,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
+@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
install-manx: $(MANX_FILES)
$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
@@ -46,3 +52,6 @@ index 9db6c52..3441afa 100644
config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in
cd $(top_builddir) \
+--
+2.14.2
+
diff --git a/meta/recipes-support/icu/icu_59.1.bb b/meta/recipes-support/icu/icu_60.1.bb
similarity index 78%
rename from meta/recipes-support/icu/icu_59.1.bb
rename to meta/recipes-support/icu/icu_60.1.bb
index 31f017b3701..d9d6b37ce96 100644
--- a/meta/recipes-support/icu/icu_59.1.bb
+++ b/meta/recipes-support/icu/icu_60.1.bb
@@ -1,6 +1,6 @@
require icu.inc
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=fe9e1f2c500466d8f18df2cd068e4b74"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226"
def icu_download_version(d):
pvsplit = d.getVar('PV').split('.')
@@ -22,8 +22,8 @@ SRC_URI = "${BASE_SRC_URI} \
SRC_URI_append_class-target = "\
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
"
-SRC_URI[md5sum] = "54923fa9fab5b2b83f235fb72523de37"
-SRC_URI[sha256sum] = "7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe"
+SRC_URI[md5sum] = "3d164a2d1bcebd1464c6160ebb8315ef"
+SRC_URI[sha256sum] = "f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 23/27] harfbuzz: update to 1.7.0
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (20 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 22/27] icu: update to 60.1 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 24/27] lighttpd: update to 1.4.48 Alexander Kanavin
` (3 subsequent siblings)
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../harfbuzz/{harfbuzz_1.4.8.bb => harfbuzz_1.7.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.4.8.bb => harfbuzz_1.7.0.bb} (88%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.0.bb
similarity index 88%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.7.0.bb
index 4f5e5a37824..c45ec84b132 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.0.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
-SRC_URI[md5sum] = "d1aa446e1e65717311c15d9ac0cf31ee"
-SRC_URI[sha256sum] = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131"
+SRC_URI[md5sum] = "7e70e68ade0ed79719932b38c2130f0a"
+SRC_URI[sha256sum] = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"
inherit autotools pkgconfig lib_package gtk-doc
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 24/27] lighttpd: update to 1.4.48
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (21 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 23/27] harfbuzz: update to 1.7.0 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 18:29 ` Leonardo Sandoval
2017-11-14 14:57 ` [PATCH 25/27] libxslt: update to 1.1.32 Alexander Kanavin
` (2 subsequent siblings)
25 siblings, 1 reply; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Refresh the pcre pkg-config patch.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...fig-for-pcre-dependency-instead-of-config.patch | 48 +++++++++++++---------
.../{lighttpd_1.4.45.bb => lighttpd_1.4.48.bb} | 4 +-
2 files changed, 30 insertions(+), 22 deletions(-)
rename meta/recipes-extended/lighttpd/{lighttpd_1.4.45.bb => lighttpd_1.4.48.bb} (96%)
diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
index b8c7f375147..4b9372bfc1c 100644
--- a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
+++ b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
@@ -1,37 +1,45 @@
-From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
+From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 26 Aug 2016 18:20:32 +0300
Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
RP 2014/5/22
Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- configure.ac | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ configure.ac | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 1d172a1..a9236da 100644
+index 5383cec..c29a902 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then
- PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
- else
-- AC_PATH_PROG(PCRECONFIG, pcre-config)
-- if test x"$PCRECONFIG" != x; then
-- PCRE_LIB=`$PCRECONFIG --libs`
-- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
-- fi
-+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
+@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
+ )
+ AC_MSG_RESULT([$WITH_PCRE])
+
+-if test "$WITH_PCRE" != no; then
+- if test "$WITH_PCRE" != yes; then
+- PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
+- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
++if test "$WITH_PCRE" != "no"; then
++ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
+ PCRE_LIB=${PCREPKG_LIBS}
+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
-+ ], [
++ ], [
+ AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
-+ ])
- fi
-
- if test x"$PCRE_LIB" != x; then
++ ])
++
++ if test x"$PCRE_LIB" != x; then
++ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
++ AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
++ AC_SUBST(PCRE_LIB)
+ else
+ AC_PATH_PROG([PCRECONFIG], [pcre-config])
+ if test -n "$PCRECONFIG"; then
--
-2.9.3
+2.15.0
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
similarity index 96%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
index 08dda33606c..3c4444cf423 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
@@ -20,8 +20,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
"
-SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631"
-SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f"
+SRC_URI[md5sum] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8"
+SRC_URI[sha256sum] = "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36"
PACKAGECONFIG ??= "openssl pcre zlib \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* Re: [PATCH 24/27] lighttpd: update to 1.4.48
2017-11-14 14:57 ` [PATCH 24/27] lighttpd: update to 1.4.48 Alexander Kanavin
@ 2017-11-14 18:29 ` Leonardo Sandoval
2017-11-15 10:12 ` Alexander Kanavin
0 siblings, 1 reply; 35+ messages in thread
From: Leonardo Sandoval @ 2017-11-14 18:29 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
On Tue, 14 Nov 2017 16:57:51 +0200
Alexander Kanavin <alexander.kanavin@linux.intel.com> wrote:
> Refresh the pcre pkg-config patch.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> ...fig-for-pcre-dependency-instead-of-config.patch | 48 +++++++++++++---------
> .../{lighttpd_1.4.45.bb => lighttpd_1.4.48.bb} | 4 +-
> 2 files changed, 30 insertions(+), 22 deletions(-)
> rename meta/recipes-extended/lighttpd/{lighttpd_1.4.45.bb => lighttpd_1.4.48.bb} (96%)
>
> diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
> index b8c7f375147..4b9372bfc1c 100644
> --- a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
> +++ b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
> @@ -1,37 +1,45 @@
> -From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
> +From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 26 Aug 2016 18:20:32 +0300
> Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
>
> RP 2014/5/22
> Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> +
no need to include again your SOB.
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> - configure.ac | 11 ++++++-----
> - 1 file changed, 6 insertions(+), 5 deletions(-)
> + configure.ac | 16 ++++++++++++----
> + 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> -index 1d172a1..a9236da 100644
> +index 5383cec..c29a902 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then
> - PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
> - CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
> - else
> -- AC_PATH_PROG(PCRECONFIG, pcre-config)
> -- if test x"$PCRECONFIG" != x; then
> -- PCRE_LIB=`$PCRECONFIG --libs`
> -- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
> -- fi
> -+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
> +@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
> + )
> + AC_MSG_RESULT([$WITH_PCRE])
> +
> +-if test "$WITH_PCRE" != no; then
> +- if test "$WITH_PCRE" != yes; then
> +- PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
> +- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
> ++if test "$WITH_PCRE" != "no"; then
> ++ PKG_CHECK_MODULES(PCREPKG, [libpcre], [
> + PCRE_LIB=${PCREPKG_LIBS}
> + CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
> -+ ], [
> ++ ], [
> + AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
> -+ ])
> - fi
> -
> - if test x"$PCRE_LIB" != x; then
> ++ ])
> ++
> ++ if test x"$PCRE_LIB" != x; then
> ++ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
> ++ AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
> ++ AC_SUBST(PCRE_LIB)
> + else
> + AC_PATH_PROG([PCRECONFIG], [pcre-config])
> + if test -n "$PCRECONFIG"; then
> --
> -2.9.3
> +2.15.0
>
> diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
> similarity index 96%
> rename from meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
> rename to meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
> index 08dda33606c..3c4444cf423 100644
> --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
> +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
> @@ -20,8 +20,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
> file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
> "
>
> -SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631"
> -SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f"
> +SRC_URI[md5sum] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8"
> +SRC_URI[sha256sum] = "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36"
>
> PACKAGECONFIG ??= "openssl pcre zlib \
> ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
> --
> 2.15.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 25/27] libxslt: update to 1.1.32
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (22 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 24/27] lighttpd: update to 1.4.48 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 26/27] ffmpeg: update to 3.4 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 27/27] openssl: update to 1.0.2m, 1.1.0g Alexander Kanavin
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-support/libxslt/{libxslt_1.1.31.bb => libxslt_1.1.32.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libxslt/{libxslt_1.1.31.bb => libxslt_1.1.32.bb} (90%)
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.31.bb b/meta/recipes-support/libxslt/libxslt_1.1.32.bb
similarity index 90%
rename from meta/recipes-support/libxslt/libxslt_1.1.31.bb
rename to meta/recipes-support/libxslt/libxslt_1.1.32.bb
index 77b8b768eb6..e8b1409d79b 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.31.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.32.bb
@@ -12,8 +12,8 @@ SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \
file://pkgconfig_fix.patch \
"
-SRC_URI[md5sum] = "14e9842a70fda476065f2eefcbc29af0"
-SRC_URI[sha256sum] = "db25e96b6b801144277e67c05b10560ac09dfff82ccd53a154ce86e43622f3ab"
+SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146"
+SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"
UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* [PATCH 26/27] ffmpeg: update to 3.4
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (23 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 25/27] libxslt: update to 1.1.32 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
2017-11-14 19:41 ` Khem Raj
2017-11-14 14:57 ` [PATCH 27/27] openssl: update to 1.0.2m, 1.1.0g Alexander Kanavin
25 siblings, 1 reply; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Schroedinger support has been dropped:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.4.bb => ffmpeg_3.4.bb} | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.4.bb => ffmpeg_3.4.bb} (95%)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
similarity index 95%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
index 57e0ac04115..42dbe5582f3 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
@@ -25,10 +25,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
- file://0001-build-fix-for-mips.patch \
- "
-SRC_URI[md5sum] = "e14a0200c78ce5c918427e57cd406a0d"
-SRC_URI[sha256sum] = "98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957"
+ "
+SRC_URI[md5sum] = "c64ba7247bb91e516f6a5789348fd5b5"
+SRC_URI[sha256sum] = "aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef"
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET = "arm"
@@ -64,7 +63,6 @@ PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz"
PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
-PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"
PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread
* Re: [PATCH 26/27] ffmpeg: update to 3.4
2017-11-14 14:57 ` [PATCH 26/27] ffmpeg: update to 3.4 Alexander Kanavin
@ 2017-11-14 19:41 ` Khem Raj
2017-11-14 20:31 ` Leonardo Sandoval
2017-11-15 10:14 ` Alexander Kanavin
0 siblings, 2 replies; 35+ messages in thread
From: Khem Raj @ 2017-11-14 19:41 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Tue, Nov 14, 2017 at 6:57 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> Schroedinger support has been dropped:
> https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.4.bb => ffmpeg_3.4.bb} | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
> rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.4.bb => ffmpeg_3.4.bb} (95%)
>
> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
> similarity index 95%
> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb
> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
> index 57e0ac04115..42dbe5582f3 100644
> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb
> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
> @@ -25,10 +25,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>
> SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
> file://mips64_cpu_detection.patch \
> - file://0001-build-fix-for-mips.patch \
> - "
This patch is not deleted along with this omission. Perhaps an oversight ?
> -SRC_URI[md5sum] = "e14a0200c78ce5c918427e57cd406a0d"
> -SRC_URI[sha256sum] = "98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957"
> + "
> +SRC_URI[md5sum] = "c64ba7247bb91e516f6a5789348fd5b5"
> +SRC_URI[sha256sum] = "aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef"
>
> # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
> ARM_INSTRUCTION_SET = "arm"
> @@ -64,7 +63,6 @@ PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
> PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz"
> PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
> PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
> -PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"
> PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
> PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
> PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
> --
> 2.15.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 26/27] ffmpeg: update to 3.4
2017-11-14 19:41 ` Khem Raj
@ 2017-11-14 20:31 ` Leonardo Sandoval
2017-11-15 10:14 ` Alexander Kanavin
1 sibling, 0 replies; 35+ messages in thread
From: Leonardo Sandoval @ 2017-11-14 20:31 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Tue, 14 Nov 2017 11:41:16 -0800
Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, Nov 14, 2017 at 6:57 AM, Alexander Kanavin
> <alexander.kanavin@linux.intel.com> wrote:
> > Schroedinger support has been dropped:
> > https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9
> >
> > Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> > ---
> > meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.4.bb => ffmpeg_3.4.bb} | 8 +++-----
> > 1 file changed, 3 insertions(+), 5 deletions(-)
> > rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.3.4.bb => ffmpeg_3.4.bb} (95%)
> >
> > diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
> > similarity index 95%
> > rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb
> > rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
> > index 57e0ac04115..42dbe5582f3 100644
> > --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.4.bb
> > +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.bb
> > @@ -25,10 +25,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> >
> > SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
> > file://mips64_cpu_detection.patch \
> > - file://0001-build-fix-for-mips.patch \
> > - "
>
> This patch is not deleted along with this omission. Perhaps an oversight ?
There is actually a patchtest check for this so there must be something missing on the latter.
>
> > -SRC_URI[md5sum] = "e14a0200c78ce5c918427e57cd406a0d"
> > -SRC_URI[sha256sum] = "98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957"
> > + "
> > +SRC_URI[md5sum] = "c64ba7247bb91e516f6a5789348fd5b5"
> > +SRC_URI[sha256sum] = "aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef"
> >
> > # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
> > ARM_INSTRUCTION_SET = "arm"
> > @@ -64,7 +63,6 @@ PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
> > PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz"
> > PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
> > PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
> > -PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"
> > PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
> > PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
> > PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
> > --
> > 2.15.0
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 26/27] ffmpeg: update to 3.4
2017-11-14 19:41 ` Khem Raj
2017-11-14 20:31 ` Leonardo Sandoval
@ 2017-11-15 10:14 ` Alexander Kanavin
1 sibling, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-15 10:14 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On 11/14/2017 09:41 PM, Khem Raj wrote:
>> SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
>> file://mips64_cpu_detection.patch \
>> - file://0001-build-fix-for-mips.patch \
>> - "
>
> This patch is not deleted along with this omission. Perhaps an oversight ?
>
Yes, must be 'devtool finish' not removing old files, which we just
discussed with Paul. I'll resend.
Alex
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 27/27] openssl: update to 1.0.2m, 1.1.0g
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
` (24 preceding siblings ...)
2017-11-14 14:57 ` [PATCH 26/27] ffmpeg: update to 3.4 Alexander Kanavin
@ 2017-11-14 14:57 ` Alexander Kanavin
25 siblings, 0 replies; 35+ messages in thread
From: Alexander Kanavin @ 2017-11-14 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../0001-Fix-build-with-clang-using-external-assembler.patch | 0
.../0001-openssl-force-soft-link-to-avoid-rare-race.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/Makefiles-ptest.patch | 0
.../Use-SHA256-not-MD5-as-default-digest.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/configure-musl-target.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/configure-targets.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/debian/c_rehash-compat.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/ca.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/debian/debian-targets.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/man-dir.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/debian/man-section.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/no-rpath.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/debian/no-symbolic.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/pic.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/debian/version-script.patch | 0
.../debian1.0.2/block_digicert_malaysia.patch | 0
.../debian1.0.2/block_diginotar.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/debian1.0.2/soname.patch | 0
.../debian1.0.2/version-script.patch | 0
.../engines-install-in-libdir-ssl.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/find.pl | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/oe-ldflags.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/openssl-1.0.2a-x32-asm.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/openssl-c_rehash.sh | 0
.../openssl-fix-des.pod-error.patch | 0
.../openssl-util-perlpath.pl-cwd.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/openssl_fix_for_x32.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/parallel.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/ptest-deps.patch | 0
.../{openssl-1.0.2l => openssl-1.0.2m}/ptest_makefile_deps.patch | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/run-ptest | 0
.../openssl/{openssl-1.0.2l => openssl-1.0.2m}/shared-libs.patch | 0
.../openssl/{openssl_1.0.2l.bb => openssl_1.0.2m.bb} | 4 ++--
.../openssl/{openssl_1.1.0f.bb => openssl_1.1.0g.bb} | 4 ++--
34 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/0001-Fix-build-with-clang-using-external-assembler.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/0001-openssl-force-soft-link-to-avoid-rare-race.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/Makefiles-ptest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/Use-SHA256-not-MD5-as-default-digest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/configure-musl-target.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/c_rehash-compat.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian1.0.2/block_digicert_malaysia.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian1.0.2/block_diginotar.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian1.0.2/soname.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/debian1.0.2/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/engines-install-in-libdir-ssl.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/find.pl (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/oe-ldflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/openssl-1.0.2a-x32-asm.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/openssl-c_rehash.sh (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/openssl-fix-des.pod-error.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/openssl-util-perlpath.pl-cwd.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/openssl_fix_for_x32.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/parallel.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/ptest-deps.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/ptest_makefile_deps.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/run-ptest (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2l => openssl-1.0.2m}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_1.0.2l.bb => openssl_1.0.2m.bb} (94%)
rename meta/recipes-connectivity/openssl/{openssl_1.1.0f.bb => openssl_1.1.0g.bb} (96%)
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-Fix-build-with-clang-using-external-assembler.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-Fix-build-with-clang-using-external-assembler.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-Fix-build-with-clang-using-external-assembler.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-openssl-force-soft-link-to-avoid-rare-race.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-openssl-force-soft-link-to-avoid-rare-race.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/0001-openssl-force-soft-link-to-avoid-rare-race.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/Makefiles-ptest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/Makefiles-ptest.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/Makefiles-ptest.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/Makefiles-ptest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/Use-SHA256-not-MD5-as-default-digest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/Use-SHA256-not-MD5-as-default-digest.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/Use-SHA256-not-MD5-as-default-digest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-musl-target.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/c_rehash-compat.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/ca.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/debian-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-dir.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-section.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-rpath.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-symbolic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/pic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/version-script.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/version-script.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_digicert_malaysia.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_digicert_malaysia.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_digicert_malaysia.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_diginotar.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_diginotar.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/block_diginotar.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/soname.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/soname.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/soname.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/version-script.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/debian1.0.2/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/engines-install-in-libdir-ssl.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/find.pl b/meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/find.pl
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/find.pl
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/oe-ldflags.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-1.0.2a-x32-asm.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-1.0.2a-x32-asm.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-c_rehash.sh
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-c_rehash.sh
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-fix-des.pod-error.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-fix-des.pod-error.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-fix-des.pod-error.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-util-perlpath.pl-cwd.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-util-perlpath.pl-cwd.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl-util-perlpath.pl-cwd.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl_fix_for_x32.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/parallel.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/parallel.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/parallel.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/parallel.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest-deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest_makefile_deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest_makefile_deps.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/ptest_makefile_deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/run-ptest b/meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/run-ptest
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/run-ptest
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2l/shared-libs.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2m/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb
similarity index 94%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2m.bb
index c537aa4cd0a..04763ac3469 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2m.bb
@@ -43,8 +43,8 @@ SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \
file://0001-Fix-build-with-clang-using-external-assembler.patch \
file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
"
-SRC_URI[md5sum] = "f85123cd390e864dfbe517e7616e6566"
-SRC_URI[sha256sum] = "ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c"
+SRC_URI[md5sum] = "10e9e37f492094b9ef296f68f24a7666"
+SRC_URI[sha256sum] = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"
PACKAGES =+ "${PN}-engines"
FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0f.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb
similarity index 96%
rename from meta/recipes-connectivity/openssl/openssl_1.1.0f.bb
rename to meta/recipes-connectivity/openssl/openssl_1.1.0g.bb
index 4517f8734a3..c85a1d27a21 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0f.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0g.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cae6da10f4ffd9703214776d2aabce32"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "7b521dea79ab159e8ec879d2333369fa"
-SRC_URI[sha256sum] = "12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765"
+SRC_URI[md5sum] = "ba5f1b8b835b88cadbce9b35ed9531a6"
+SRC_URI[sha256sum] = "de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af"
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://run-ptest \
--
2.15.0
^ permalink raw reply related [flat|nested] 35+ messages in thread