| Message ID | 1530785560-32417-1-git-send-email-sbabic@denx.de |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <swupdate+bncBCXPLOXJ6IKRBIO667MQKGQEBMPI6HY@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c09::237; helo=mail-wm0-x237.google.com; envelope-from=swupdate+bncbcxploxj6ikrbio667mqkgqebmpi6hy@googlegroups.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="VshKEdzd"; dkim-atps=neutral Received: from mail-wm0-x237.google.com (mail-wm0-x237.google.com [IPv6:2a00:1450:400c:c09::237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Ltw54ttTz9s3C for <incoming@patchwork.ozlabs.org>; Thu, 5 Jul 2018 20:12:52 +1000 (AEST) Received: by mail-wm0-x237.google.com with SMTP id 76-v6sf4092392wmw.3 for <incoming@patchwork.ozlabs.org>; Thu, 05 Jul 2018 03:12:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1530785570; cv=pass; d=google.com; s=arc-20160816; b=wIkAD1Klfj50NUASEKrjXI/mGmayFvlCIzXuReeoTxhesgQqZH6WPlmzkU2jMzQuqf 9p94hYZQsZVIUUk4C/R7x1WjQPNFJwVRV4oMEu7Xco8r79CscMZW/bsqHctxbpWu1wyk fQKa0SPmPWPvMzmekv9+ONDnojsqrDpmbpjMW+x/A6Ok/fS8E52yNOFIyWvDOoRGL7CQ wj7ajGInWcJo1a0QkPmEUYoeSrP792p6Nyw4oQ2bKkcdkHOHPMPPWO3h3ZSyEkQ3HY3R xpr1YYJ99qJ1Ajz7GskyMhwOvOdEVGDhuDxHxvmBWX+Gz6FlSZE3zfO9xNUt9L81msph Xoew== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=OtXuZtDq6BjyxXgd80Q3NtsADZfMg8SaLPcXw/6TEZQ=; b=JnZoT/ER0IDYhHX3ePh1As0XQGPxd86QkCvEtzKR9xVG9bIixATUvxn6Gp5qEcmS4X HvgowlG1BCxxWV5BCE4SWnzp+j/e+PbfQ19V58BXx4yet4Ojk5jZYMZ6iU3F/RFkI8Gh ggnTj3gSrlCaQ5r2BiXhSe6lUUdnMPWwr4hhJBEvYV4jSnYvGNBd8ZNy8Ja1BvBjmzn0 FcbulXc8FubH9+p2k/gpbKui1Nzc0u7pVdW6b9XGOoM0i6yCWj2d2NDwSvhG6jssc4Wg brkzhqDb36Aqjai0guk/rHqscyvWi6/OZIfnsLQTbJHKemddGv8iJvPc1UID/sHDcc2c bzYQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=OtXuZtDq6BjyxXgd80Q3NtsADZfMg8SaLPcXw/6TEZQ=; b=VshKEdzdHiGAvjkY+RC+/Z3dLaoH/eaF5lzUz08nnELoCreSNdgsd7leK81R+zpILh V3Z2q4HowrrnWKKxaTqoQSYNp4OhvENPty/rJ8yHDVXJCf3PZR0Ax6RepC+71VYW/PgI WqHwjPAF4114Sttjm6fTReEVaIROkdi5sMDhffQpB/O+6/sjdWP0yYK99PuMf4EQuoeH 4tqh+WhH822+S67D5d9RRc2eBecz6yUMGCeDBNF3KnfNCpqgqUgFHSZ6zr3GStIPmbWp Z6S/+54alsK0oyFvrT5K1oNiQV6j13fYNa5f6v9Sed3gm+B2faeBOdgUjPxDsBMkr18W L/Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=OtXuZtDq6BjyxXgd80Q3NtsADZfMg8SaLPcXw/6TEZQ=; b=Oagjz1yVMxYkxR8sQHfp4yomcvtPmdfqsCfEL/8C/X3/y1CScliJA6QFQDL/q86IPK R43KACc9Jw9ByOcpIt/93kWoWSFzYI8jNTI09JodU95XeksdzX9lobbMHbAjtGcGz4Lk A52RB4rWg0LCfH/mBwt8KPJtHDptGRziY0IY74YJC3JqSZ9HhhgNjKBaVDx97oBuRQRg p9m3zpldsF65rvplFSXWDpKdcRfmi1DJ1LmIa62LKOmqTwKIm1SlO9JGyGB1UIcFEwxC cNhyJr5545X/I7MBqKLdikluUjQcoL91qyz1VCEnXWdX8wM8QLpzrbY9EPzDBDW9JAZ/ UQEA== Sender: swupdate@googlegroups.com X-Gm-Message-State: APt69E3RMpTgJvQMiN4Cc3UDDEQdeiu/AHRWDC5Ipz4LJgeaoaSdjOHs 9on4ici4eiUABV6hRDXaC48= X-Google-Smtp-Source: AAOMgpdNvF8Zww3vIdz9+ofuKjnKreqI6vzZhIqlwNL7rtqaSKmAmUM+rsWX/TX1BChOxVG10NMXVQ== X-Received: by 2002:adf:eb8b:: with SMTP id t11-v6mr55346wrn.7.1530785570140; Thu, 05 Jul 2018 03:12:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:48cf:: with SMTP id p15-v6ls1169655wrs.4.gmail; Thu, 05 Jul 2018 03:12:49 -0700 (PDT) X-Received: by 2002:adf:e40b:: with SMTP id g11-v6mr438146wrm.18.1530785569601; Thu, 05 Jul 2018 03:12:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530785569; cv=none; d=google.com; s=arc-20160816; b=Gu8HQ1Ola2TLH5+kQ6SlCU4gQZjThKY6to+EVvOunVrdo9HAe8LuSk6lPxo4QquB5V Ql7ctjA9hHVs4tA6zkuoRiUvsou258mB1soAmNa10uQvsQu+9O/a8g5/bYrpvyWstOjY U1ZfU0Asz6BK9LhV/ybCGXiRLzLvv2BC+D8TQq2gRLXadM23vMCtK0qyDM+exkkyt9h0 hcmhTxUKSDfAQm3vQ9huIXV3zlUOO0S9Xno9e+Na6fLnJB+V2xhGXxrgwUFpnG0lE2xK gvjeM5D6GaO4e9qr+6ggixoThyGotsTdHowAXHn9LVQRP07r/ZRpk3N9IrdoBCIlxzE4 +wxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=nU0dOvh0vYkiNLvQwsh0oVYLHYNWc7f2pQ1T9Mb572Y=; b=h2K0SdZjyodv2DOiRQAFO8PtMUxxgDfTvXOULi9ENsUk327fFRy7jgBEoE63WoKFdc fKRLRCRnW648aQ2hsYFI3YSRlO4jbEgfAUdtwjWv4m7txRnT1kBo0pYVHtNHkh06xjZf AATVpQVwEVC5scjKzA4sd4oplSK7L3bK5gbZ8DYd/r/+/iyEdXTobCaT4K49rnXBSv7x IYUtnBeHkVnrgFLZQrTUbMjshTJKDe7XCzM1U4j2UWHAPkPEv22vHEUDOurO3hbsTCsK ze7HjZmUO3o4ydzGY/JDCKO4vGZmbMArADgjlwfPThHQYofJBE7bNfR4f4w9NtukSR9q pzWg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id e9-v6si249864wrj.1.2018.07.05.03.12.49 for <swupdate@googlegroups.com> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 03:12:49 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=212.18.0.9; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 41Ltw12szdz1qxp3; Thu, 5 Jul 2018 12:12:49 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 41Ltw12kSKz1qvTD; Thu, 5 Jul 2018 12:12:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 6Q_j4UYK2U4a; Thu, 5 Jul 2018 12:12:48 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Thu, 5 Jul 2018 12:12:48 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 10EAC4540453; Thu, 5 Jul 2018 12:12:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WZN92w7YkwQJ; Thu, 5 Jul 2018 12:12:45 +0200 (CEST) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id 74E83454040C; Thu, 5 Jul 2018 12:12:45 +0200 (CEST) From: Stefano Babic <sbabic@denx.de> To: swupdate@googlegroups.com Cc: Stefano Babic <sbabic@denx.de> Subject: [swupdate] [meta-swupdate] [PATCH] Fix conflicts when "usrmerge" is in DISTRO_FEATURE Date: Thu, 5 Jul 2018 12:12:40 +0200 Message-Id: <1530785560-32417-1-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: <swupdate.googlegroups.com> X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: <https://groups.google.com/group/swupdate/post>, <mailto:swupdate@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:swupdate+help@googlegroups.com> List-Archive: <https://groups.google.com/group/swupdate List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>, <mailto:swupdate+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>, <https://groups.google.com/group/swupdate/subscribe> |
| Series |
[meta-swupdate] Fix conflicts when "usrmerge" is in DISTRO_FEATURE
|
expand
|
diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 32a9c1a..b940a73 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -20,9 +20,6 @@ INSANE_SKIP_${PN} = "ldflags" PACKAGES =+ "${PN}-www" FILES_${PN}-www = "/www/*" -FILES_${PN}-dev = "${includedir}" -FILES_${PN}-staticdev = "${libdir}" -FILES_${PN} = "${bindir}/* ${sysconfdir}" S = "${WORKDIR}/git/"
FILES_ are not set correct and conflict when "usrmerge" is set in DISTRO_FEATURES. Do not use it and relay on the automatic rules in Yocto (headers are automatic put in -dev and static libraries in -staticdev). Signed-off-by: Stefano Babic <sbabic@denx.de> --- recipes-support/swupdate/swupdate.inc | 3 --- 1 file changed, 3 deletions(-)