From patchwork Sat Jul 21 16:27:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142498 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4232354ljj; Sat, 21 Jul 2018 09:27:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdt0c5ZNPgi5euMoPgHgqTb+h0Pc+2Y10Q7PuyofYc+AIia/jkY5hWQwyfSoXoXVL65i9xy X-Received: by 2002:a63:1315:: with SMTP id i21-v6mr6141437pgl.147.1532190450245; Sat, 21 Jul 2018 09:27:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190450; cv=none; d=google.com; s=arc-20160816; b=qSuUy25yFl6mhQrmNBgQwOWDiEpKr4JQjlWlk9NrdltvdHYy05rLQQ6T95c0U3zOn7 aH7tpkdD8EDuG6rnBxPGeY2Y5bzszE8152735c8grBg4uWRdMbQ3Cp/YC39IZYbPVaTp xK375cA9B9bK0kAXd3oWnrX3xBEvyEVslrgmdCP9DTd8jaxgqR45gGH1JtgbdrmCtbJ1 Dbvxnlm+EGBUkSX7ScnrXmy7pw8yfRrkXG0zn6y6ekEyXccfAUzuogJ2TVY5kU5qKKny zt21vctBxDTGk0kYl9yi7Jn/F+KdT89GFQORK14MR+Pe9U/Ep4XgoYj57rgY5OFEU0/x RGNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=9lxs1YcrTFFhEHwtiw/sPBsCVKTIRvyfEGVHMqIaDjE=; b=NJbv6fHMzigyoCcw05My10PPq/9kLLtvj2LRDFtZJOdaY5BSsv9P/VjDxnJSANlU76 7UmwXFgSZwITJESUCY7D4OYkOUXl2YBNMEQTsee+Omp9HiEtVCe06laWyX6txVEdxwhK 7B1GTZUn+cYwt/bvt9X1Z9bw/95OYoLMElyQ9f9CDKWIIirGUJVMwMSueDFOEDrAG/HC GxBszKZ3LrdLQvOz3JZOwMqeANZFIN6pUC0xcqwn6C0VBZ6VjNV+9zupC5PxFwoCyYog 4MW9vlx8OFrkcE1NVcw9qYxtcdnH3f+Z2Bd7rPEfuq/uoiZCl3DOxTY7g4GfUAkqGicJ sRYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Zh25wGvG; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c25-v6si4338947pgm.523.2018.07.21.09.27.29; Sat, 21 Jul 2018 09:27:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Zh25wGvG; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7442B78AF8; Sat, 21 Jul 2018 16:27:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f53.google.com (mail-pl0-f53.google.com [209.85.160.53]) by mail.openembedded.org (Postfix) with ESMTP id 979266E688 for ; Sat, 21 Jul 2018 16:27:24 +0000 (UTC) Received: by mail-pl0-f53.google.com with SMTP id 94-v6so6454015ple.12 for ; Sat, 21 Jul 2018 09:27:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4o9QSEbLMG8Jlwq+tnmF2z95sw4bqzkBRGcewnU7w9U=; b=Zh25wGvG/WXZ8zIhbFCnrqXCQyXCtfTaQKLS71kVSBhwDCFnQ2mihtC4E4Wd96FKg2 pNUkFfJY6UECsNrD4HSJaH9GDHQ6Fv0Btc1oERoCV+14V4mcxCUtpJUlortPmPvuRewh +d7PfuYZkZaKU6WLYS9PByLrrxI+GgYPqMFb2QG4Voi212tRQA0AZokTYww3lfThLH/z AGjnaG14tuwVqgn3ZFAtLnaqxtar07El1+xugs6hEcf4Ay0mMf6Lpbf56Y2aSOaKPf4J ocwsBvH0fLyGlgC7+9x3H4hYBGfYSRX58A/Vg08kTDhgN7WpdBZfGtEQSwHt/mVJGKpe 0DyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4o9QSEbLMG8Jlwq+tnmF2z95sw4bqzkBRGcewnU7w9U=; b=ckPqwv01xzaVu0cslwmvmDltV0Vi/hD+9y0izL/5rDLo+evEhvYUI7cLRXKOa12c2s 5CrEfOWWnvyBfKHXYu87d4OrSUbRaDBeyjDGvVHtQcuvxwl7B2CLFoyxg/RMUA1Q2ggP OJaXnLIhLQ2vNPo2jWIZ38XOsnNvOrei6tIoMlb3ijD8CXibcwWgB6shbdblzLbis57f 4DP7UnMRWWrLP2Sx8lienGvA7xOCaUwwZUQVBGFGbnU4dNw4Aqu/89W0GEFkhq5g3huf 3+KeR5RnNB+ATKIXZ51efqRxKcM+lmPltuPEy8Vb5FgB/zO9XDl5TjfgTH716O9vBhTN GUTw== X-Gm-Message-State: AOUpUlFi/+MIlLPB9VrbVtcgY+aPrYLwpxaVoZ9NDdMC/wuXTlJPN3NQ R5VDozhUpRi6BJSmwbuF2fFZ44st X-Received: by 2002:a17:902:968c:: with SMTP id n12-v6mr6356897plp.15.1532190445203; Sat, 21 Jul 2018 09:27:25 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:24 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:09 -0700 Message-Id: <20180721162715.12611-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [OE-core] [PATCH 1/7] glibc-locale: Fix host-user-contaminated QA errors X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes ERROR: glibc-locale-2.27-r0 do_package_qa: QA Issue: glibc-locale: /glibc-binary-localedata-hy-am/usr/lib/locale/hy_AM/LC_MEASUREMENT.tmp is owned by uid 3004, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] Signed-off-by: Khem Raj --- meta/recipes-core/glibc/glibc-locale.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index b3cb10b87a..e50e5cf5e3 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -74,23 +74,22 @@ LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" do_install () { mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then - cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${bindir}/* ${D}${bindir} fi if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then mkdir -p ${D}${localedir} - cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${localedir}/* ${D}${localedir} fi if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then - cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} fi if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then - cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} fi if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then - cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} fi - chown root:root -R ${D} - cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/SUPPORTED ${WORKDIR} } inherit libc-package From patchwork Sat Jul 21 16:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142499 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234299ljj; Sat, 21 Jul 2018 09:30:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc2bdckVT/JsOom4omXC1TXtqe9s44VUWKiEekcCF6SyRfpBV+YBzIqt7VpyITMY9IXvUW6 X-Received: by 2002:a63:920c:: with SMTP id o12-v6mr6161390pgd.141.1532190606573; Sat, 21 Jul 2018 09:30:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190606; cv=none; d=google.com; s=arc-20160816; b=CiD1xJbx2g1el84lSarCaF5KbNVMuRjTzZ136kLO3LUUcH0yrjBJolavVY322RydjU WlelalBogPo5eDV37e9rjdRiz/XAfOvmeSMsiS14xG1uO2lr5wJF9grOjnnG6OYLVZLH bbx4hUvRTXdvw/4Vte9gI2hScAlQ8AfiX53FSUUtBhZduge+ONokJmciakrvg1tZ7y18 53ERkeb9Vv3SeAUBKmeZt8uJFEuD0jp/q9aUZA33JJJZmzLuzNyVDEsYsANnmKaKDDTx FXxhAyvefasGx5kVEerCY0D065PD7jUJF+egJ6aiHYKv8aIxKqQgbJY8t0UTD4uA7mLJ eZqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+RsmiuF+gLZx4fDdQjHRXj8ip3KlIlBxXW5nYvaLLYc=; b=OsHXkCmJqMJPNHtsC8LPj2o9m9v7SMUV0dpxljdi8XkyvklS2Hf0yl/EzwbWYFvMVt ozNO7VhkbC+bQCSbc5IPp2TcbINWY4N23FlKrq8HcuYyI5CIa3RHWZ3hlKqv2XGoEh3C 4GxdL/CpuIANiEdrhcA4F/2ZyrNiVp3X1qzG1mkd5f0zKY+Os/HnwxbmyBwqU5mvOxOZ b5RaiuEu68G5dOtapkK7DkDMCOHW3Ue/og3AMbzKrt3nNIiyk2MuIIJPKeTdVxEK17wc T+Soe3Erbz8KuvI0nJ7dEo/3HBksoShFwWLY63GtHks0dKO/cmGdzALUFlxM3JhhCdHZ MzUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=by6DiS8m; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r39-v6si3986390pld.83.2018.07.21.09.30.06; Sat, 21 Jul 2018 09:30:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=by6DiS8m; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2465878AE3; Sat, 21 Jul 2018 16:30:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f41.google.com (mail-pl0-f41.google.com [209.85.160.41]) by mail.openembedded.org (Postfix) with ESMTP id BA36A78AF9 for ; Sat, 21 Jul 2018 16:27:25 +0000 (UTC) Received: by mail-pl0-f41.google.com with SMTP id b1-v6so6451015pls.5 for ; Sat, 21 Jul 2018 09:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xoJ+VRmmNY4KjrrDjo19vQen7ZQ4CFPc9ABTr3HDH1A=; b=by6DiS8mOZaXvw1QG+Y4yJbZns7Q+xqO87YMCuvqdYeXexhUfRy/xnVK89gIz6Awlj qihtAgNFCC/FnvTbWfjk3wTiUaSRYyuYuRZnREdJcuB0DoosZ0ff8zT6LDS4/j7xtqjO PzfynEUcYGbykqeyYHNgwmUX+wSJO9Fj05TqwjF8qTV6BcS9HygpTOEddCmdmX4/ED0u bCYzEDnMCoRzCrexjJAAMDuwtD5uhygWDXZal9/Ry06+7Pc6L/H9v/0aMprwDLgvYPS/ HHRQ6THO1A6SsM6/D555GCYAwjLK6mpJxxAl4nJpbCj6SnmHAZvn/VhsI2yU7x+dPDEt ib8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xoJ+VRmmNY4KjrrDjo19vQen7ZQ4CFPc9ABTr3HDH1A=; b=nD3ClF0Gymp0j08gMGoLzQl15/gKq9lo4e1sNSOm9KZ16yCdoZCpOK6J5XbxwlTrmp HZkZrrK4ayS/py4bJsdzcyak/qLKqaAu2AoptMYvR7JbuCsR2DZ4/hL9joyxr5b783gO c8o9WL8yka9xY2V80d46NJAXe3kMjimjnGSVivOFpVbmzl1g1ToH2xHKSm4bbJWdOTiD U2U4lXAjqaY3Ah9akfuoEWf7WDPIOS0OYqtH2zgjb2dBCQkLTBnfn9/IbZVDI13Nc+r3 yvV9kmD2VmmRBOkrUpIn0/bJ6THW1hYfGNKBAXcgPekYHUNY6+j9KUiKCcI6xWNnxVAy Lduw== X-Gm-Message-State: AOUpUlHRRE7Ze0vE/4GkFDjivAHarcuQv3+20MbvmINMujALgDaAZIzd abaQm654mWO4P5PM00DpgFKOXiwR X-Received: by 2002:a17:902:42e4:: with SMTP id h91-v6mr6333083pld.27.1532190446563; Sat, 21 Jul 2018 09:27:26 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:25 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:10 -0700 Message-Id: <20180721162715.12611-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 2/7] gtk+3: Fix cross builds with wayland-protocols X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes | make[4]: Entering directory '/home/jenkins/oe/world/oe-build/build/tmpfs/work/armv5te-bec-linux-gnueabi/gtk+3/3.22.30-r0/build/gdk/wayland' | make[4]: *** No rule to make target 'pointer-gestures-unstable-v1-client-protocol.h', needed by 'all'. Stop. Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb | 5 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..3948bdd4e2 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,31 @@ +From 3bbc4ea83256df8a777e13533e8d2791a70c0ee9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 22:32:37 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7ca7b99..847fa4b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -470,7 +470,8 @@ fi + if test "$enable_wayland_backend" = "yes"; then + # For the cairo image backend + cairo_backends="$cairo_backends cairo" +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) ++ AC_SUBST([WAYLAND_PROTOCOLS_DATADIR]) + GDK_BACKENDS="$GDK_BACKENDS wayland" + GDK_WINDOWING="$GDK_WINDOWING + #define GDK_WINDOWING_WAYLAND" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb index 697b518544..d1625478ae 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb @@ -6,7 +6,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0001-Hardcoded-libtool.patch \ file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ - " + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ + " SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0" SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" @@ -16,3 +17,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" + +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" From patchwork Sat Jul 21 16:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142500 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234377ljj; Sat, 21 Jul 2018 09:30:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpetsAgqm4RR+R8/+AGidbJTQwjXNbDmof/0+hXUWMfqkINswC3bKx4wgv57OBIhN6Edq8m3 X-Received: by 2002:a63:383:: with SMTP id 125-v6mr6208576pgd.421.1532190611209; Sat, 21 Jul 2018 09:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190611; cv=none; d=google.com; s=arc-20160816; b=S2F2JFlQALF07d/Rr+dW+uhn5LW/3LDQ2Lo8sKdTYjIpTtBumNdf99vhypfk4uGo1Z qANLRmtIuQQbKMIKSQ7NzvrVFbY+1j4CN8XfNjsqmpurGDHw8u+iwgjJ2MdVb6uValxb Nf7DPEF3uCTHd4UgY2940OpAqOgfGyeAunV+jSag6sncQBC6da/1dgzN0N+WYrD8IeMS g/rzYc9URFL7Xwv6SLlTlburn4LT6E7PQu4st9FmcLpewSR4NCQ4Om/6uTorDmdyHSKM WDqcPyIYCX1UdOAelrqB8K4b5FrQn2cVwscfPuXs19LYxS8ArnSRvdfZRJzTRIxo/o1Y 0/4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=htv0w1+lAZHZuhvsfdnXoo7HdX3eDwK6Nl2hJiWT+YA=; b=vCgW8T56SNE03lQyppFtbd4ICLtUY88jwOtZx0jSoHaL6LRAnZkypMID2BBQTpHyGy dukkNwLk73TAfVp1acM+75SGZTHwQ7zxWfx6HTufgjksjILrbY9qL9ZRrSlvvr31AqFb H5/TDkl7ZUDjckU5M2PVCMBqN1UNfELEgQSD1RwUdgY2cdkQDr+vJZpXsDmMCWz+7Xzh 1gGudjkmrCMz6ys+KVAO46JNoWHbxKImqf1IdDM9hAfgWZVyNLhNfEvQkvR8e5JtxfOt X/AQT9rnzd/B2DtYB+/v4q3v2YrI05kXNiIs35MpN/NuP1Igf12KmkZVez6d7DAEyO2T zQBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSgDiBfV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 83-v6si4574170pgg.663.2018.07.21.09.30.10; Sat, 21 Jul 2018 09:30:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSgDiBfV; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1BCB378B21; Sat, 21 Jul 2018 16:30:08 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f48.google.com (mail-pl0-f48.google.com [209.85.160.48]) by mail.openembedded.org (Postfix) with ESMTP id E8BFF78AF7 for ; Sat, 21 Jul 2018 16:27:26 +0000 (UTC) Received: by mail-pl0-f48.google.com with SMTP id w8-v6so6451007ply.8 for ; Sat, 21 Jul 2018 09:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6DOJPl06VMYxzDNtPCRFbTNcxcZDXdeH+JA7vQqQ4UM=; b=nSgDiBfVIzwNVVF50QJG82ar8PUxgoeA/FFyWKZXb9nm7OJkhu/hQFrkwEA03TQLr9 rUiLFkPP2bI1MTOlot1JKo61Z91Vmq1sqzBblfzy6YFpVVuRVO8t9JeB9g7ewoP9oXCf B+/b1IalkQfjL8itNUQkbn/5X/Zl0zO43PmcTag+0q2Oscg++GE5zpsSi/cb3aDu6us1 XHGvvea+P1M1LZXGSkC+9FEpn/brQDATVihvht0KoIhxPPUWSXKn+IVUya+I2IqMk9pQ E4coImVLQtq91dhiw0UYBMw/szfgYv6T2BnqQNDXaquP3DewW+y6jFhi9UhAE4ubEoyd t13w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6DOJPl06VMYxzDNtPCRFbTNcxcZDXdeH+JA7vQqQ4UM=; b=mBSHBYYd2A0+jK6zvwfxruija7ZQYpTgMSokqj0eLt3eufDMuOpGxrZ/8tK8qjfujS ipzg2LAQ4tHUKqHFIrbjPVYH1OSPuWwhRk86kA8JllPbYKBPlATGoCpuyBgMNLX7DiCO mpZPaQnMpZaI5q8ZW5ZX2Fqi73USeRTRajttesL9WwCmxlEDfVD78TK9g1ejdbALpQpS sr7QTZSVxHrePTK91Xl2qtVXlJnePimWlFFcEMIThWBKyLwU++UXViw//EgLLpJwmGVP 1+LgBFFrjTjWVvas0EBZWk+PqQexwMwvnZleZByTUTLkTAuDNIcqKDX5I/pzEdF7Ip+Z Z5Bw== X-Gm-Message-State: AOUpUlFonPN9Movlw6Nl4Tk/WJ7TD+w3Fr5hpn96YGGtPUREu5506+z8 /vq/Ds42weDCuKShfGx3iOLr2tLd X-Received: by 2002:a17:902:ac1:: with SMTP id 59-v6mr6282012plp.36.1532190447678; Sat, 21 Jul 2018 09:27:27 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:26 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:11 -0700 Message-Id: <20180721162715.12611-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes | /bin/sh ../SDL2-2.0.8/build-scripts/mkinstalldirs build | make: *** No rule to make target '//usr/share/wayland/wayland.xml', needed by 'gen/wayland-client-protocol.h'. Stop. | make: *** Waiting for unfinished jobs.... | mkdir -p -- build | ERROR: oe_runmake failed Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DIR.patch | 34 +++++++++++++++++++ .../recipes-graphics/libsdl2/libsdl2_2.0.8.bb | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch new file mode 100644 index 0000000000..f9a666e755 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch @@ -0,0 +1,34 @@ +From 07ef55d0fd9f53a4d94ed8df03ac5ef7d3cbf2d2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 22:51:32 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + .../libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: SDL2-2.0.8/configure.in +=================================================================== +--- SDL2-2.0.8.orig/configure.in ++++ SDL2-2.0.8/configure.in +@@ -1395,9 +1395,9 @@ AC_HELP_STRING([--enable-video-wayland-q + if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` +- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` +- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` ++ PKG_CHECK_VAR(WAYLAND_SCANNER, wayland-scanner, wayland_scanner) ++ PKG_CHECK_VAR(WAYLAND_CORE_PROTOCOL_DIR, wayland-client, pkgdatadir) ++ PKG_CHECK_VAR(WAYLAND_PROTOCOLS_DIR, wayland-protocols, pkgdatadir) + video_wayland=yes + fi + fi diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb index accea38aaa..a8d2283fde 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb @@ -14,7 +14,8 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ -" + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch \ + " S = "${WORKDIR}/SDL2-${PV}" @@ -29,6 +30,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --enable-pthreads \ --enable-sdl-dlopen \ --disable-rpath \ + --disable-wayland-shared \ " # opengl packageconfig factored out to make it easy for distros @@ -53,6 +55,9 @@ PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" +export WAYLAND_PROTOCOLS_DIR="${STAGING_DATADIR}/wayland-protocols" +export WAYLAND_CORE_PROTOCOL_DIR="${STAGING_DATADIR}/wayland" + do_configure_prepend() { # Remove old libtool macros. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" From patchwork Sat Jul 21 16:27:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142501 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234469ljj; Sat, 21 Jul 2018 09:30:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfrj4H+7QGAIRjrSV0ZpPPZCH7b2/a76A2SsTFo7Uo1JS72YWV36p2OdJOoqd+IJxDPwxhR X-Received: by 2002:a62:1c16:: with SMTP id c22-v6mr6603959pfc.148.1532190617736; Sat, 21 Jul 2018 09:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190617; cv=none; d=google.com; s=arc-20160816; b=EYHzYql9gbTGamUxfmdfITXZF9RUckYywLIDUgAPY7SRI9G2hzc4EJaXhMPHxBnRsX 2MGG3GzENsg1lliWlUCc5RHpvicj4s6PlaoEAZyBBG5+zRAqh97rnejJbdSnZeLczTEv VvuMAbvlHiybK6VMevHvkxbsmULou2yrYB1m4xio1WgDRW7KgRiUnu1L4XQZOZz7bVEz QlyDvK9CGr1ZxvoivmifjLyp8/CKJLXf/XjjYZnt5H7FGaQka+WOhFOMeACzZyUkw6a5 FyvOj5FK7lf/1c3wzgUDGXcgn4l/bGJcbMZQczv3zZg/ydEwfnmNLXeir87GSn5qJTc0 nVrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ZAjoVN5wf7pMGqZb3ngMo/Ud2veUXICx0Il5COqYSIg=; b=gr7u6XEWYh7ywegec2fe55ogTYhI9HIrSqJ5nDva9zwJxJBeCqn3ZQNbFIQvD4pa6X 8jARXbt9KRbPM3WWUjqPcg/pa1Hs3r2gck2qzUmhR5fMAV2qllT2E9nHT9eMBkgsEluo aZISy7SnUxCDFhPCmn6Jzos9SiCp39L71E9vaC+9YHgGuqpWjYO21hIkEwkhQr1oaFIw VfUuyuPPpkwIiVhG1aDTPOyLSv31Xk1fUrmq3peuXKUXYIxtRnIifMXcnYMMUlag0Ylv KZsRZyerXQEvBm37E4kN7ewEYIB3waHrhk8aTBwTK4V+Py99MtQa/ART/iHgG9vdscpb wHHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YqxI4RvX; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m32-v6si4147993pgl.622.2018.07.21.09.30.17; Sat, 21 Jul 2018 09:30:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YqxI4RvX; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5AA3078AFA; Sat, 21 Jul 2018 16:30:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by mail.openembedded.org (Postfix) with ESMTP id 1BD0478AE6 for ; Sat, 21 Jul 2018 16:27:27 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id e11-v6so6454699plb.3 for ; Sat, 21 Jul 2018 09:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hgIgImaQ/o217nB1vdWBsOsaZfbwIMQHNpVyabpz7TM=; b=YqxI4RvXyuZCSiMqHxqQev98K0QgGP1gpcMyCAahdFR7BsouvqGseYHM6FGXy+JtPR ISG/s2LCEB741io12w+56g0IChQjRmv26Lu43YXpcqEqbo1x6AIMJ6nUXersZUctNsPb /hnqpU/ryRJuB3M59/SEiI0vlqDq5f14D9SNXG0iAeB5R8npDBqJfy4FXDWOeC/RLrqy 428qJxVSFN6iF1J5QVAg9TOE6wlYiRBmWUXpbeEGKNlJO6KO108MqpUhQdY5ZR1rTbDV gAn6GQLKdDYN6ehx/VnMQf41P1rbZNU0Bd31z18fyczfhUP4lUe8QN3ssdlZjb4S9NiW AGdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hgIgImaQ/o217nB1vdWBsOsaZfbwIMQHNpVyabpz7TM=; b=aqJRao7OGp6gRlQtpfQvIjmGJ6dpQjamRqgwZjFexY91fI84NTmYZsV2m3fxGuKmdO i7vHaxc2qMkNJx4LXA3XUQtV1ZXXDd40UxWo5aNbqvluJSQLuF5tC8dpe/f2mqWL++Sy YO1TytEKR79pRqWABf0u50V5sqck0TwWGJl2swa4U9qVRW9860Znd7LJ6RufgOGIQfXE 6IrhVtdZJAnp0p5F+mai3dJq+ib7QWjYm5BcaFsz3pztRTHSm/2i3gATSohxrbDOb4H5 +Q4qdPouCRQAytAgZ2fbZRwjkZ96CZ+0KmpCPnfi6KMvA/E2zZLTVTK/h2NaP/Z7QZ6M 5KTA== X-Gm-Message-State: AOUpUlHIf3cvHQ2o+8bu1ruGCBm+ltFcn7wWWKXDCUqLRtNeMG8XiY6J 7B27of5uttaZHbsmOMNJHYO9qqkw X-Received: by 2002:a17:902:8601:: with SMTP id f1-v6mr6375844plo.196.1532190448846; Sat, 21 Jul 2018 09:27:28 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:28 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:12 -0700 Message-Id: <20180721162715.12611-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 4/7] weston: Find wayland-protocol files in proper location during cross compile X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org | make: *** No rule to make target 'protocol/xdg-shell-unstable-v6-protocol.c', needed by 'all'. Stop. | ERROR: oe_runmake failed Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 30 +++++++++++++++++++ meta/recipes-graphics/wayland/weston_4.0.0.bb | 5 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..9e0f4083dc --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,30 @@ +From 39c5e397ceb7ac4f9c47d04ab9ed26570742cf6a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 23:02:10 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 48cf5cb..5cd2b89 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -221,7 +221,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.13], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++ [PKG_CHECK_VAR([ac_wayland_protocols_pkgdatadir], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, diff --git a/meta/recipes-graphics/wayland/weston_4.0.0.bb b/meta/recipes-graphics/wayland/weston_4.0.0.bb index e78b0d9194..c5882d590b 100644 --- a/meta/recipes-graphics/wayland/weston_4.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_4.0.0.bb @@ -11,7 +11,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-make-error-portable.patch \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ -" + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ + " SRC_URI[md5sum] = "33709aa4d5916f89643fca0fc0064b39" SRC_URI[sha256sum] = "a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58" @@ -35,6 +36,8 @@ EXTRA_OECONF_append_qemux86 = "\ EXTRA_OECONF_append_qemux86-64 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ " +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ From patchwork Sat Jul 21 16:27:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142502 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234582ljj; Sat, 21 Jul 2018 09:30:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd+AHvEwWe2u3c325YOj88qWI55xRLjhDP3hyyxu970VT66wXDJ60TqcAZ9AhFjZ+Bvgi1c X-Received: by 2002:a63:e355:: with SMTP id o21-v6mr6262498pgj.251.1532190624214; Sat, 21 Jul 2018 09:30:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190624; cv=none; d=google.com; s=arc-20160816; b=LQ1ZRWi6pwjGY9BvwfpYach/uMhvD+L0fNopWje0+kUFKKTajef31SIbLhoVuxZU/5 j+2BqB3yBd34+CQPjRrdPzmAM0Zc7FV1XpRvGYwGRf1UjpJ3QqoBwqCRhlgnxhjL7EH3 bIGYSqlJQwEDgIbPjX1vP52Q3GAX1nOmqFd2cDI22U8ndlpM26oNQLsDSJRzACwgVsA3 7b48ZDx4ZIY5ecvcKY3z9ZhL++1VwwwGIq1scNVp+LY/AJAHeaptaOcyYuBh4ZxujEQr arTt/A3+0D1ZyJ4s1fvCklvrqDJ2PY09CKPIzaMwABF1n2/XDypo5fIzc1hGi1MFXnm8 GgHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=6pqlDBRnz/OOnnV8TmpFJQ5iB/29Oq7h9L4RnCmp9YQ=; b=G9lpGNtXhXx+wDN63ohHxUobv0d1105SsGxwU9G8Dep8Yd3EVwSaGQLDw8ez+g/qq+ g46WlO1ctqJCwP6tf9+EleITq4L/BKnbSZYrpkVtt1DvFgtbUanl6zQUUHAbrSMPADX9 i9FqfzWzg20LgoNZ5O078pQ8j8g7kWy7pke2bm56VpRF/HWcd/gCiZ5eBHy6cqubmCkO SC3HDNN58stZuz0Eky46jc6jOb2ky+Alcm1TueC1Pw9Oqt/jpbKD252eC4rFTpMQDIQ6 hsc6Om4O5UjQ8WnvWgo+PQA9AzeG4g+rBUEkuE0dSmm9/u4t6wZy25VuqTfRUbX65FD3 HTkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ok+AqNma; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w23-v6si4526808pgl.282.2018.07.21.09.30.23; Sat, 21 Jul 2018 09:30:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ok+AqNma; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7CB6278B4F; Sat, 21 Jul 2018 16:30:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f44.google.com (mail-pl0-f44.google.com [209.85.160.44]) by mail.openembedded.org (Postfix) with ESMTP id 3A33878B0D for ; Sat, 21 Jul 2018 16:27:29 +0000 (UTC) Received: by mail-pl0-f44.google.com with SMTP id f6-v6so6458149plo.1 for ; Sat, 21 Jul 2018 09:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F2XLTFfq0gVslWe/7Q5V0zHo60YcKXd5yVgZMG08MGU=; b=ok+AqNmauw/VqR1ZPnmvpZn2QJdUKb1o+f2HXPI8UxAIS8ni1k0Eor1no2gGvTtLfa RxR2RZh86IwGY2z5f2ipRUFLMfLkmrujYk8gbhH+cnSn9N7tKD7RQvr32bs3wCvdSskd tJgoKtCrJl2VacgmT7aFf5+ypO4QzY/PDXWZ2s35O7aj/7k9wF0km24ZPeYlCr/rIpmA Pj2MgDL1i97xvf5dA2sZ3Q4W+h8/OfSfbJ9F4QazszwUqYewqqMMtd7QSEkD2uM3YWdz O39wYVstlTWEO6EuzwD0kJ1ohtGD9h7vGJhLMpdvE8qqsfgI+2QR0DC73fQ7o4j5QFg/ QnMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F2XLTFfq0gVslWe/7Q5V0zHo60YcKXd5yVgZMG08MGU=; b=ZfJqGgkyF2PUPhM/+KgaLUTqcHYA36m+Db1K8oK+4ub6Vhg6ZAgrIVtXNCY3FTKYYX a+QEpoZUy+8fKmKz32iHKT1P2BF1mcmSkgwAyKtHv+ml1sLSNRp8D3KTXzIOwCMKTRbH 9JnK+LoveilNRZt5RZUv+9e0UZxhVTIjhojurIqVtvxaS+YQvCnMLAMPXD2YtP1lqmHm lJnDVas046svFPUTC80EanfrXBESh7p0+7jpxJc6A0e2Yahzd1iHbE/MeMLPV4N0Je9y ebAe3m2S/z7hSMqrYCGt3r58HoJC0KStq8A3cS4dGbYDSIPwbeur8g7GIwmYamx9rDIr VmOw== X-Gm-Message-State: AOUpUlGtvUzG+h7Jps8IOgNi9XtOykspDdZXMWF6NhwP1UZVaFBx7+0T BmmLrxoOqFGWRs6t4OABM6xVS1r7 X-Received: by 2002:a17:902:b58b:: with SMTP id a11-v6mr5413057pls.34.1532190450036; Sat, 21 Jul 2018 09:27:30 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:29 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:13 -0700 Message-Id: <20180721162715.12611-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 5/7] gstreamer1.0-plugins-bad: Find wayland-protocol files in proper location during cross compile X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes | make[3]: *** No rule to make target 'viewporter-protocol.c', needed by 'all'. Stop. | make[3]: Leaving directory '/home/jenkins/oe/world/oe-build/build/tmpfs/work/armv5e-bec-linux-gnueabi/gstreamer1.0-plugins-bad/1.14.1-r0/build/ext/wayland' | Makefile:1288: recipe for target 'wayland' failed | make[2]: *** [wayland] Error 2 Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++ .../gstreamer1.0-plugins-bad_1.14.1.bb | 20 ++++++------ 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..5c14a70cec --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,31 @@ +From bfa34a3fa9b426f28163e9ba0539180b021d81f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 23:24:05 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 79cfda4..b75c082 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1333,7 +1333,8 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ + PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [ + if test "x$wayland_scanner" != "x"; then + HAVE_WAYLAND="yes" +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) ++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR) + else + AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) + HAVE_WAYLAND="no" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb index 0e477e5a9c..b4fb672b46 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb @@ -1,14 +1,14 @@ require gstreamer1.0-plugins.inc -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ - file://configure-allow-to-disable-libssh2.patch \ - file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ - file://avoid-including-sys-poll.h-directly.patch \ - file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ -" +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ + file://configure-allow-to-disable-libssh2.patch \ + file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ + " SRC_URI[md5sum] = "c2f963501fc6afc084c418894425dcfd" SRC_URI[sha256sum] = "2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a" @@ -127,6 +127,8 @@ EXTRA_OECONF += " \ export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" + ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" From patchwork Sat Jul 21 16:27:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142503 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234666ljj; Sat, 21 Jul 2018 09:30:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcfkGdghU9eNHUeQJqUermBUtV7fTMJr/tha1ezwH9EO+k/p6MTWqi7IXItBbEWwDdZgaQ1 X-Received: by 2002:a62:789:: with SMTP id 9-v6mr6627434pfh.213.1532190629964; Sat, 21 Jul 2018 09:30:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190629; cv=none; d=google.com; s=arc-20160816; b=ZkQx1oB5JsPPmWj07LM3Y4GxIrXNK/cM7VFucN1sQl1VhO/Ww803zySOjCgo37+Ld2 a4jE4vSjZ8n/a8SawEX6uHpVxSD/dteetE/Eb2xMyJtMMOlZbjdoRtcyev4mN1T9WbFV vMmwY2rzutdj5Q6BHYMxdEJfD16uN/8OFD9AAzP4MS36rtKFEw7YPW5peHJGYMtivc50 E6TE7S5OZWovCLYSxKL7GCAW7lw3wJDid88/CcfjrO2XqcyWaQHKuM6t7BgHiRtyTRJK UsoWPKvADM201cgO7/Q7vNtPf2q2CesNCiZmoAupt/WeZlqn+AQX6cw0En7COyKNVE8v u3vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1GlXeuYfWz8BDBDUpXOQJGSRumxxqTCBxYvcO3vy8Hw=; b=kAR7GU9+fItuKiTqNA4JAG4O5BIrvxLE8cf0G/S8Pz0dK4KOhUrP1rwx69b5CTDULq CY5v+XhM/kBWnGGNtY3L132Mz6yBlf09LnXWUXLUGmw2RkDQFC+jyuuGSoLGAaajUiKB 9iBTe6GGcv4bV2mErwQ2RP2Cvc6E3fFWOFuG4ztUdTiqQxWpXlyD37rMZIivQpVtw1vy xlK03Fh6y4sHPvaxHdftuDuzl9gNmkQlFDic9ShpMs+uxlfoqdCejvCLw6poAy22zSAQ uz67mDIpItEv6R+Ry6QnMUSpONLz2oB/6GoC8pJ9TQTjANw+AMxAdeeXaLP5pKOcfWNc OKNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=I1AkL+Ib; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 186-v6si4541233pff.270.2018.07.21.09.30.29; Sat, 21 Jul 2018 09:30:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=I1AkL+Ib; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A3EE878B6B; Sat, 21 Jul 2018 16:30:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mail.openembedded.org (Postfix) with ESMTP id 709E16E688 for ; Sat, 21 Jul 2018 16:27:30 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id b17-v6so256392pfi.0 for ; Sat, 21 Jul 2018 09:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RXfqmrIe2VjT9MghBPraX/wDlUY7AhFJEaQeyuFGUB4=; b=I1AkL+IbEnBEH/WhjvgBQOCpGP8sBgbQMwxe2WrP6+vJzcqcVaRg7yCiQZZMYToUlM Jb2tglF//uPLWRSozwKr/53DJ+/vTTbkBmzSxdnXUqjxU+2+Ibe2MwO9FVwRuMuODF9W 6SJR8IIzJ26faWAD4WwI9FAXCHMuSTAjWMCYhygUUqJXy8hbzMx9qS7ZvID/Gxx9USN2 ige4XJ3UF1gEJLMSKmwCsEmLrd4Yd7eDdLPSVsHg5R8WfJhvfTvS7sQllhhcazBAs4/T Gk3InzfUAXyhjtzMex5S0KYvYdHaTADrDzeUyuo0XuYqEdf1PnELvklzteQCs5DW9G09 x+eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RXfqmrIe2VjT9MghBPraX/wDlUY7AhFJEaQeyuFGUB4=; b=OPR3DpSRgxmZIUd6u7Q5x58vq4l4TPzabXTmCki/plfy0j0Rvja6jFN6h9Wq+ZdcLd SSCD0Ctl4kRLxgCmpksy1lG1CMGW/HfDuVv1USi3rXZKZa2YvLdJ6FJlBcxO6wvW8wrY 5f69txLyJ4EHE9pxP4VWGzoi5j2182cCV+yNtEJB/mXsIg/9z7venFRU2ETYPFiAKtXU J7J7KMNnYsEcMN4PgUPH4nJJvmsWpV43pE22PRJF6ZFR5cNMP7vBD6Cp+qO+/r1q6anI 75KMymxNbDAwGdPBNKmF0xo58aDdanGxM1/GWEUCvHdpl59MoWnxf5R5eVzx6DsdUOMH kzNQ== X-Gm-Message-State: AOUpUlESC2YH0Bp8K8DnKKSoxMQ2sysWQEq50j6FRDbQ/lYl2KAIIdM+ QK/ja4rOuKF1RyBqtd5XKhyS/Qb8 X-Received: by 2002:a63:af14:: with SMTP id w20-v6mr6349738pge.47.1532190451204; Sat, 21 Jul 2018 09:27:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:30 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:14 -0700 Message-Id: <20180721162715.12611-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 6/7] xserver-xorg: Find wayland-protocol files in proper location during cross compile X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes | make[2]: *** No rule to make target '//usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml', needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop. | make[2]: *** Waiting for unfinished jobs.... Signed-off-by: Khem Raj --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.19.6.bb | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..caad2781a8 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,31 @@ +From 03b856b08a2a9403dbd556c48ab4a94338f7893b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Jul 2018 23:29:35 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 14dfc2e..3bd18a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2530,7 +2530,8 @@ if test "x$XWAYLAND" = xyes; then + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, + [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) + +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) ++ AC_SUBST([WAYLAND_PROTOCOLS_DATADIR]) + fi + + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb index c680cf9e89..27d4e75b1e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb @@ -5,10 +5,13 @@ SRC_URI += "file://musl-arm-inb-outb.patch \ file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ file://0003-Remove-check-for-useSIGIO-option.patch \ file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ " SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8" SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" + # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. From patchwork Sat Jul 21 16:27:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 142504 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4234756ljj; Sat, 21 Jul 2018 09:30:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcGmY/wyAPa0Wm45KcHHZK2199FbpWYM/rAyVjz8ua9MifOcdwAZUcbtG28byXQ4Q8KgfP/ X-Received: by 2002:a62:a649:: with SMTP id t70-v6mr6623562pfe.149.1532190635868; Sat, 21 Jul 2018 09:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532190635; cv=none; d=google.com; s=arc-20160816; b=LhgscZJ48kcjodULfMTBzqeOYIqv+xHWglZO/EJp56G+Y04/uGRzSFR98sbNyZlb4I r0+hNfIS8yvdO/OIn7ZFbtX3vOKMhvTz+6oTZtjLx2qhaiqZYTC2M9f0wgooHy4NFyQN u7Tu6UoQUJ0yhIpNKg5oToNQQGPoNilUx7ecBGRhMnjmCYSVd3ciNcYEHRCb5H7sbjRP RS8n7O+p0Gspo9qUylIl5G4nRP0RAIbS3fT4LDYLfI3kIHksE05FzrwOUqX9Iu8CfA8N VTmEyOVV0OJfrQRzDTIVevFkPRdBrZ2A0+UjLPxDplX5x3/nV4JVRFBVD9dZXyVOj8NB 1jLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=zg5V4fb6cXZjekJvVaeTWF/mKJh36qZR7xrt/JCRUDE=; b=plo7FCXVK+W7+hkVohE5zf5swJfxEo/MxGEbKljunOOoeBiljSbVaTkPIM1KEw+5Hc peEUVB2vK9IhGBcNO859wu87fkr4xFiCLW00sozC049lZzLwetpF9fzzWCoNSgebu6gH YJfP0BPqB1vpnL7TwS49xwwDzh5pypfsfvwrHOnlt7DkbaPZvqPcUnIYZowhxYFS6Gwb ALqJrKGHy8nel27AdG/ekbaAJOVGm/XaKeR8GdbHZrmRo82bA5c6QaO0OfJSy2Brjqb2 bWBt+vv0KkfLqmIyFqHcHWPcbd56/HEvb+6cOaCsOmBX3mZmE1RQyBAeaNay7+SPrJFV hNZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DxhQaAIk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s85-v6si4348605pfe.290.2018.07.21.09.30.35; Sat, 21 Jul 2018 09:30:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DxhQaAIk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DBFAF78BA9; Sat, 21 Jul 2018 16:30:17 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mail.openembedded.org (Postfix) with ESMTP id 6C3AD78B0D for ; Sat, 21 Jul 2018 16:27:31 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id k3-v6so9244594pgq.5 for ; Sat, 21 Jul 2018 09:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NOwdX8KR6MsSpJ3nuifsLGtj/Emc8pW9E2Hi8AxGfpo=; b=DxhQaAIk39Jj80vWrPSnEtTbhO2Et/+88by4sqXx019cXReQlfXs4Jz3DRsocINDeF MfX0GuM6fwuwfpqNeihk3PWK1uzKgB1UX/nP6p2UredImb1JgBvlmN3FIPGsvRDltF2o mUFpIIuJRISI1FRjUNxyBApmy6fKgAKSbz1HXikKbMEtVSHDUyGKQY8EbDJFf9DE1rdu BCqgN4ejP72pV0tbku6h672YxRUW486Pb4ai4RNeyHZFydcBQ+VAOn5Iw3A0BxY9tWIS ux14HGzDheCmpWrLEPCWGrSvghBuyCJ2wRROUM6idkWZl9SYjJKuOytGgnKstQEcwxEB fv2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NOwdX8KR6MsSpJ3nuifsLGtj/Emc8pW9E2Hi8AxGfpo=; b=VUzXGYVi9c8AW7FGA6HrhmhXYKOV5YLzT7Zp+gEVYCINXUyGJ2TTINcke6nwaaX67L XLSmGs8wMeXhY7qmp1JZvpjpzgregvVcPmAebrkkPE/qrh/JmgFtfWWTRyUA+RskKNJn WVZw/NE5W7Q9v+FZch1HNFCPPCyCXe/xpGByzvw+OVDhAPoiduy7xS2lBtdp5ObX3y9N 3qXAwnGtjvdCbOKm49EFMZqFw0AxdmuOED55bcdo/nVR3Z2w8+sNreivAbaq2RHXYnF1 bXCLziIeTWRVxsAXbisMc34/LohQPLyAZmL+W5CGUbVQ5Gyxbr+/rm/dVZfncjTGNLlW 8n4Q== X-Gm-Message-State: AOUpUlFP0xfzj5o4AY1W16TVO+2UJszHoYjYuZOAxpFCoiiu1wzbVUGc 1K3mCjDVo42Nsqb6XvvnMAwwPUcb X-Received: by 2002:a63:e001:: with SMTP id e1-v6mr6142425pgh.380.1532190452313; Sat, 21 Jul 2018 09:27:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::8092]) by smtp.gmail.com with ESMTPSA id k26-v6sm14485231pfb.167.2018.07.21.09.27.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 09:27:31 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Jul 2018 09:27:15 -0700 Message-Id: <20180721162715.12611-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180721162715.12611-1-raj.khem@gmail.com> References: <20180721162715.12611-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 7/7] no-static-libs.inc: use `?=' to set a default DISABLE_STATIC X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Hongxu Jia It could be overrided by basic variable setting `='. Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- meta/conf/distro/include/no-static-libs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc index 7c165c717f..7fd578b3ce 100644 --- a/meta/conf/distro/include/no-static-libs.inc +++ b/meta/conf/distro/include/no-static-libs.inc @@ -1,4 +1,4 @@ -DISABLE_STATIC = " --disable-static" +DISABLE_STATIC ?= " --disable-static" # qemu aborts on unrecognised option DISABLE_STATIC_pn-qemu = ""