From 9f2e3a3a1f19b569b9524fa0f4cb4790e23ad983 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 26 Mar 2017 13:06:22 -0600 Subject: [PATCH] pylibfdt: Use the correct libfdt version in the module 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 Signed-off-by: David Gibson --- pylibfdt/Makefile.pylibfdt | 3 ++- pylibfdt/setup.py | 3 ++- 2 files changed, 4 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..3bafe30 100644 --- a/pylibfdt/setup.py +++ b/pylibfdt/setup.py @@ -16,6 +16,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 +25,7 @@ libfdt_module = Extension( ) setup (name = 'libfdt', - version = '0.1', + version = version, author = "Simon Glass ", description = """Python binding for libfdt""", ext_modules = [libfdt_module],