public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Ross Burton" <ross@burtonini.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 5/6] package_manager/ipk: neaten OPKGLIBDIR logic
Date: Tue,  1 Dec 2020 15:23:04 +0000	[thread overview]
Message-ID: <20201201152305.2375723-5-ross.burton@arm.com> (raw)
In-Reply-To: <20201201152305.2375723-1-ross.burton@arm.com>

oe.path.join handles path components starting with / for us.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/lib/oe/package_manager/ipk/__init__.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py
index 416ed23d474..2753b139ed1 100644
--- a/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/meta/lib/oe/package_manager/ipk/__init__.py
@@ -172,12 +172,7 @@ class OpkgPM(OpkgDpkgPM):
         if prepare_index:
             create_packages_dir(self.d, self.deploy_dir, d.getVar("DEPLOY_DIR_IPK"), "package_write_ipk", filterbydependencies)
 
-        opkg_lib_dir = self.d.getVar('OPKGLIBDIR')
-        if opkg_lib_dir[0] == "/":
-            opkg_lib_dir = opkg_lib_dir[1:]
-
-        self.opkg_dir = os.path.join(target_rootfs, opkg_lib_dir, "opkg")
-
+        self.opkg_dir = oe.path.join(target_rootfs, self.d.getVar('OPKGLIBDIR'), "opkg")
         bb.utils.mkdirhier(self.opkg_dir)
 
         self.saved_opkg_dir = self.d.expand('${T}/saved/%s' % self.task_name)
-- 
2.25.1


  parent reply	other threads:[~2020-12-01 15:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-01 15:23 [PATCH 1/6] ldconfig-native: don't write auxiliary cache Ross Burton
2020-12-01 15:23 ` [PATCH 2/6] image_types: remove obsolete tar comment Ross Burton
2020-12-01 15:23 ` [PATCH 3/6] image_types: sort tarball file listings Ross Burton
2020-12-01 15:23 ` [PATCH 4/6] reproducible_build: clamp the rootfs tarball mtime to the epoch Ross Burton
2020-12-01 15:45   ` [OE-core] " Richard Purdie
2020-12-01 17:16     ` Ross Burton
2020-12-01 23:25       ` Jate Sujjavanich
2020-12-01 15:23 ` Ross Burton [this message]
2020-12-01 15:23 ` [PATCH 6/6] package_manager/ipk: improve remove_packaging_data Ross Burton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201201152305.2375723-5-ross.burton@arm.com \
    --to=ross@burtonini.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox