From patchwork Sun Dec 1 18:46:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180542 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4275126ile; Sun, 1 Dec 2019 10:46:43 -0800 (PST) X-Google-Smtp-Source: APXvYqxaPxniEEYIhH8Rho1ewzEDS2Fn5Y5h7tEfm0aI178x6hOGqaovpuHBbGswkBaEqMgqW4ch X-Received: by 2002:a17:90a:dc81:: with SMTP id j1mr14056148pjv.29.1575226003613; Sun, 01 Dec 2019 10:46:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226003; cv=none; d=google.com; s=arc-20160816; b=b5YCtzTiV9Wxs/Hw31d8EixsOMg/BKT0fmWr+yN3P8uJifm8dZdXNNUiEYC7fUGN4D zb0yZvY6zzsDbeJlma/0nRx8XmPH6ZH5D9u4jwr6z9Vo7aAf0CHyc+MjrKFYZfRR0kXD Ks2cKBzEmFmGQa/OO2lJ1+kaIXnoB/TcioJtiYAz1bOxta9B1ZGHq/lq5fdRgQViR1Sc hXv1VMMRxHDo8UnG3K4jOtKlMIJXf/WsyIemg9goV54cX5HDynFqiX6UvZbJuBYhkFet 0LxhkiJ9kG0yAxcFop0kThB+EcW+41jf5E4c7z3AX/S7LvPFEGtqFEyt/ZFJrTkWPLgc QNRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=d6lwnXO71SzI+bDNbPD7Vnxu2EQ98vObp9oPfB93OkE=; b=OvyEmDpobNVvnFMFuIxhGWh99Asukel4yBlubNEPUjqx6bR5PRwdPPAZBVwkDAIKZe AUVEQQZwSOTmIRcTrKNOD/67M5YRNsef5ev58bfLDKyTg8qlt2cLUBZd5koUYtpS0MCm BkMup4BR6ZhW82FKBgslOLp+JmKg/fd+e4F6rLjBu2rruQeb/BRqJuz40rQSNP3rcMU/ V36+F4q/KA75/z4JD+msVMrh7fbIKXD2C7prADvGNM2fmRAVoOXXwFBG9fh4YSYpKK/R sUGWXxdIXStSv1ztdVCvdphvpV4LTexrJKDdsSTTCfNv55Quy8Tev5sslKGgWC/mf/DC G6Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SjVtQIPq; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 q2si15480427pgi.40.2019.12.01.10.46.42; Sun, 01 Dec 2019 10:46:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=SjVtQIPq; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5B57B7F608; Sun, 1 Dec 2019 18:46:36 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mail.openembedded.org (Postfix) with ESMTP id 964BA6BE2A for ; Sun, 1 Dec 2019 18:46:34 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id b19so508934pfo.2 for ; Sun, 01 Dec 2019 10:46:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3M5DDJTkZrK3KseVbm/LITVNF2yQhCMQ1O+g+5pFTrI=; b=SjVtQIPqCkapc4SgpK1VnfCM5liWcv0Y+8LeewPxazc2/Mc4RSGSfn44ooM55x0RhQ dloi1lvJag5dqugzxZy7VaDGoCNpXlWp830Cw2oI+TkNUFblAMtT/mrDDdjun4JiRuKU 2jaBSUgEysFaQKRAz8W3mjtGNuJEQmuVo7RwW4loOfr9mgmULjQBaBLtSkkhRy6g0hNa m5lGftdnY2gubSl8+przmX+8v1Gux/qQPgtT2lTxEUS9wuvGXaPdn3Y6DD1xfSuLS0KE SJ5jckiHcueiG3pQO8dmfVQNxiVp8EhpwZnjFCW9aN7QfMUGJVGlyaMUij+SvXIlan8z C7VA== 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:mime-version :content-transfer-encoding; bh=3M5DDJTkZrK3KseVbm/LITVNF2yQhCMQ1O+g+5pFTrI=; b=GuQg3oEDufjho4ZQ3/Dgf6kRSCd6yoHXsFRrwRrkhg8TAK8U5CObgO5whodx7hLkP4 A2C+XjLu76OmoiQSx/HpGjacxSb7Nd4GCrRjrkHPshh8uMc3s23Pp693i5IveZ8Nc/PD kB/fz3tf5CV9bEvhxnZZRbFbgzazDfHeYjCNBhGPC7jes2WBP8yKW5ENy0ZNecuXiUeC DGLr1I/78W+4kkJmrBqyLB9FCCyeyQkfYh5YxsVmBjvWfmjg2GmYIJ2BIP+2ru+rlwtI 1DURuqOBGGOwIzRSj8GHJtmVInHvxkeaQCNY/23oRG/p6GURll1x/uRsHyimauwvlXs2 ZY4Q== X-Gm-Message-State: APjAAAU+pZRTxw0+tjDlcDLIn53qFm3iMQmNathbBzIwR680PN/iXYga K3acHC1B2Gr+Y9JB8pH6NgbhcEfx7OM= X-Received: by 2002:a63:fc13:: with SMTP id j19mr27147367pgi.327.1575225994846; Sun, 01 Dec 2019 10:46:34 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:34 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:14 -0800 Message-Id: <20191201184622.889513-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [oe] [meta-python][PATCH 1/9] python-evdev: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-evdev.inc | 4 + ...ld-on-32bit-arches-with-64bit-time_t.patch | 83 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-python/recipes-devtools/python/python-evdev.inc b/meta-python/recipes-devtools/python/python-evdev.inc index 953094ba74..a536815358 100644 --- a/meta-python/recipes-devtools/python/python-evdev.inc +++ b/meta-python/recipes-devtools/python/python-evdev.inc @@ -3,6 +3,10 @@ HOMEPAGE = "https://github.com/gvalkov/python-evdev" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" +FILESEXTRAPATHS_prepend := "${THISDIR}/python-evdev:" + +SRC_URI += " file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch" + SRC_URI[md5sum] = "53e440943dfa2514f95b3c448d6a36cb" SRC_URI[sha256sum] = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166" diff --git a/meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..154172ca88 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,83 @@ +From 435e78aaf6745e4da0fe3d4455473011626c77d1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 11:21:20 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://github.com/gvalkov/python-evdev/pull/112] +Signed-off-by: Khem Raj +--- + evdev/input.c | 13 +++++++++---- + evdev/uinput.c | 9 ++++++++- + 2 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/evdev/input.c b/evdev/input.c +index 67b9348..432db92 100644 +--- a/evdev/input.c ++++ b/evdev/input.c +@@ -24,6 +24,11 @@ + #include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define MAX_NAME_SIZE 256 + + extern char* EV_NAME[EV_CNT]; +@@ -60,8 +65,8 @@ device_read(PyObject *self, PyObject *args) + return NULL; + } + +- PyObject* sec = PyLong_FromLong(event.time.tv_sec); +- PyObject* usec = PyLong_FromLong(event.time.tv_usec); ++ PyObject* sec = PyLong_FromLong(event.input_event_sec); ++ PyObject* usec = PyLong_FromLong(event.input_event_usec); + PyObject* val = PyLong_FromLong(event.value); + PyObject* py_input_event = NULL; + +@@ -102,8 +107,8 @@ device_read_many(PyObject *self, PyObject *args) + + // Construct a list of event tuples, which we'll make sense of in Python + for (unsigned i = 0 ; i < nread/event_size ; i++) { +- sec = PyLong_FromLong(event[i].time.tv_sec); +- usec = PyLong_FromLong(event[i].time.tv_usec); ++ sec = PyLong_FromLong(event[i].input_event_sec); ++ usec = PyLong_FromLong(event[i].input_event_usec); + val = PyLong_FromLong(event[i].value); + + py_input_event = Py_BuildValue("OOhhO", sec, usec, event[i].type, event[i].code, val); +diff --git a/evdev/uinput.c b/evdev/uinput.c +index 192568d..56fe86c 100644 +--- a/evdev/uinput.c ++++ b/evdev/uinput.c +@@ -16,6 +16,10 @@ + #include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif + + // Workaround for installing on kernels newer than 4.4. + #ifndef FF_MAX_EFFECTS +@@ -232,8 +236,11 @@ uinput_write(PyObject *self, PyObject *args) + if (!ret) return NULL; + + struct input_event event; ++ struct timeval tval; + memset(&event, 0, sizeof(event)); +- gettimeofday(&event.time, 0); ++ gettimeofday(&tval, 0); ++ event.input_event_usec = tval.tv_usec; ++ event.input_event_sec = tval.tv_sec; + event.type = type; + event.code = code; + event.value = value; From patchwork Sun Dec 1 18:46:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180543 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4275605ile; Sun, 1 Dec 2019 10:47:27 -0800 (PST) X-Google-Smtp-Source: APXvYqxWtkoV6mAEN3wzSthKFrzWuNkEWvcdEh/0GKcHHSH8PqA7/zjNO9oRDcXUcq4X0uUgldXm X-Received: by 2002:a63:d958:: with SMTP id e24mr27390436pgj.31.1575226046849; Sun, 01 Dec 2019 10:47:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226046; cv=none; d=google.com; s=arc-20160816; b=yXZCHtpP5XIodcENzjNpUttbBYQhoKS91ZS72nbtMEttPwmPurMO1AaSB3iXDxsi6d dp1RiTov7+ewgXZPuNAxq5GjHkE+NARoPv78Dgpbr1cwMe75AG/+y9da4n1Bj1/l/voK noKoMK2wZ+X3FXglJfDE4sd+2om30zpZdROFs5YEhaIvxOMveWwVDc6AXHdqlYaXlc28 B51lo7bwAbv5NFCO/6+RH4BedtaaMD8kbaVUnalXKwjNfO4Njad/Eg04Iwyv2ahvoGTm R+V8W2OT+W/E73tO6ZMnxGplN68R7JraAarQwo1GzFIG5ZlGlHUkRlJ8uEAKtaMMgpoZ yCpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=F4o2ngBgGpDfIuu2TIS+DkHG5I9ZWh46Dgi8zDIus1U=; b=UXd2Vi51CnF+yJZB54FT8mYtvQJJHcXzCrdt/GWezuMf9LS7oZ/vjvc+dO43eTiO27 nXnwEIe/0osOq3ZPjCHxSGIioVPTEGjwYTNxUguFcGLQ0NtfJaa0DTz4CsyLwBK7JO3/ /od3POvhTn7dTqdO1XFTaL29eJ0nu0Fz4FHlPTSZfYhL7daJmAo7qhbBbHpXKVqoF9NS AVEVBEZTjalRnS9ocBWTl8Zz2FsFHs3JNT/LBJDWuA8Hojb6p/tXyfzlxwisGAZBJDQ2 KE7iI0jLIxW8sDlfdWa+LfU4JM4dNTB/r4iNqJyX2saqsAohFYJ+f+WVH86xqH3kIeif DJBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=edqzRMX6; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 28si27214680pgu.14.2019.12.01.10.47.26; Sun, 01 Dec 2019 10:47:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=edqzRMX6; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C01D07F608; Sun, 1 Dec 2019 18:47:23 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mail.openembedded.org (Postfix) with ESMTP id 74CCB6BE2A for ; Sun, 1 Dec 2019 18:46:35 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id 6so12661655pgk.0 for ; Sun, 01 Dec 2019 10:46:36 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=eS71B/eLULfANsx6DNtn2Y/ZZByTzvHcKQrc+8v4yNc=; b=edqzRMX6by3geqw3qDWM6YwuW1JAXgRfVz6CwYAelRRdoI3USbGXRouJoDWNTAXFN4 mlUYFzhJx5kjsY+wiU8z3AF333UHz1FYM98+5T/fK/gBAxdWb4S56t24a5JIwkwHk1mR TlUzRew3U+oGZhjKtonYlsvlvJXakE/TWTqrKz+Yo7zukjS2Bxkr6Mg2BvCC/NNMlfx8 dXFeC07m2W02V3YjiSbP043DeLTnP+DVgH4oL+zrgJ3iTu8HU1MuPl6YYaqMuGGb8h8c jSSDrouszjCSjiWdoZcRp2P/TAYUrkJ1kAaEeAcmAalnJz0Z6gyKdCjAg6SeQmzVhu7P LW5Q== 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:mime-version:content-transfer-encoding; bh=eS71B/eLULfANsx6DNtn2Y/ZZByTzvHcKQrc+8v4yNc=; b=ChONMol1R0/UWAc8C09pNpAsReJL//bv/bHBwObIwn40+qL9U6fcL90+U5UWCJbZIg J2UMCYzDJKoJ0L/9YHVmSt+f7qtrDYl45bAXFwvOf3XKNxBBTT+poypGoX5f3fI25xtr nbGlOZYLdJcIEyYl4WssPQpfvlSKb4zID0cbQIQD/PQ9AYBGWnly4Z6zn4JlmH+M0Twd 6D5YyFWVD+7bbBIummXSdVkhWMXBH/U+vC6PXOpEeCQ+Rmu/BntvZFaAOqCan/a791gW vmk3HVC2sPhWLHEPbFKJZtxg0JqXtmr6TLg/sMqmpIwO7mdj+nDtwyrUfZCaqpO0XW+o jMGg== X-Gm-Message-State: APjAAAVTQSqqvuc1Z8b0x2L4L5BVSnKNt3Hwdhy0LjH7j8rEiUrzsEzX 0CA0DmCTXocyeKOtqDjCiVGFCrZGf1E= X-Received: by 2002:a63:25c7:: with SMTP id l190mr28071650pgl.429.1575225995602; Sun, 01 Dec 2019 10:46:35 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:35 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:15 -0800 Message-Id: <20191201184622.889513-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/9] x11vnc: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...ld-on-32bit-arches-with-64bit-time_t.patch | 111 ++++++++++++++++++ .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 5 +- 2 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..d44445fa9f --- /dev/null +++ b/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,111 @@ +From 8ab672ccc67b64058cffac2cd19a0d3b75d5aa25 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 11:43:32 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://github.com/LibVNC/x11vnc/pull/117] +Signed-off-by: Khem Raj +--- + src/uinput.c | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +diff --git a/src/uinput.c b/src/uinput.c +index 28fbad3..343b7c5 100644 +--- a/src/uinput.c ++++ b/src/uinput.c +@@ -54,6 +54,11 @@ so, delete this exception statement from your version. + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #if !defined(EV_SYN) || !defined(SYN_REPORT) + #undef UINPUT_OK + #endif +@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) { + static void ptr_move(int dx, int dy) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int d = direct_rel_fd < 0 ? fd : direct_rel_fd; + + if (injectable && strchr(injectable, 'M') == NULL) { +@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) { + + if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_REL; + ev.code = REL_Y; + ev.value = dy; +@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) { + static void ptr_abs(int x, int y, int p) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int x0, y0; + int d = direct_abs_fd < 0 ? fd : direct_abs_fd; + +@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) { + + if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_ABS; + ev.code = ABS_Y; + ev.value = y; +@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;} + static void button_click(int down, int btn) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int d = direct_btn_fd < 0 ? fd : direct_btn_fd; + + if (injectable && strchr(injectable, 'B') == NULL) { +@@ -959,7 +971,12 @@ static void button_click(int down, int btn) { + if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_KEY; + ev.value = down; + +@@ -1230,6 +1247,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) { + void uinput_key_command(int down, int keysym, rfbClientPtr client) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int scancode; + allowed_input_t input; + int d = direct_key_fd < 0 ? fd : direct_key_fd; +@@ -1253,7 +1271,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) { + if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_KEY; + ev.code = (unsigned char) scancode; + ev.value = down; diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index d0c9f774fe..0d84c420a1 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRCREV = "4ca006fed80410bd9b061a1519bd5d9366bb0bc8" SRC_URI = "git://github.com/LibVNC/x11vnc \ file://starting-fix.patch \ - file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \ -" + file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " S = "${WORKDIR}/git" DEPENDS = "\ From patchwork Sun Dec 1 18:46:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180544 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4275677ile; Sun, 1 Dec 2019 10:47:33 -0800 (PST) X-Google-Smtp-Source: APXvYqwJC17HNJ31jJ7urNTJ9dHLJbrv8k8qfmX2+9VvW4DQlsvuGXvirr43AY2vDIeIh8W3Ln0w X-Received: by 2002:a17:902:8f96:: with SMTP id z22mr11585914plo.11.1575226053576; Sun, 01 Dec 2019 10:47:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226053; cv=none; d=google.com; s=arc-20160816; b=KqILh4LRZmhX1YBRyR2WC8sbeTKzzpjSd6H25SD1F/gUz6Zo38rEUYl501H0Fqv3Fh 9q18zXzuOtvEz49yMWTHBIY/qE/K9osUCIHA5PrgH0ecCTRPKyWbPp/PxIABok3i25nL rhblY1IeO26pOCTfKuRioCkf41Jeh4Uj+2LRQt6bfD/4nF9Vc7nTeei2Tqn9PKqsFhcZ hCLxcvJW2KSNYpl3IfF9FbALqElhkpKZarIlHh5FCOPl7HqtxZIzTPvq7abioxTHahfK PSa3FN2AKHYDnuatOuBlzlz1b/mgPtI2wSZjkwLb9gOJ3McBxiM1BUkVqvCe4+PhyD7c vTUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=9f9Hbh3+ACXGrs5C+5JTMMckJ5icItP/bzl9zN/fH+k=; b=YLFg/mO9q675CowYgX/RpHOUqKzzngW4nv9l1rn0LJ4ddZh39y0ZWSk9ItYZRudluu gU/OOFHNG/89GLVvpr+quXSVoJkB+iTj8Q2ZkiDx5NsuxO5A3NOX+4K6BP1UNVCwlk2b iGcnB1omMrVsAU3ys1WQVOpVAgVL4v8iXk+DBvVzpvUGwZRWyIHNmY7hc546QGeTRjJq eeaEn3+Y2fgI5qmh/wOuNCzeTLkGuhc1tK/UhI3WwjDegmswICbQGP8wjQMpo4kH4iSV Lq6qW+YsYZJduQIW5HRlqKTtCARQaXfy9SSUl0gxwpglRjKP2gAkpTcFYk7MUrdQuAE1 unRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OZEr+DKE; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 h3si29020182pfb.86.2019.12.01.10.47.33; Sun, 01 Dec 2019 10:47:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=OZEr+DKE; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 36CFD7F59D; Sun, 1 Dec 2019 18:47:25 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mail.openembedded.org (Postfix) with ESMTP id CD00B6BE2A for ; Sun, 1 Dec 2019 18:46:35 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id h14so7142076pfe.10 for ; Sun, 01 Dec 2019 10:46:37 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=DKzpBKto+y5qke9BVQ46RJGj5KykD/d49l7RpIbPLzw=; b=OZEr+DKEv0x7HuNdNhKMxE3faGTYKLTNk3CvPov9ZcVgJZlQc33uAyxfb8ftjSCtm1 ag1e8EwC9L8L9uKMOpJnH/H+Q7j8MQ7BSEIU4fkOKfDT29VqYW1O8fIMF1cHF0CRa/kg 4nFZ6F52Z5SXqlQEoz5ulM99LbEf0Rqa08xb3UAlO0QZDO+fTQioCn7T/XL0r8XnXtvG HWHVtuRWkj0JkqQZIo0yQ+TKy3WGH+ZegjiUs7OMNb3gr9uY3Ob4+wtWGaXkQsJDOC2B og3U357Ft/TplBOsQniJKVgcjW8xn/wNuFTLiNwbIbUGJ15VpOak8rDFAbAspPyn0Jvq gZhA== 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:mime-version:content-transfer-encoding; bh=DKzpBKto+y5qke9BVQ46RJGj5KykD/d49l7RpIbPLzw=; b=a3nLwH2KcHmY1DiM2KO6zQ6kLffqo7iWQq0BFKLPiAJ3FAz4EqT91gKoP6exwShA0C b+O0yJFFYhimFR9Y4CletH4hvNXBnX2xVoUw53BUkUEwQvHocKv3xvL5EHjDBkmvlZLx TciUOCh7f1p/QmysuYIZPg9xExbxh4PHHtrO7BDOUDy6QIhe+Ro9oSieiNcxnX/Llums wn8cxk3hdIJUjMuLZ26T7MCW4wUI3bbhNCwOddannKpY/iRsJURv8lVqGfhiY4d/VXoc O+EY32TuaQj5DC3imztJyVRVkjLU2mRmPu2Yv8CyncNNWr7z0ysl8NfA27JRDru2rUFJ T8yQ== X-Gm-Message-State: APjAAAXB89tTQzSlzZ6v9q32W9XQ0mIXD7W5w2GqyS4q0GD0TwwVVqXv S3u0Polt1UnQAqqEh7JhNcQehBSEUfg= X-Received: by 2002:a63:a511:: with SMTP id n17mr27337132pgf.338.1575225996403; Sun, 01 Dec 2019 10:46:36 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:35 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:16 -0800 Message-Id: <20191201184622.889513-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/9] evtest: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 +++++++++++++++++++ meta-oe/recipes-test/evtest/evtest_1.34.bb | 6 ++- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..706322d565 --- /dev/null +++ b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 11:58:58 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6] +Signed-off-by: Khem Raj +--- + evtest.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/evtest.c b/evtest.c +index 548c203..93063cd 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -61,6 +61,11 @@ + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define BITS_PER_LONG (sizeof(long) * 8) + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) + #define OFF(x) ((x)%BITS_PER_LONG) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) + type = ev[i].type; + code = ev[i].code; + +- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); ++ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec); + + if (type == EV_SYN) { + if (code == SYN_MT_REPORT) diff --git a/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-oe/recipes-test/evtest/evtest_1.34.bb index 3b6dc61408..a3a23c8951 100644 --- a/meta-oe/recipes-test/evtest/evtest_1.34.bb +++ b/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" -SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git \ - file://add_missing_limits_h_include.patch" +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ + file://add_missing_limits_h_include.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " S = "${WORKDIR}/git" From patchwork Sun Dec 1 18:46:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180545 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4275764ile; Sun, 1 Dec 2019 10:47:41 -0800 (PST) X-Google-Smtp-Source: APXvYqy6SWPnclRFb6gEjJ8oeU5IFQFe1EsxsDvSsd9lUgEsKiK2+2RLX+Qu05x6sRW/Gv0fYWYu X-Received: by 2002:a17:902:d717:: with SMTP id w23mr22587375ply.142.1575226061507; Sun, 01 Dec 2019 10:47:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226061; cv=none; d=google.com; s=arc-20160816; b=xVtMyowRY5A1DRCrv0XZBTtOk8LAgGw97mITKYN6N8xruKVwGj8ptS/Gh/CBhA7EbS 48DK3MJsxndMDbmw5JFOQOGy6rkztXhw4EHOO7pbCJKrr5YFWRkTckpI8PyMbVsMIJTB Xt3X5VAQA6D1XH8QFYHjlGEgzqpC9SOT8YjBRDK9gRw6KSt3CUpJFWQI+xWEC77fND+O Q1nkdlsNyrTwpqE4gY5Ctf1s3kdMKfNxy/PRVxiKVrQhJfqPy8stw2CY4hx7C4g8ly1/ JwSelOaP8areqqJ1+uVFXg1tJ41YZlFFAXBH5b5bvJVqD6WpA27BOLQNE220Wm114JU4 H/WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=axj3VSEzR9qY9A8NzBxfpQs7A4PUgs7uj5XQuWjWAzc=; b=DCLzAplmHhYjEXr7pV7r/S4Z+zinGvCBgYCMuyfE7I7S3Fa/IeNiNFl/H8B3FXKjgd Q93GIegdgzXKDWLjkvJmKmaIFdK5fo6WUk3nD2lPXJv4NmNf/izwJ+D03t+ETf77UliX OuqsYZIe64yQmK1hn9dWQ2F8GCxHWiELQHMrCI76FTtk7bYTMVenM/8sTO2CePPW9bq+ e13UkCQUJMpzl8Oxbh2wIhNa5AoCUXyPPZpB2bAUP0qN/Dz1lWxjZPjykmCSk5jYt+Bs OO15RkXvYFhya7xRDjCOZSv5dAcouMxrKDyUotGgEx4Gy3Dv7U26cwCCCZPeOJMu4X56 6HAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SCNuMRRR; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 91si5041334plf.270.2019.12.01.10.47.41; Sun, 01 Dec 2019 10:47:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=SCNuMRRR; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D05C67F68F; Sun, 1 Dec 2019 18:47:28 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mail.openembedded.org (Postfix) with ESMTP id 7F5246BE2A for ; Sun, 1 Dec 2019 18:46:36 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id q127so305526pga.4 for ; Sun, 01 Dec 2019 10:46:37 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=gpmGgSZId9grtLS1rkVkOIcYrBthBHRDUMoiIcuZOvs=; b=SCNuMRRR2TRltqIUUuXq+NGRAEC1u1Vz5AAmhb0hNH9UgBjhH3T+ENYWTrGMVzBASo f3EHdxfHRJ938eDuzmeneoswga6L0NelLnIy8bUnF87QdfMn/YHTnDdqFR234QkG4rof MjmyrmHeikpGg/3wVw0+54lUkge4vVsUl+oPd+d5B7uVw2IfDSOBfGVEDvElvvdc/AoR RcDjOaVH6HKrkJefiUXwmHkJlQfA4Uia0Ycj6nucK8txIS9NZm4Kx9RgtPlOmBxV3t5e Nea30og23rW0RaOIoFO1CT2mdUMvIx1wg6JxvEvzR41oYKsxaKUpAGac4P5QzI/m5Zar 6hQA== 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:mime-version:content-transfer-encoding; bh=gpmGgSZId9grtLS1rkVkOIcYrBthBHRDUMoiIcuZOvs=; b=lRR3TBCZHS3JdPMj9APDw1L5BCAJWtOBDk7EAhn8Y4Y1S19wPbBg937dHk3hONqDOy ZXPZtC6RE9/8LnKmOecAtYvdl0jfSjnK+4+pOi0hdqDTUCHmvUTQFiqkJZbz/31SqN1/ vHOJjldDy3n9StfScBDrVT57rmzZo9agxGwk+NHvmxMdh0W6Zcs76lqciOuk1giSZjny Ll6QOvw1alrTw0wbaWdvssGEjjLZpOASZ0sJdToOpigRk9/EprtYjSjrh/eBIhRE9cHk ZoLy1JaUELzi7RZWFgRfwYFuYimrkpdQLXMa0KTH62ZBULGiZCCDi64hfgi9AESgrjxE 0YLg== X-Gm-Message-State: APjAAAW7Tc0lbqXuyZVBxMPFj9WHRWz1SLqRf1t20qBl9F4VVgWDzYD7 XMuhlthrNNDq+oxjubq707YJ2Am/pfk= X-Received: by 2002:a62:e105:: with SMTP id q5mr67909070pfh.105.1575225997081; Sun, 01 Dec 2019 10:46:37 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:36 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:17 -0800 Message-Id: <20191201184622.889513-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 4/9] lirc: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...ld-on-32bit-arches-with-64bit-time_t.patch | 40 +++++++++++++++++++ .../recipes-connectivity/lirc/lirc_0.9.4d.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..0e38f7d8ec --- /dev/null +++ b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,40 @@ +From 50a48a7bd8d65a165ce2aac4ba0c1e02bded04aa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 12:21:31 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Signed-off-by: Khem Raj +--- + plugins/devinput.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/plugins/devinput.c b/plugins/devinput.c +index d4d733a..feb4a61 100644 +--- a/plugins/devinput.c ++++ b/plugins/devinput.c +@@ -34,6 +34,11 @@ + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #ifndef EV_SYN + /* previous name */ + #define EV_SYN EV_RST +@@ -459,7 +464,7 @@ char* devinput_rec(struct ir_remote* remotes) + return 0; + } + +- log_trace("time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type, ++ log_trace("time %ld.%06ld type %d code %d value %d", event.input_event_sec, event.input_event_usec, event.type, + event.code, event.value); + + value = (unsigned)event.value; diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb index b13163debb..606caee892 100644 --- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb +++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \ file://pollfd.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://lircd.service \ file://lircd.init \ file://lircexec.init \ From patchwork Sun Dec 1 18:46:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180546 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4275841ile; Sun, 1 Dec 2019 10:47:48 -0800 (PST) X-Google-Smtp-Source: APXvYqyu4+KFPp9gGBO7Mqc+jg1fQRMZHNU93YJBBSDJ0wCxXMH9oZiYRc46PH2mS/tQToXROH+K X-Received: by 2002:a17:902:a618:: with SMTP id u24mr22417493plq.296.1575226068431; Sun, 01 Dec 2019 10:47:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226068; cv=none; d=google.com; s=arc-20160816; b=Sj9xAAMQnJHW1NBfoGPwAX74OTyRZ316T/NB0i4lKbiDfcyF5Ko0NtkFoKFs4NQl90 +0m4Lbip0QpxCLbsyms7LS8w7rno8azIDYv8t3kDks42cncoFNWNFcckpVLWZoo6LoOy E+eENbC0+spjBPle6aJATLgbutScJQY3ArQNlu45Xg5hUc3+8BFbyUVMccpMv3G8G7ET zXs1W4b3f9hWaVpPODyWPygNR1PMKLoXqTRG6m6L0EiaLJSRk/hmaxcKBa1fR+JVy7AJ aEX++/6pgddoo/+1K/6XQbFQjWrFORBGiw+rVWPHIE0VBwEb/vnD18IzcMkYApXHfs5b fjDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=Ailn1Pkb68etd7KX8nMvzZPY1RehHNA97lkuo21MhKw=; b=S0LfYG8ccVMjCQOtFhtMVCO6+VUIMUo6UZ9pzSwonCOsqC1jH4g1VDgzvxD1u2eg3R IP824HCs1hfZAGz9aPi7+HTBnsfISGn+2kwC/h62rlx/RL+HEoUmLE0YI3RJtANBRtLH 80j+foOKkfZi4RNJ6onFwikt+eEqLiSGRZj6Oua8Aj22pradLe2Z2iq0T4KCx8KbRjq+ wYzfPDbWaoTOI7p39YjPZLCqWlwVzbR3WGs/nta76wiiddyj12YQlCvhZTU3vpskiHp9 33Ym2ClOFh79Iy/ADuDCKlP7I7QnQWHF6s4VW92rvp65Wq8IUdhDxGE+gINKlfv69sse iL+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KeRchDpb; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 bh2si840921plb.432.2019.12.01.10.47.48; Sun, 01 Dec 2019 10:47:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=KeRchDpb; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EEF197F79E; Sun, 1 Dec 2019 18:47:29 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@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 290887F568 for ; Sun, 1 Dec 2019 18:46:37 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id i5so8925058pgj.9 for ; Sun, 01 Dec 2019 10:46:38 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=MfJMungFUyiwxrY//jTWW+wxYj3iniWNHXOdUO4phOg=; b=KeRchDpbKzbSDiPdtNO9JC/sRrOiePeQDorrrNt0NgsyoV+QODCxtnH9wkirnpq212 I94fE43OTw87Xa2awgLSfHlVmnFcBVYBws7f8avZyEDMGBuSERcI+ERm7TpMeKBQhU8V e1PF1sA2VwnqHzF5o9vPxSrfYfUCrhVruI7TaDE2IEMlJHMnc3+eAqR2Lk1lNJ2zsube lj0NdOA8RkVdV0ejM1z35lT0Mk+1X8HLh0kd6nrdiv5gtV6ZNjwiOxfec2wzAVmPfc7P zUsviUAzksigONGyqrtcZupacL5NgYRKk7TkmWL9Tt1EzBDFUC0ukZLpkfSLnb5hJPod XP8A== 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:mime-version:content-transfer-encoding; bh=MfJMungFUyiwxrY//jTWW+wxYj3iniWNHXOdUO4phOg=; b=R9nlDf/oIxsyulSelNy7t8Fpi66WHj/jaKawOwlGgqcpXrAGAWo5vXmdWKWo8S/K2Z jaeXmwyLBXbOt/K/hbQJAooou5T4shwIHtJexJfTI62LR/m+Lw6oxDWl3jqncpw5QEys CaBnzZUaBRlazH1ECRMjKKcZzFMI9IctQeDxkRZ3aVseZ8BfuQ4thGqe1qR9p3+WH3CV vZSglEpi2Qx66bKFet4hYq0Pe1LFPv4psz09paXAs0zJlyasyM+/uge01x0le7ii9H8O nWwGDamopNCD+ajmsCwYRmslt1zIuEw2hGIMZBx5cryWCAY+eXKC7VPwQTk5KtHv/qBc hhdQ== X-Gm-Message-State: APjAAAVfpqsqkk4XTTBSz4fGHY53V3Fp4fEmBidKZnZ3Y6TjmRoG32DR FZERguCvZJRPsbdI20vhhWrenSmF6UI= X-Received: by 2002:a63:510e:: with SMTP id f14mr9055453pgb.35.1575225997775; Sun, 01 Dec 2019 10:46:37 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:37 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:18 -0800 Message-Id: <20191201184622.889513-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 5/9] v4l-utils: Update to 1.18.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org - Fix build on 32bit arches with 64bit time_t - Forward port patches Signed-off-by: Khem Raj --- ...fine-error_t-and-include-sys-types.h.patch | 45 +++++++++++++++++++ ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 +++++++++++++++++ ....patch => 0007-Do-not-use-getsubopt.patch} | 25 ++++++----- ...4l-utils_1.16.5.bb => v4l-utils_1.18.0.bb} | 8 ++-- 4 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch rename meta-oe/recipes-multimedia/v4l2apps/v4l-utils/{0003-v4l2-ctl-Do-not-use-getsubopt.patch => 0007-Do-not-use-getsubopt.patch} (56%) rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.16.5.bb => v4l-utils_1.18.0.bb} (85%) -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch new file mode 100644 index 0000000000..57948add6e --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch @@ -0,0 +1,45 @@ +From 137ce23ae677b11e5483ef810751edae7bf96bb9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 18:40:06 -0800 +Subject: [PATCH] Define error_t and include sys/types.h + +Fix 'unknown type name' for error_t and u_int32_t. +u_int32_t is defined in sys/type.h + +Signed-off-by: Khem Raj +--- + utils/ir-ctl/keymap.h | 4 ++++ + utils/keytable/keymap.h | 5 +++++ + 2 files changed, 9 insertions(+) + +diff --git a/utils/ir-ctl/keymap.h b/utils/ir-ctl/keymap.h +index f2b2963..1f8a3f8 100644 +--- a/utils/ir-ctl/keymap.h ++++ b/utils/ir-ctl/keymap.h +@@ -2,6 +2,10 @@ + #ifndef __KEYMAP_H + #define __KEYMAP_H + ++#include ++#ifndef error_t ++typedef int error_t; ++#endif + struct keymap { + struct keymap *next; + char *name; +diff --git a/utils/keytable/keymap.h b/utils/keytable/keymap.h +index f2b2963..345d55d 100644 +--- a/utils/keytable/keymap.h ++++ b/utils/keytable/keymap.h +@@ -2,6 +2,11 @@ + #ifndef __KEYMAP_H + #define __KEYMAP_H + ++#include ++#ifndef error_t ++typedef int error_t; ++#endif ++ + struct keymap { + struct keymap *next; + char *name; diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..a8926762ed --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From b213da2d5fcc93cd24fc880c71c717d8e2ce2968 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 18:43:21 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + utils/keytable/keytable.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c +index 6cb0217..59ff1ee 100644 +--- a/utils/keytable/keytable.c ++++ b/utils/keytable/keytable.c +@@ -53,6 +53,11 @@ + + # define N_(string) string + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + struct input_keymap_entry_v2 { + #define KEYMAP_BY_INDEX (1 << 0) + u_int8_t flags; +@@ -1533,7 +1538,7 @@ static void test_event(struct rc_device *rc_dev, int fd) + + for (i = 0; i < rd / sizeof(struct input_event); i++) { + printf(_("%ld.%06ld: event type %s(0x%02x)"), +- ev[i].time.tv_sec, ev[i].time.tv_usec, ++ ev[i].input_event_sec, ev[i].input_event_usec, + get_event_name(events_type, ev[i].type), ev[i].type); + + switch (ev[i].type) { diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch similarity index 56% rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch index 5b84af2c32..ac704c72dc 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch @@ -1,24 +1,26 @@ -From f7a4b79b3323534460a63b3e6c58ebaf06adf207 Mon Sep 17 00:00:00 2001 +From 4a10eab0e31d69948161241b1801c41201a5d081 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Fri, 14 Jul 2017 13:20:05 -0700 -Subject: [PATCH] v4l2-ctl: Do not use getsubopt +Date: Sat, 30 Nov 2019 18:50:34 -0800 +Subject: [PATCH] Do not use getsubopt POSIX says that behavior when subopts list is empty is undefined. musl libs will set value to NULL which leads to crash. -Taken from AlpineLinux +Simply avoid getsubopt, since we cannot rely on it. -Signed-off-by: Khem Raj +Imported from Alpine Linux +Upstream-Status: Pending +Signed-off-by: Khem Raj --- - utils/v4l2-ctl/v4l2-ctl-common.cpp | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) + utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp -index 3ea6cd3..291fb3e 100644 +index 651917e..cea57b7 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -692,16 +692,17 @@ static bool parse_subset(char *optarg) +@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg) static bool parse_next_subopt(char **subs, char **value) { @@ -31,8 +33,7 @@ index 3ea6cd3..291fb3e 100644 - if (opt < 0 || *value) - return false; -- fprintf(stderr, "No value given to suboption <%s>\n", -- subopts[opt]); +- fprintf(stderr, "Missing suboption value\n"); - return true; + while (*p && *p != ',') + p++; @@ -44,4 +45,4 @@ index 3ea6cd3..291fb3e 100644 + return false; } - void common_cmd(int ch, char *optarg) + void common_cmd(const std::string &media_bus_info, int ch, char *optarg) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.5.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb similarity index 85% rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.5.bb rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb index 415446844d..9cc2a8e5b4 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.5.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb @@ -20,10 +20,12 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ - file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \ + file://0005-Define-error_t-and-include-sys-types.h.patch \ + file://0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + file://0007-Do-not-use-getsubopt.patch \ " -SRC_URI[md5sum] = "de272817133c0dca000a78a5c8c8ec8b" -SRC_URI[sha256sum] = "ed80242510385017a1dc566e17a285a77222bb301f5bc19386badfcc2c19df1b" +SRC_URI[md5sum] = "18996bd5e9d83d47055c05de376708cd" +SRC_URI[sha256sum] = "6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" From patchwork Sun Dec 1 18:46:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180547 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4275929ile; Sun, 1 Dec 2019 10:47:56 -0800 (PST) X-Google-Smtp-Source: APXvYqzLzGJrNWfr7HeE3BaNWw4mcq+WmPAqYBJA7DTK6SQl/BcFcCfx3Y4pxFb7tNEyWkAFngvV X-Received: by 2002:a17:902:322:: with SMTP id 31mr24025740pld.244.1575226076322; Sun, 01 Dec 2019 10:47:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226076; cv=none; d=google.com; s=arc-20160816; b=ACZe9wT4s1R5A6N9XoqTcPMlLNicPCKibE8R2k508W+5VZIUapqHlUOCWhLPcMsTZR qp15mZPEB105zrcxdeGuj6VgTtLjjJWR6XjCXc3uSABixdq3ZxdYx3evyZdP47xcUXBi 6qO8NmjlD6XXR2OVJFHabd+FohpkvqcAGbzXdLT85ZuvVILoeCFZUdFkIfUr9s03o25+ zCNzooTACNalc4O8p11OXKEixT1ivwgpN9geslkPap69YjIX/kxrtWQpJ2eRLyoao+WM 2pEnq74BQV9WGmjP3l9WtJm8SlcyG8et7s/7+br75u8/mjcBi20P4b6v1hj6DbriwhyH TUXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=GmY9Be0MztX1rP/1N0Y8mWUfGGElB/mBMp6l34jDtv8=; b=UaO5IR65dMmdJdjGkyj67apTlNmUdyNzCrRxsxN8Kckl3DtZ1O2lO37kFvXKDQeBYD PPF28S/oE3bzhZLPFmHY3RAw7SI19+7E54K2C7vy7254zvBiaYUvORkC++Y6SN1DJg4k TOYqle/9VyUQ8gklWS/i/tHCZuVBcGec8scxo9TbebUVlsjKLwHM/eTD739E4QZtnSe/ 1d8Qifp+P5br3HuqlNQ9jSpFQQiALUgauQTLyaB1sWXmeVy/K1Rgm6r4IC1lt900I9sU tZ2ZUVPdkwUtsPNcdz/J+Q0NQBW6wON0btKAkD9x9FGEv7cT4mAinFESlkedLCP/IvkL X6ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cqEEzbRR; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 i11si27198829pgk.349.2019.12.01.10.47.56; Sun, 01 Dec 2019 10:47:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=cqEEzbRR; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 437607F7A4; Sun, 1 Dec 2019 18:47:31 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by mail.openembedded.org (Postfix) with ESMTP id A93567F523 for ; Sun, 1 Dec 2019 18:46:38 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id s35so2539059pjb.7 for ; Sun, 01 Dec 2019 10:46:40 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=ZMMJieexwPOIayp9duUYA4KhYnHf79vUc2RRS0fsbck=; b=cqEEzbRRbVRjehiTvEELkYJhyJJqPjw8LOc/jL3deQ8/wFTJVnEf/tCduzfdmk5LbS yZ+4cT2LYvWsFnR/HFqjNxylc0Hvnk9z3l88KFOr5alIhCExE3idUz8oHnGykho1fcGE 0Gr8C/QvucbI7CRgMtueZQk/ArYE2bftkrZwu0ciTqSX2Kp31mObbwS+YSsLiO9FGpNL l+n2QCLYxF8oTN9WBP3Hys1M3XmMxQyny/hbm/fLf6viL0x60AplABnRqMlneaQQzkXh jhUt54V+/kF5Ze/LXKtb5BmVz2Q7HNCseikhCIf4iXgJ9Tr1apUTU9Flk+jQ9uTMMjkh MYiw== 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:mime-version:content-transfer-encoding; bh=ZMMJieexwPOIayp9duUYA4KhYnHf79vUc2RRS0fsbck=; b=XzIqWkhBaJr+KXoRkdKDD7IMmsiXxAnVz+hDpb32ESXT5/wZQcxnuRn+TrJP7+TAPm wUarzAPfwqd9qh1qZKrEwW9pno7ffN4ZVidtZijs/DF9zAKi+TvKFiXYyThqWDRgiXt/ +RD8v0yUjKzZZNfuzGQtRlGqGWzM/KOCh+O8GF5CuGJR+BSFO+HMHwHLMq/1Mwvw4gDe yQ1fYm2eyzxYy0LlWIsPtJbkc/rniXy2lEZWxZTejsN1pi9UmAnXP9brqqTG+Tnboonr x4sCObDvwYXBzKzbOxJ47G+IvhH0O/rU53QKPxT8CPYknAiO4OrcESWnBcrVr9Lno9+G 1+Eg== X-Gm-Message-State: APjAAAU2ApLe7sOxGaoYfZZYhCjH5UrKYaQtbEoPREdJJChC2ZGNJ1Yc pAsYYKoNNUsmmBiytau0uSK/XMcTnX4= X-Received: by 2002:a17:90b:24c:: with SMTP id fz12mr30381064pjb.51.1575225999274; Sun, 01 Dec 2019 10:46:39 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:38 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:19 -0800 Message-Id: <20191201184622.889513-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 6/9] tslib: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...ld-on-32bit-arches-with-64bit-time_t.patch | 389 ++++++++++++++++++ meta-oe/recipes-graphics/tslib/tslib_1.21.bb | 1 + 2 files changed, 390 insertions(+) create mode 100644 meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..59bd97a0f2 --- /dev/null +++ b/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,389 @@ +From 5455055660700be18eb8800e56e2423031ed4c76 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 19:59:29 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://github.com/libts/tslib/pull/162] + +Signed-off-by: Khem Raj +--- + plugins/input-raw.c | 59 +++++++++++++++++++++++++++------------- + tools/ts_uinput.c | 66 ++++++++++++++++++++++++++++++--------------- + 2 files changed, 85 insertions(+), 40 deletions(-) + +diff --git a/plugins/input-raw.c b/plugins/input-raw.c +index 64f0156..f030836 100644 +--- a/plugins/input-raw.c ++++ b/plugins/input-raw.c +@@ -40,6 +40,11 @@ + # include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #ifndef EV_SYN /* 2.4 kernel headers */ + # define EV_SYN 0x00 + #endif +@@ -384,7 +389,8 @@ static int ts_input_read(struct tslib_module_info *inf, + samp->y = i->current_y; + samp->pressure = i->current_p; + } +- samp->tv = ev.time; ++ samp->tv.tv_sec = ev.input_event_sec; ++ samp->tv.tv_usec = ev.input_event_usec; + #ifdef DEBUG + fprintf(stderr, + "RAW---------------------> %d %d %d %ld.%ld\n", +@@ -519,7 +525,8 @@ static int ts_input_read(struct tslib_module_info *inf, + samp->pressure = i->current_p = ev.value; + break; + } +- samp->tv = ev.time; ++ samp->tv.tv_sec = ev.input_event_sec; ++ samp->tv.tv_usec = ev.input_event_usec; + #ifdef DEBUG + fprintf(stderr, + "RAW---------------------------> %d %d %d\n", +@@ -536,7 +543,8 @@ static int ts_input_read(struct tslib_module_info *inf, + samp->x = 0; + samp->y = 0; + samp->pressure = 0; +- samp->tv = ev.time; ++ samp->tv.tv_sec = ev.input_event_sec; ++ samp->tv.tv_usec = ev.input_event_usec; + samp++; + total++; + } +@@ -651,7 +659,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + switch (i->ev[it].code) { + case BTN_TOUCH: + i->buf[total][i->slot].pen_down = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + if (i->ev[it].value == 0) + pen_up = 1; +@@ -751,7 +760,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + // fall through + case ABS_MT_POSITION_X: + i->buf[total][i->slot].x = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_Y: +@@ -760,7 +770,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + // fall through + case ABS_MT_POSITION_Y: + i->buf[total][i->slot].y = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_PRESSURE: +@@ -769,12 +780,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + // fall through + case ABS_MT_PRESSURE: + i->buf[total][i->slot].pressure = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TOOL_X: + i->buf[total][i->slot].tool_x = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + /* for future use + * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; +@@ -782,7 +795,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_TOOL_Y: + i->buf[total][i->slot].tool_y = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + /* for future use + * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; +@@ -790,7 +804,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_TOOL_TYPE: + i->buf[total][i->slot].tool_type = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + /* for future use + * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; +@@ -798,12 +813,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_ORIENTATION: + i->buf[total][i->slot].orientation = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_DISTANCE: + i->buf[total][i->slot].distance = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + + if (i->special_device == EGALAX_VERSION_210) { +@@ -816,34 +833,40 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_BLOB_ID: + i->buf[total][i->slot].blob_id = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TOUCH_MAJOR: + i->buf[total][i->slot].touch_major = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + if (i->ev[it].value == 0) + i->buf[total][i->slot].pressure = 0; + break; + case ABS_MT_WIDTH_MAJOR: + i->buf[total][i->slot].width_major = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TOUCH_MINOR: + i->buf[total][i->slot].touch_minor = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_WIDTH_MINOR: + i->buf[total][i->slot].width_minor = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TRACKING_ID: + i->buf[total][i->slot].tracking_id = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + if (i->ev[it].value == -1) + i->buf[total][i->slot].pressure = 0; +diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c +index 6ca4c3d..1832a07 100644 +--- a/tools/ts_uinput.c ++++ b/tools/ts_uinput.c +@@ -170,14 +170,16 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + continue; + + if (s[j][i].pen_down == 1) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_KEY; + data->ev[c].code = BTN_TOUCH; + data->ev[c].value = s[j][i].pen_down; + c++; + } + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_SLOT; + data->ev[c].value = s[j][i].slot; +@@ -190,111 +192,129 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + * we should use slot 1 and so on. + */ + if (i == 0) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_X; + data->ev[c].value = s[j][i].x; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_Y; + data->ev[c].value = s[j][i].y; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_PRESSURE; + data->ev[c].value = s[j][i].pressure; + c++; + } + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_POSITION_X; + data->ev[c].value = s[j][i].x; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_POSITION_Y; + data->ev[c].value = s[j][i].y; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_PRESSURE; + data->ev[c].value = s[j][i].pressure; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOUCH_MAJOR; + data->ev[c].value = s[j][i].touch_major; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_WIDTH_MAJOR; + data->ev[c].value = s[j][i].width_major; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOUCH_MINOR; + data->ev[c].value = s[j][i].touch_minor; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_WIDTH_MINOR; + data->ev[c].value = s[j][i].width_minor; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOOL_TYPE; + data->ev[c].value = s[j][i].tool_type; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOOL_X; + data->ev[c].value = s[j][i].tool_x; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOOL_Y; + data->ev[c].value = s[j][i].tool_y; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_ORIENTATION; + data->ev[c].value = s[j][i].orientation; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_DISTANCE; + data->ev[c].value = s[j][i].distance; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_BLOB_ID; + data->ev[c].value = s[j][i].blob_id; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TRACKING_ID; + data->ev[c].value = s[j][i].tracking_id; + c++; + + if (data->mt_type_a == 1) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_SYN; + data->ev[c].code = SYN_MT_REPORT; + data->ev[c].value = 0; +@@ -302,7 +322,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + } + + if (s[j][i].pen_down == 0) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_KEY; + data->ev[c].code = BTN_TOUCH; + data->ev[c].value = s[j][i].pen_down; +@@ -312,7 +333,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + } + + if (c > 0) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_SYN; + data->ev[c].code = SYN_REPORT; + data->ev[c].value = 0; +-- +2.24.0 + diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.21.bb b/meta-oe/recipes-graphics/tslib/tslib_1.21.bb index 2bc40d9391..bb28ee410c 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.21.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.21.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "\ " SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://ts.conf \ file://tslib.sh \ " From patchwork Sun Dec 1 18:46:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180548 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4276006ile; Sun, 1 Dec 2019 10:48:03 -0800 (PST) X-Google-Smtp-Source: APXvYqx6rnr0yn4N+dRQAQvEZ9WSMP6d1NdkNvwD/U6JxAjZJpHUaC8uVyr1xsTSLm+HZalAvdv2 X-Received: by 2002:a17:90a:ca12:: with SMTP id x18mr19965361pjt.66.1575226083614; Sun, 01 Dec 2019 10:48:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226083; cv=none; d=google.com; s=arc-20160816; b=Ai6CufdqMStGK6VMlshgshgzdjvDbAnvA2dQmW5A2ibK3+auki0MCAawGCGsyH5d+r 6RT4+wF5lZTuh7MK40XnMdCugg+MALceRp2IxhwEP/ffLYibrJgn8+ubDZXH6cvGeiAj LlfsopQvmVvazx0SjYcjEpVV2oAZwan07FTlV/fJmqWuWK2aG33bLBrb2frhbI82I8wN biOY05lTYdaKXH+6Rpm+KZ3UqUYrqabsdQYvzWr36VqBvuin2kvVcM1L57SMju6+H1/m n2uZie38bkb02iKTbtX4jXyT2dPAmIYC/s0+p3KiuGcDV11dcvqkqL14sRIdMj9esyRc d7kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=M0PDCGPIJ6/TU1W9fZMu1r/Cvyx0YGIxxOKrhD3+OYk=; b=QvEyUGk+vLm5Qfk553LkcJj55r/ZoknBbT6nE1xRnONlyHjBzFpoKU+57HCxN//l7x aEcgWbftIbIiYpJ3c87z8ATyc4VhQ6us+DAsXOPRE8qsa21cZ09I/Cp7kajXnLtZz4Xe CqUjYhB8MMji2N1Vna6sm07jO2kSckzUxaNpVZIoJCgB2+ynRNmTM+nzUknToPLulTln 0KXmSxMLU3aelZzkWWynSyzKnpqEX8DdnDba8qBSMMYd4ndUHgxyoIScQsKD5iboYw29 HRCwaeuT7nFcMCs6z9yk3al/NB3IAqQXDWJ+B5OIDWIuM9o8w/LEaRp2okBANkykZWqL 223w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oB33C037; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 a200si9174192pfa.282.2019.12.01.10.48.03; Sun, 01 Dec 2019 10:48:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=oB33C037; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6926D7F7AA; Sun, 1 Dec 2019 18:47:32 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by mail.openembedded.org (Postfix) with ESMTP id 728107F523 for ; Sun, 1 Dec 2019 18:46:39 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id b19so17349437pfd.3 for ; Sun, 01 Dec 2019 10:46:40 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=s1wGg1ABmVHYUJYOMvx7z7SgxEsWstciWRaAOmdlEgE=; b=oB33C037H2Q+pGBrST6zf2/L4zFHx/3z7NEy9Il7tdy3wb3kN2dzUBLnu/WavXLaJf e77x6/0nw+38VDHLjFcE7WUJCDx7CtoGZU82R9J5PnFJSeS0tHYW83EUd81SyQbWfOLc J2X8pM92KxyDwSFWT92wB5eEa6lqdfFAw4uYqmLXMflJqMDw/B5tvAc/u3JP2oxjgAkL deqBiLdAvR6gxoDkO6r83y/BpYuzOO4fETzFYzrtVWk/uBPVaPPWpmBi4aj3EJfWB3kx mY15a1Qn3cAgOMqPboD92phnZ+jfi5UzmTWmng9Nh7XSfJVq1ISK2kPuN+UTeVbdOPlp i2mA== 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:mime-version:content-transfer-encoding; bh=s1wGg1ABmVHYUJYOMvx7z7SgxEsWstciWRaAOmdlEgE=; b=mL9BfgACB9tiYMFe/n2dV7uz1RkskMhxAYumVS0McfQyodfh5aTNra5l8osKpGJG3x TC4essjMYIwgN8cl5n+C/F6RLS+/pwfntDj+pyv38Y4fgFXxaAk8iiZykv2V1fntAre2 TwaTPJEIFnfUKPl5vH2AnUxqO/0kPA5TezboRI7Qh7Q94AbnG3dDsZKE65GlEwUFO8/U 6dDx8WO1+YAl5aKAqAOp+9+cvGRuq08TKUE1O2/CRrWAwDEw6+b3lBUXHWw48aj1faL7 lY+2BDfSYFxxZGjvRr4e/0X7CD4v9/8qQpp+LjQofjA0J+ME0GvRaXuYdhut2AuLvZcB CV/g== X-Gm-Message-State: APjAAAUUWEDAhx67PC6rHMrCytGrJ+rknpKHAthc392oRK9MFGWFGubl yzEKgi9j+M7RBHQPjAS/IK6gPmXD8ig= X-Received: by 2002:a63:d406:: with SMTP id a6mr7607365pgh.264.1575226000010; Sun, 01 Dec 2019 10:46:40 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:39 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:20 -0800 Message-Id: <20191201184622.889513-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 7/9] utouch-evemu, utouch-frame: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Move patches from files/ directory into PN folders to avoid conflicts Signed-off-by: Khem Raj --- ...ld-on-32bit-arches-with-64bit-time_t.patch | 76 +++++++++++++++++++ .../utouch/utouch-evemu_git.bb | 4 +- ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++++++++ ...tat.h-for-fixing-build-issue-on-musl.patch | 0 .../remove-man-page-creation.patch | 0 .../utouch/utouch-frame_git.bb | 1 + 6 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch create mode 100644 meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch rename meta-oe/recipes-support/utouch/{files => utouch-frame}/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch (100%) rename meta-oe/recipes-support/utouch/{files => utouch-frame}/remove-man-page-creation.patch (100%) -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..71bf572699 --- /dev/null +++ b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,76 @@ +From 60987a1df8eb8c9196222375574dcd7bc0ad2daa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 20:23:27 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/evemu-impl.h | 5 +++++ + src/evemu.c | 16 +++++++++------- + 2 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/src/evemu-impl.h b/src/evemu-impl.h +index acf2976..c08d861 100644 +--- a/src/evemu-impl.h ++++ b/src/evemu-impl.h +@@ -21,6 +21,11 @@ + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define EVPLAY_NBITS KEY_CNT + #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) + +diff --git a/src/evemu.c b/src/evemu.c +index 21187af..160c915 100644 +--- a/src/evemu.c ++++ b/src/evemu.c +@@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp) + int evemu_write_event(FILE *fp, const struct input_event *ev) + { + return fprintf(fp, "E: %lu.%06u %04x %04x %d\n", +- ev->time.tv_sec, (unsigned)ev->time.tv_usec, ++ ev->input_event_sec, (unsigned)ev->input_event_usec, + ev->type, ev->code, ev->value); + } + +@@ -391,8 +391,8 @@ int evemu_read_event(FILE *fp, struct input_event *ev) + int value; + int ret = fscanf(fp, "E: %lu.%06u %04x %04x %d\n", + &sec, &usec, &type, &code, &value); +- ev->time.tv_sec = sec; +- ev->time.tv_usec = usec; ++ ev->input_event_sec = sec; ++ ev->input_event_usec = usec; + ev->type = type; + ev->code = code; + ev->value = value; +@@ -411,12 +411,14 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + + if (evtime) { + if (!evtime->tv_sec) +- *evtime = ev->time; +- usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec); +- usec += ev->time.tv_usec - evtime->tv_usec; ++ evtime->tv_sec = ev->input_event_sec; ++ evtime->tv_usec = ev->input_event_usec; ++ usec = 1000000L * (ev->input_event_sec - evtime->tv_sec); ++ usec += ev->input_event_usec - evtime->tv_usec; + if (usec > 500) { + usleep(usec); +- *evtime = ev->time; ++ evtime->tv_sec = ev->input_event_sec; ++ evtime->tv_usec = ev->input_event_usec; + } + } + diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index 1dd5a86d50..41d1cbfd97 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" inherit autotools -SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http" +SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" PV = "1.0.5+git${SRCPV}" diff --git a/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..d405d43f14 --- /dev/null +++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From 895b6996e232700fb2a428838feaef418cc64b70 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 22:52:13 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/frame-mtdev.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/frame-mtdev.c b/src/frame-mtdev.c +index c0f15d8..42ad380 100644 +--- a/src/frame-mtdev.c ++++ b/src/frame-mtdev.c +@@ -25,6 +25,11 @@ + #include + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + static int is_pointer(const struct evemu_device *dev) + { + return evemu_has_event(dev, EV_REL, REL_X) || +@@ -200,7 +205,7 @@ static int handle_abs_event(utouch_frame_handle fh, + static utouch_frame_time_t get_evtime_ms(const struct input_event *syn) + { + static const utouch_frame_time_t ms = 1000; +- return syn->time.tv_usec / ms + syn->time.tv_sec * ms; ++ return syn->input_event_usec / ms + syn->input_event_sec * ms; + } + + const struct utouch_frame * diff --git a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch similarity index 100% rename from meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch rename to meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch diff --git a/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch b/meta-oe/recipes-support/utouch/utouch-frame/remove-man-page-creation.patch similarity index 100% rename from meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch rename to meta-oe/recipes-support/utouch/utouch-frame/remove-man-page-creation.patch diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 39d46af8e9..1ebebfa9f5 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -12,6 +12,7 @@ inherit autotools pkgconfig SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ file://remove-man-page-creation.patch \ file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" From patchwork Sun Dec 1 18:46:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180549 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4276079ile; Sun, 1 Dec 2019 10:48:11 -0800 (PST) X-Google-Smtp-Source: APXvYqycjnb+j3rNsV3G+n+qywvD5EBYVYDGdf38OlXY7z5nlkvFTGsUEiDW2h0pPZLUp8yMCIZS X-Received: by 2002:a62:3343:: with SMTP id z64mr14881327pfz.150.1575226090981; Sun, 01 Dec 2019 10:48:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226090; cv=none; d=google.com; s=arc-20160816; b=m2RWT8rse4mbhFmQys/lC/7oH2IEO7HhHjQ1NdoOmTPE6I5+evx/aqcgTbegoNUKk8 q2FF0eebGmt55ZnT3ueo97ryoG3SaBvgyoHnBqeRwYzyYKa+Q0YeFPXpPqrO7iz+sfeL VFunPaqpxoeSFq+Fyxnt4oWDV+bycJgDSYXt0O7L+nnSdjtOisuag1d1prfaGlX7kQYc Xn9W9Vzsp7/Sq3vz2yk25erjPT4Kesl0AEbxkt+X2DwjP48wgc7/ztIu/0k4khhT36ar kUq+kN9zC32PDb7CfmQ0VY2MR+LjSLIeCBnD9/AB+FqHsOBSgPLMHkWbfUHwnSDYr1hB UK2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=7CU9HUdlxBxXl2AVfaHStptlCivOs/qh4b7ZjuveVGc=; b=HWbqpHCu7PgNo6RUKML2++mYleFsDmjk2SBjpq+4K7+p2u/py7ROCCtvH4C8Lv7pJ9 wOEIs02MWWsOa9/uiYmQluLUNxQjNgjK3QN41c07QGegEbQ5Zclo9i4TbE6M4+ffXBxW bCkq9keI+jNiw2A/kSLjyc6vC3OzAoA2XILDejjxvt0hT5Mg4IuRYlCCwViN5uvSOgTo E9n+VOl9ZV4CXo1FvnHVWijoAPO7Vi6C630RUaLgCOj3CQnf98aOv+RT/3k4cat72w5n vSKYYb9kw+SELBDOQdhNT6qQcw/0YNGYI9tDBlLzE4nmljj3pYdp8aD0c8p7HO5A+giS jKCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EKKvvKCD; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 o191si10280421pfg.151.2019.12.01.10.48.10; Sun, 01 Dec 2019 10:48:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=EKKvvKCD; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8BF7D7F7AF; Sun, 1 Dec 2019 18:47:33 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id 9FB547F57B for ; Sun, 1 Dec 2019 18:46:40 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id j12so15221481plt.9 for ; Sun, 01 Dec 2019 10:46:42 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=8M+EWRZegpJRFAZsRz87fEgbHc9sIlJGj4IsRZHrkzg=; b=EKKvvKCDgwUroYHrnU9WNtB6jvc4oUdcyysi0tKChBndrI43x3a+gAPQZhkzJihyzw kAU8dzNIkfceI//H/uyKU00ePTjJ9tNnk+7bIXljA7cY5SMlKJ0vU/uDrX7ht3XxpATg UlL6m/j/ZoPRBQx/fZrvs67VHj/HEJhx5CEQiyArOIwCveqWXjIy1/HzKvdUZTJNnerd 8aFDdoY1DLbIvvC8El0kPq4saP3pBI5JgjEiS14marZjcIXwP8HJuwIkWaifPW1oE7Zi 2O4qXXQR/mW4X1T+M7UYTs5ZQQ9a1secMIiqcrmndBz9bmvhkFCAb6CowZwfpHP5LHzA riLw== 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:mime-version:content-transfer-encoding; bh=8M+EWRZegpJRFAZsRz87fEgbHc9sIlJGj4IsRZHrkzg=; b=HPfHqQYlyVksb8gjtyadJz6az5fAs50LQ4MB5kwTuZRpWUHNm1Pk9R/pVuHUld/1V1 k+xIaQygpss6WW/a9aU/DNLiUn0LEWx85crl4HE/TbwGCSpEMSaNzBwwZ1s/cLupsRp6 BMspFaOmdkeXZUXaPBjLiXqFd2l9yJEpMSwa8KTJYBFTTgFU6mFA9v/tZ9KFpta5B1Kw jn994duQ3XorCxBzMndmMj2XdSlsGPdSSBpOkPy/QJ9cw00SdF0Hc2GtIgqdRBtZzbHX 2HeKrqXaebtRLIJanyVW2iYkRqt/1cqAULA+29OqBcMvL0YoikOdb50u/TGnWX6BQzp3 DzRA== X-Gm-Message-State: APjAAAVqUzwlnALQnMvgtpN+4ZUIx3wFGu4wrfN6jo4dZVe3S1HIMh3R 5s2nlaZOyKIje+ooW9kTQ1ibL3qdk4g= X-Received: by 2002:a17:90a:c795:: with SMTP id gn21mr2160409pjb.95.1575226001142; Sun, 01 Dec 2019 10:46:41 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:40 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:21 -0800 Message-Id: <20191201184622.889513-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 8/9] directfb: Fix build for 32bit arches with 64bit time_t X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../recipes-graphics/directfb/directfb.inc | 3 +- ...ld-on-32bit-arches-with-64bit-time_t.patch | 139 ++++++++++++++++++ 2 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 96aa31117f..65fd89e6fe 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc @@ -21,7 +21,8 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://use-PTHREAD_MUTEX_RECURSIVE.patch \ file://fix-client-gfx_state-initialisation.patch \ file://fix-tslib-version-check.patch \ - " + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..2f766465e1 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,139 @@ +From 0b66557f2e924023b12006b58d8e86149c745aed Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 20:34:33 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + inputdrivers/linux_input/linux_input.c | 36 ++++++++++++++++++-------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c +index 7e9a6ad..03deebc 100644 +--- a/inputdrivers/linux_input/linux_input.c ++++ b/inputdrivers/linux_input/linux_input.c +@@ -42,6 +42,11 @@ typedef unsigned long kernel_ulong_t; + + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #ifndef KEY_OK + /* Linux kernel 2.5.42+ defines additional keys in linux/input.h */ + #include "input_fake.h" +@@ -754,7 +759,8 @@ translate_event( const LinuxInputData *data, + DFBInputEvent *devt ) + { + devt->flags = DIEF_TIMESTAMP; +- devt->timestamp = levt->time; ++ devt->timestamp.tv_sec = levt->input_event_sec; ++ devt->timestamp.tv_usec = levt->input_event_usec; + + switch (levt->type) { + case EV_KEY: +@@ -2139,7 +2145,8 @@ touchpad_translate( struct touchpad_fsm_state *state, + int abs, rel; + + devt->flags = DIEF_TIMESTAMP | (dfb_config->linux_input_touch_abs ? DIEF_AXISABS : DIEF_AXISREL); +- devt->timestamp = levt->time; ++ devt->timestamp.tv_sec = levt->input_event_sec; ++ devt->timestamp.tv_usec = levt->input_event_usec; + devt->type = DIET_AXISMOTION; + + switch (levt->code) { +@@ -2204,7 +2211,7 @@ touchpad_fsm( struct touchpad_fsm_state *state, + DFBInputEvent *devt ) + { + struct timeval timeout = { 0, 125000 }; +- ++ struct timeval tval; + /* select() timeout? */ + if (!levt) { + /* Check if button release is due. */ +@@ -2223,6 +2230,8 @@ touchpad_fsm( struct touchpad_fsm_state *state, + return 0; + } + ++ tval.tv_sec = levt->input_event_sec; ++ tval.tv_usec = levt->input_event_usec; + /* More or less ignore these events for now */ + if ((levt->type == EV_SYN && levt->code == SYN_REPORT) || + (levt->type == EV_ABS && levt->code == ABS_PRESSURE) || +@@ -2233,7 +2242,7 @@ touchpad_fsm( struct touchpad_fsm_state *state, + + /* Check if button release is due. */ + if (state->fsm_state == TOUCHPAD_FSM_DRAG_START && +- timeout_passed( &state->timeout, &levt->time )) { ++ timeout_passed( &state->timeout, &tval )) { + devt->flags = DIEF_TIMESTAMP; + devt->timestamp = state->timeout; /* timeout of levt->time? */ + devt->type = DIET_BUTTONRELEASE; +@@ -2255,7 +2264,8 @@ touchpad_fsm( struct touchpad_fsm_state *state, + case TOUCHPAD_FSM_START: + if (touchpad_finger_landing( levt )) { + state->fsm_state = TOUCHPAD_FSM_MAIN; +- state->timeout = levt->time; ++ state->timeout.tv_sec = levt->input_event_sec; ++ state->timeout.tv_usec = levt->input_event_usec; + timeout_add( &state->timeout, &timeout ); + } + return 0; +@@ -2268,15 +2278,17 @@ touchpad_fsm( struct touchpad_fsm_state *state, + } + } + else if (touchpad_finger_leaving( levt )) { +- if (!timeout_passed( &state->timeout, &levt->time )) { ++ if (!timeout_passed( &state->timeout, &tval )) { + devt->flags = DIEF_TIMESTAMP; +- devt->timestamp = levt->time; ++ devt->timestamp.tv_sec = levt->input_event_sec; ++ devt->timestamp.tv_usec = levt->input_event_usec; + devt->type = DIET_BUTTONPRESS; + devt->button = DIBI_FIRST; + + touchpad_fsm_init( state ); + state->fsm_state = TOUCHPAD_FSM_DRAG_START; +- state->timeout = levt->time; ++ state->timeout.tv_sec = levt->input_event_sec; ++ state->timeout.tv_usec = levt->input_event_usec; + timeout_add( &state->timeout, &timeout ); + return 1; + } +@@ -2287,7 +2299,7 @@ touchpad_fsm( struct touchpad_fsm_state *state, + return 0; + + case TOUCHPAD_FSM_DRAG_START: +- if (timeout_passed( &state->timeout, &levt->time )){ ++ if (timeout_passed( &state->timeout, &tval )){ + devt->flags = DIEF_TIMESTAMP; + devt->timestamp = state->timeout; /* timeout of levt->time? */ + devt->type = DIET_BUTTONRELEASE; +@@ -2299,7 +2311,8 @@ touchpad_fsm( struct touchpad_fsm_state *state, + else { + if (touchpad_finger_landing( levt )) { + state->fsm_state = TOUCHPAD_FSM_DRAG_MAIN; +- state->timeout = levt->time; ++ state->timeout.tv_sec = levt->input_event_sec; ++ state->timeout.tv_usec = levt->input_event_usec; + timeout_add( &state->timeout, &timeout ); + } + } +@@ -2314,7 +2327,8 @@ touchpad_fsm( struct touchpad_fsm_state *state, + } + else if (touchpad_finger_leaving( levt )) { + devt->flags = DIEF_TIMESTAMP; +- devt->timestamp = levt->time; ++ devt->timestamp.tv_sec = levt->input_event_sec; ++ devt->timestamp.tv_usec = levt->input_event_usec; + devt->type = DIET_BUTTONRELEASE; + devt->button = DIBI_FIRST; + From patchwork Sun Dec 1 18:46:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180550 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4276142ile; Sun, 1 Dec 2019 10:48:18 -0800 (PST) X-Google-Smtp-Source: APXvYqw31vOQj6GRu5xcPvz5qQFsSBx94tBRCnaRiwgMe+whzJXJGr1AhhjOaGX+8YfL9Uovy8W6 X-Received: by 2002:a17:902:7c04:: with SMTP id x4mr24065709pll.0.1575226097910; Sun, 01 Dec 2019 10:48:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575226097; cv=none; d=google.com; s=arc-20160816; b=u42tiMCtyDEbAus5xbngvzwhT6VL+mW757lmT6QTFENwayotAXvPeQ7cX0c1v2I9Ec 8s/mp4HUhXBHJ+/cGzH4DoJyIcArbm6ny9g81oe5mg/sZfVGlU4l06MuD4+v+ncNsgeo QJ3q/vuIZebdso36LAV0kj8eeeOsqnjf4JeUjlRYAmVUClGc5iox2VyaAW+Xbx3hQnSH uhVj1nY9T7m3OFWakwydozmIjO6GXBUDbw6bxcz1J9BZi1cRhITR0qLPnFhRwsN+fXJ1 xhRpbaZ2GPkzypvDY6CBHzaVem5ixv3nUp9Jsv/Gqmi/0bdeXtQ2pi2J8y7hOVfVSzzz +hGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=4l8qhT2Z611ahN6VBV0Ja9puXP+u5jBukacTqUrWeEs=; b=fHY90vKF61Thst8Xk6qIYA5n/y/wzB0o2RWUMdtcm3KtnCuQyns89+ecRNLP/ZaUPP QV0RLA/zanrCoJNpZiyFB1hwlmhLNeS9ytEkS13K7/kG6Kv8vd/pA8AsfacGG2YcaDwR wtyY48ILk6Xg2rbfrCt4HqeZSS9Qif+aYnD9C/kGQnvGGR0tPvcnYU3piTVN+kT+vic3 W7sl4lxUzEm9KQbbn10uH4ACziYrYlmT0FIOt2pXajlssxdBQprWZn1OoQooP3MX0l1O RPGiTojM8CueMWBkenniOuVVm5DYVbR4Bzqf+IaTyFJUlBOwD0yYNstgPzgHwwfUxMbn bEUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bZ3csSV5; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 k8si26830437pgq.106.2019.12.01.10.48.17; Sun, 01 Dec 2019 10:48:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=bZ3csSV5; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AF45D7F7B5; Sun, 1 Dec 2019 18:47:34 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id 45AAF7F639 for ; Sun, 1 Dec 2019 18:46:41 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id x28so17331575pfo.6 for ; Sun, 01 Dec 2019 10:46:42 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Xhnt0gjN0sjV233pr7ktRMq44SGsJM/7/Um+k0Lp5tM=; b=bZ3csSV5XS9u7fnHPXDolesO3J+qCXbcY5UMZ28tFs9lg4AxRkH0SwXg2Ybi5Opvn+ YphhGXYqwNhLoBuK+psCY7006aaAI+axE2qvbXlBVBiZ3I7O/uqjiCpZSUvugmDzydud +9++cBr8bEQzjhJMDizNG4n2miuYMajGQvLCr8KTi5DqKAeE074LvgCO8a4p7hR/vGCA 1pXm0X1TPBcI4KR4Krzfha4BpogGaV3DZ/uTLY1GdKXh8aQeMTMKdEM84f6iOIftM05u JtuTbl1dpElMN1/1deo+QwOQangBxxkEWDD1YkrO0uw88XRLjYCpeAr9goPz1DyLVmGD 9+Wg== 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:mime-version:content-transfer-encoding; bh=Xhnt0gjN0sjV233pr7ktRMq44SGsJM/7/Um+k0Lp5tM=; b=Frh2kLhAaaSua3zaZ3wstWJk6TFwmVzTRPXcMeh5JgWlF0gT+TX4kGzYm8w0+rNS2M 2ydzkk4mn+HL7aZ5PAGXlmiQM+G/mStcv4uZGaN1Clx/q/OiP8HtVVauZu5ETWCGHP4u rBQw/GCfGihJeAyJZuYHXLjPvhtapLyRrEPcE1m7zzYgP0ICqTvGnW1HYlyVhW+Lyq9s YRQshntwPXcWMx7T4J6dd0p2AMecvGecymnlc4OKTUowRChQ2CPGkt1aX/7S5wRdnLUk IconGY+yo9tNOmhxf6yWj/+uVgzFxdBIkFbBOsIbZGIFO0sCr7khMOmruOa12Gg+FEwL ZFRA== X-Gm-Message-State: APjAAAV2HOqO16MbMVdo8RURCf7l2YfK94i/51igo+5AYzTQGHS+7xkH S8SWgYRO/XQjre3ZvRSVNhvi7Dmq+Io= X-Received: by 2002:a63:fb05:: with SMTP id o5mr3361959pgh.355.1575226001907; Sun, 01 Dec 2019 10:46:41 -0800 (PST) Received: from apollo.localdomain ([2601:646:8500:1c20:55f2:e19b:8d5e:a884]) by smtp.gmail.com with ESMTPSA id y24sm33916800pfr.116.2019.12.01.10.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 10:46:41 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 1 Dec 2019 10:46:22 -0800 Message-Id: <20191201184622.889513-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191201184622.889513-1-raj.khem@gmail.com> References: <20191201184622.889513-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 9/9] kernel-module-emlog: Use compile task from module bbclass X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org This ensures that right CC/LD is used when building the module, which should be KERNEL_CC and KERNEL_LD, otherwise it starts to use DISTRO default ld and cc which could be non-gcc and non-bfd liker which is must for building kernel and modules Also hides a gold linker failure seen on aarch64 | aarch64-yoe-linux-musl-ld: internal error in set_address, at ../../gold/output.h:322 Signed-off-by: Khem Raj Cc: Fabio Berton --- meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb b/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb index 51f7226ebd..a554a4c947 100644 --- a/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb +++ b/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb @@ -7,6 +7,4 @@ EXTRA_OEMAKE += " \ KVER=${KERNEL_VERSION} \ " -do_compile() { - oe_runmake modules -} +MAKE_TARGETS = "modules"