From patchwork Tue Sep 4 15:50:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 145937 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3825862ljw; Tue, 4 Sep 2018 08:50:14 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda+6m+N/o319G5dJuu6Vnjx06ILMPnZJpI1KZHg2nwQKZOq6vQv6oJ/nCV0c6PUs5O6A+9D X-Received: by 2002:a17:902:24d:: with SMTP id 71-v6mr26074669plc.91.1536076214072; Tue, 04 Sep 2018 08:50:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536076214; cv=none; d=google.com; s=arc-20160816; b=f/hbIkFsI/v+7ouwR/oN7rvhvbDLlFP5dFxOcNONcVGfp3neeqy4VCv6GmtTpIei6u WEZI1/qwbZwr93w0VUtpXadXv10BRhyc2FMvc9g1TtyZlOtjCoBlI0OwHNTmEkx59YL+ QivrqJYw8wqvhxPjSovl1n9Mk/enjIaVFuDiDtLV8xKWxD/eLmMrJZasj4EFoo3cuBuO LaXHCGgKKnR1Ld8viDII6gpYYoOZIrNCgQVe1kKktl3GuZDgjHL02wrjo+FNauX4jH09 cQoHKbAyCwJher6HvVw5K3w3RfMTV20svOYBSyqBhkO9I5vvY2FCdQbCdG03aQagMNxV /WTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=mkl04cXBG0iSlmL7kbDOskbNwG6U1CCD3kf5hEgJ8Yo=; b=ZDRAbkt1XHLDgsUpVM/AvesYUzQebmlBrBNTnMWYy/iDOmt58e3aWMinrkloyI1Bho RU+oOWIjhJBXjLk9KegFLZlsMA1oLfaGSDOvb/l6foJ/I0mmnTTb+rYejrjs69g13xDb 0NlEl/BbLjNNG+K+TOtFDNWV/D4gHKEClA7NZc9TD23TFH0VB2bdZ9n0TTwr21oUVeyO vuYMD3kR8rqy03AG0P/mrGt/7VvDf1n8KNbp/fn5892awHqWKr812GntmYG7R+PUtVFx Dp0wBOh8s66i3fwpaqelOydGdULxWUIdDDcF5BzxUoqrJqry72GrYAu4WcCAqdhJf393 sOCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jHC2DeU2; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e5-v6si21658440pfg.258.2018.09.04.08.50.13; Tue, 04 Sep 2018 08:50:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jHC2DeU2; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E89A874D73; Tue, 4 Sep 2018 15:50:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id 2253374CB4 for ; Tue, 4 Sep 2018 15:50:10 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id c14-v6so4970740wmb.4 for ; Tue, 04 Sep 2018 08:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=rN+xTzd27pWuY8YL6LSXa8anGeFP3sW8uWfwoNok6mc=; b=jHC2DeU2oHwZtpHvowbeB1oHhEUg4POzc6KovE8T5u3XuOoxzU2nPc4vo2S4rj2Yw0 NeBK20uVBYXsOzB4xZCJYBljI7p2pwkbmBcQ63fFwdSqmYgaSsuoFW+dJyVToGSSXsCP yprW9obsHhcC5dNDjglkJxD78dsJvZfGlJdcguIkJ9HL/mGlpm74XeXHgjPI4xEmPrAy Oqr5cCj6QOiyu7aOn7J34yEDsesDigQ7xtbI5lwDR6dzZifm1n52EchPQqBR6QFjLq/s CH/a78R2rRobnjmFmLAZKc9FUzL4FJCwAGBpe+PEoG2zi4HamHmyQvFw8a+4ChY+qthZ NHOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rN+xTzd27pWuY8YL6LSXa8anGeFP3sW8uWfwoNok6mc=; b=gjAEUm9HdljMB2hU7BX28X2B+2RvJ37ru84HSvJoIzmH08ysfzqdKyppEg+ajace2P qtiucyYthYmRmuva5kcBJ7+qBTYEQ3hVEOD5WlwTPMyL4PS4IOv6wQ1RAnprnkzrozeW 6glFwnPwIohnNLGKjVbyx/nCHEFozLRy+fE6MvFo6XOhLN4PTP+LrXNosYbjDnrEcY11 ZBQIhHWO6+f7WlKB6M7bQbbKtt5LFRE6gOSP9Lbp3FotmQsIiI+o9QNpEH4R6d4MfIKA IxGBjlCLRJT+ZhIKEq2+V9/1wkqtMJ7CnnV8DHSfwM65ZJ56XlOndEXdVPrXfrmwhEEB +XMQ== X-Gm-Message-State: APzg51C6wQnGg1gOzoLDAeOR94lGEzPOi3/C7dYcbultJPhmcgV0oKI4 zGQra9eC/grYcXwezVpNOj3TYdkfMLQ= X-Received: by 2002:a1c:5f82:: with SMTP id t124-v6mr2963768wmb.14.1536076210500; Tue, 04 Sep 2018 08:50:10 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id w18-v6sm45231059wrc.38.2018.09.04.08.50.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Sep 2018 08:50:09 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 4 Sep 2018 16:50:00 +0100 Message-Id: <20180904155000.3715-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Cc: Joshua Lock Subject: [OE-core] [PATCH] os-release: fix to install in the expected location X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Joshua Lock os-release (5) recommends that the os-release file be installed in /usr/lib/os-release and that /etc/os-release be a relative symlink to it. Signed-off-by: Joshua Lock Signed-off-by: Ross Burton --- meta/recipes-core/os-release/os-release.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index f9887047561..c6e36001dc5 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb @@ -1,7 +1,7 @@ inherit allarch SUMMARY = "Operating system identification" -DESCRIPTION = "The /etc/os-release file contains operating system identification data." +DESCRIPTION = "The /usr/lib/os-release file contains operating system identification data." LICENSE = "MIT" INHIBIT_DEFAULT_DEPS = "1" @@ -42,6 +42,7 @@ python do_compile () { do_compile[vardeps] += "${OS_RELEASE_FIELDS}" do_install () { - install -d ${D}${sysconfdir} - install -m 0644 os-release ${D}${sysconfdir}/ + install -d ${D}${libdir} + install -m 0644 os-release ${D}${libdir}/ + lnr ${D}${libdir}/os-release ${D}${sysconfdir} }