From: Patrick Ohly <patrick.ohly@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] package_rpm.bbclass: support packaging of symlinks to directories
Date: Tue, 17 Feb 2015 05:42:05 -0800 [thread overview]
Message-ID: <1424180525-4138-1-git-send-email-patrick.ohly@intel.com> (raw)
os.walk() returns symlinks to directories in the "dirs" lists,
but then never enters them by default. As a result, the old
code applied neither the directory handling (because that
is active once a directory gets entered) nor the file handling,
and thus never packaged such symlinks.
The fix is simple: find such special directory entries and move
them to the "files" list.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
meta/classes/package_rpm.bbclass | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 92ddf7a..6483e96 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -197,6 +197,13 @@ python write_specfile () {
if path.endswith("DEBIAN") or path.endswith("CONTROL"):
continue
+ # Treat all symlinks to directories as normal files.
+ # os.walk() lists them as directories.
+ for i, entry in enumerate(dirs):
+ if os.path.islink(os.path.join(rootpath, entry)):
+ del dirs[i]
+ files.append(entry)
+
# Directory handling can happen in two ways, either DIRFILES is not set at all
# in which case we fall back to the older behaviour of packages owning all their
# directories
--
1.8.4.5
next reply other threads:[~2015-02-17 13:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-17 13:42 Patrick Ohly [this message]
2015-02-17 15:55 ` [PATCH] package_rpm.bbclass: support packaging of symlinks to directories Christopher Larson
2015-02-18 8:43 ` Patrick Ohly
2015-02-18 9:08 ` Patrick Ohly
2015-02-17 16:54 ` Mark Hatle
2015-02-17 16:57 ` Christopher Larson
2015-02-17 17:09 ` Mark Hatle
2015-02-18 3:40 ` Dan McGregor
2015-02-18 8:45 ` Patrick Ohly
2015-02-18 14:54 ` Mark Hatle
2015-02-25 14:51 ` [PATCH v2] " Patrick Ohly
2015-02-25 15:18 ` Patrick Ohly
2015-02-25 14:53 ` [PATCH v3] " Patrick Ohly
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=1424180525-4138-1-git-send-email-patrick.ohly@intel.com \
--to=patrick.ohly@intel.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