From patchwork Sun Dec 23 21:35:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154454 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3270630ljp; Sun, 23 Dec 2018 13:37:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN5KnLNxHR20J0mo4k80c2n9FULufB/TYlARzlp4HrSs6uYtbllXnzBBTSdZ6KNhiaaS02V8 X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr11064690plp.180.1545601051361; Sun, 23 Dec 2018 13:37:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545601051; cv=none; d=google.com; s=arc-20160816; b=AUTRjxvJsKqvhyiB8JdKwOFJ7BIHAAAAAriPvOHD5qKwacUesmB1cNHEnTRVay+5fr MtsxlKRXuNR1Llr7pYoSLoArMZprnou2KgI91pznc+RCWwtqgEiutC3RJPXqXfQPm6kL XDd/HiGqmFVtpWL5WeHjUSkZpYsKLIRSAQ8QdnTH1wZ4qUkORWuuGe1jDpzrxovQq6lB y9w3UCWHxmLa4M3kdEf78Uuzh2O417rkGtqC6//AnHltoRTSjQUB6/6/Nb4Z8+tNEuFr zbhvPaB72ZvivD5QixJqfEMd5Lr2eVoqX4a60UyOKA/8XuBBxVVMsg+0gsv39fEQlm0y Bymw== 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=jZz2q573nsxxGwKkLX65M0a5AdHuuNpWd8+Vts1y48Q=; b=VlreF9kRIZftcWebcfkGbtjNX9vi3iFuiBpZsXBHFkgevXnmuYwU06+uuEEd14z6aZ kKFHyFgSyDX+Gan5ld3FdrhiUpge2iOaf9GzIltV4udOiE+g0D+sOAe0PysLOflGO7Ff 88/LbBNOJGsw/zVPQI/YDH/hij82hx/nvGv6eC+8H2TEbMEo6b8T67MCI8gpgg63Pw+0 q28UX/2fdz9UQHwEqPV/X9ke2fcvc6O/km0UO984UF8vz7RXOSI6cD6031khyCeGpY8m JJ5ZL3yKUIe9cKEyYBWSlH6BVoK0Ukdi6yLlrodm/uxbO4mCG8mDqX5ehQm+HgLnuSI6 +34w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Y2xMU8Ic; 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 x12si25577221plo.164.2018.12.23.13.37.31; Sun, 23 Dec 2018 13:37:31 -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=Y2xMU8Ic; 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 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7AFD779C7B; Sun, 23 Dec 2018 21:36:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mail.openembedded.org (Postfix) with ESMTP id 22B7F6C50E for ; Sun, 23 Dec 2018 21:36:17 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id z11so4878324pgu.0 for ; Sun, 23 Dec 2018 13:36:19 -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=kp5bbIJlv929F6wqlj5k+DJ9plAmMmj2TPbXrjWTRmU=; b=Y2xMU8Ic89o+vDtFupp7Xzcve4Vhr82cnyBz7Mt6bX7vi1w7qe78osEaA51kFtxWwf VnBognThr33klWSJnwbBcUtD+OClIP+ZL38KWSgcR2pT2ojXqDNyxJgUYxTH6DHishf4 6a1Fq2Zx+ql76QwyX8CUGDJlghVZHitkaMMeHfeG+i1gyBTU/4lXoXc5Kmk8DAumAllE ozNCTvQ6QTkYG74f/FcBreyBeDy7vBbF9wslff/rdKp3xN8plNK0VWFz8ethGCSCDmuz GfRrpRzBkBiq9zhmozNa15+q56WoSWNeQQW4PaGvOGOLssmvpKSb+FIEK+gAMXD7EWBm kAqw== 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=kp5bbIJlv929F6wqlj5k+DJ9plAmMmj2TPbXrjWTRmU=; b=tQBtgPggkeWe84XhE1/lGTbDfdDjjNYqGsCn9yWVhhG8K/yQDzevDMqNopaHRYNTX5 BV980G7R6W9iHXWAsj4O59zG5hk6HRgIj22i9g8zeEoxp1kr5qfOO9L0CyeK2GFkMDqZ WVvForjU5mHxbGvanaxpNrMcIUfgwM4DrEULxE2qQrEktsKhyNkfonaoeggMHuOoh6GS qC+ozcMFS4XabYVykXCWLFc0QL3iqxvtxZuYJSEKL846R/MgjGB2YSyWswtn+iBaKQJc RwMwbx5sqmkw5kPV8FVUxbPCGEi21/Zo7zI9w+MhY/9fFSVit2joXxw3MenpC+w80rF7 x3qw== X-Gm-Message-State: AJcUukcOGGfkXEghFKi5LjPQZYigGH3S41F8KCiZcSdXrJeRJK/oVkgO cigJI8mdOnpsZ2usqBXZ00K8wy4SevI= X-Received: by 2002:a63:6a05:: with SMTP id f5mr10148262pgc.72.1545600978781; Sun, 23 Dec 2018 13:36:18 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m9sm33340800pgd.32.2018.12.23.13.36.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 13:36:18 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Dec 2018 13:35:49 -0800 Message-Id: <20181223213557.7834-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181223213557.7834-1-raj.khem@gmail.com> References: <20181223213557.7834-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 10/18] miniupnpd: Fix cross compile on OE 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 genconfig script can be specified OS specs if its not then it pokes at the build system via uname, we add code for OE support to ensure we pass DISTRO_VERSION as OS_VERSION Signed-off-by: Khem Raj --- ...-Add-OpenEmbedded-cross-compile-case.patch | 40 +++++++++++++++++++ .../miniupnpd/miniupnpd_2.1.20180706.bb | 8 +++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch new file mode 100644 index 0000000000..cd4291d91b --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch @@ -0,0 +1,40 @@ +From 54698856e5602bbd9d61e855814c854a013b4840 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Dec 2018 18:47:45 -0800 +Subject: [PATCH] Add OpenEmbedded cross compile case + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + genconfig.sh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/genconfig.sh b/genconfig.sh +index dc42462..59922e9 100755 +--- a/genconfig.sh ++++ b/genconfig.sh +@@ -98,6 +98,12 @@ if [ -f ../shared/tomato_version ]; then + OS_VERSION="Tomato $TOMATO_VER" + fi + ++# OpenEmbedded special case ++if [ -f ./os.openembedded ]; then ++ OS_NAME=OpenEmbedded ++ OS_VERSION=$(cat ./os.openembedded) ++fi ++ + ${RM} ${CONFIGFILE} + + echo "/* MiniUPnP Project" >> ${CONFIGFILE} +@@ -318,6 +324,11 @@ case $OS_NAME in + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} + FW=netfilter + ;; ++ OpenEmbedded) ++ OS_URL=http://www.openembedded.org/ ++ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} ++ FW=netfilter ++ ;; + AstLinux) + OS_URL=http://www.astlinux.org/ + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb index d5d9bcf64a..ff40daaac9 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20180706.bb @@ -12,12 +12,18 @@ inherit autotools gettext pkgconfig systemd DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \ - file://miniupnpd.service" + file://miniupnpd.service \ + file://0001-Add-OpenEmbedded-cross-compile-case.patch \ + " SRC_URI[md5sum] = "a84b3647c871802abeccfc2771e8db21" SRC_URI[sha256sum] = "fc2d2fd044d8c3f8d02b63d70489bb35ece836a4fc1b6386865ac8fbe8d8b006" IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" +do_configure_prepend() { + echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded +} + do_compile() { cd ${S} CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux