From: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
To: Devicetree Compiler
<devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>,
David Gibson
<david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>,
Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
Subject: [PATCH v2 3/6] pylibfdt: Use the correct libfdt version in the module
Date: Wed, 29 Mar 2017 12:15:38 -0600 [thread overview]
Message-ID: <20170329181541.28856-4-sjg@chromium.org> (raw)
In-Reply-To: <20170329181541.28856-1-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
Use the same version number in the module as with the rest of libfdt. This
can be examined with:
import pkg_resources
print pkg_resources.require('libfdt')[0].version
Signed-off-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
---
Changes in v2:
- Add a comment about the VERSION environment variable
pylibfdt/Makefile.pylibfdt | 3 ++-
pylibfdt/setup.py | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pylibfdt/Makefile.pylibfdt b/pylibfdt/Makefile.pylibfdt
index a0271da..a74cd30 100644
--- a/pylibfdt/Makefile.pylibfdt
+++ b/pylibfdt/Makefile.pylibfdt
@@ -8,6 +8,7 @@ PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so
$(PYMODULE): $(PYLIBFDT_srcs) $(WRAP)
@$(VECHO) PYMOD $@
SOURCES="$^" CPPFLAGS="$(CPPFLAGS)" OBJDIR="$(PYLIBFDT_objdir)" \
+ VERSION="$(dtc_version)" \
python $(PYLIBFDT_objdir)/setup.py --quiet build_ext --inplace
$(WRAP): $(PYLIBFDT_srcdir)/libfdt.swig
@@ -17,7 +18,7 @@ $(WRAP): $(PYLIBFDT_srcdir)/libfdt.swig
install_pylibfdt: $(WRAP) $(PYMODULE)
$(VECHO) INSTALL-PYLIB; \
SOURCES="$(PYLIBFDT_srcs) $(WRAP)" CPPFLAGS="$(CPPFLAGS)" \
- OBJDIR="$(PYLIBFDT_objdir)" \
+ OBJDIR="$(PYLIBFDT_objdir)" VERSION="$(dtc_version)" \
python $(PYLIBFDT_objdir)/setup.py --quiet install \
$(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX))
diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
index ef6e2c0..9f87fe9 100644
--- a/pylibfdt/setup.py
+++ b/pylibfdt/setup.py
@@ -6,6 +6,7 @@ setup.py file for SWIG libfdt
Files to be built into the extension are provided in SOURCES
C flags to use are provided in CPPFLAGS
Object file directory is provided in OBJDIR
+Version is provided in VERSION
"""
from distutils.core import setup, Extension
@@ -16,6 +17,7 @@ progname = sys.argv[0]
files = os.environ['SOURCES'].split()
cflags = os.environ['CPPFLAGS'].split()
objdir = os.environ['OBJDIR']
+version = os.environ['VERSION']
libfdt_module = Extension(
'_libfdt',
@@ -24,7 +26,7 @@ libfdt_module = Extension(
)
setup (name = 'libfdt',
- version = '0.1',
+ version = version,
author = "Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>",
description = """Python binding for libfdt""",
ext_modules = [libfdt_module],
--
2.12.2.564.g063fe858b8-goog
next prev parent reply other threads:[~2017-03-29 18:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 18:15 [PATCH v2 0/6] pylibfdt: Add installation support Simon Glass
[not found] ` <20170329181541.28856-1-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2017-03-29 18:15 ` [PATCH v2 1/6] pylibfdt: Allow building to be disabled Simon Glass
2017-03-29 18:15 ` [PATCH v2 2/6] pylibfdt: Enable installation of Python module Simon Glass
2017-03-29 18:15 ` Simon Glass [this message]
2017-03-29 18:15 ` [PATCH v2 4/6] pylibfdt: Use the call function to simplify the Makefile Simon Glass
2017-03-29 18:15 ` [PATCH v2 5/6] pylibfdt: Rename libfdt.swig to libfdt.i Simon Glass
[not found] ` <20170329181541.28856-6-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2017-04-03 4:37 ` David Gibson
[not found] ` <20170403043721.GD10997-K0bRW+63XPQe6aEkudXLsA@public.gmane.org>
2017-04-05 3:18 ` Simon Glass
[not found] ` <CAPnjgZ3Bj5AY2nburGFmxScH7-Ws4R6sxWZQkqNW3NxNt5-5aQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-05 5:10 ` David Gibson
2017-03-29 18:15 ` [PATCH v2 6/6] pylibfdt: Allow setup.py to operation stand-alone Simon Glass
2017-03-29 18:16 ` [PATCH v2 0/6] pylibfdt: Add installation support Simon Glass
2017-04-03 4:37 ` David Gibson
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=20170329181541.28856-4-sjg@chromium.org \
--to=sjg-f7+t8e8rja9g9huczpvpmw@public.gmane.org \
--cc=david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org \
--cc=devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.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;
as well as URLs for NNTP newsgroup(s).