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 <sjg@chromium.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
parent
e91c652af2
commit
9f2e3a3a1f
|
|
@ -8,6 +8,7 @@ PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so
|
||||||
$(PYMODULE): $(PYLIBFDT_srcs) $(WRAP)
|
$(PYMODULE): $(PYLIBFDT_srcs) $(WRAP)
|
||||||
@$(VECHO) PYMOD $@
|
@$(VECHO) PYMOD $@
|
||||||
SOURCES="$^" CPPFLAGS="$(CPPFLAGS)" OBJDIR="$(PYLIBFDT_objdir)" \
|
SOURCES="$^" CPPFLAGS="$(CPPFLAGS)" OBJDIR="$(PYLIBFDT_objdir)" \
|
||||||
|
VERSION="$(dtc_version)" \
|
||||||
python $(PYLIBFDT_objdir)/setup.py --quiet build_ext --inplace
|
python $(PYLIBFDT_objdir)/setup.py --quiet build_ext --inplace
|
||||||
|
|
||||||
$(WRAP): $(PYLIBFDT_srcdir)/libfdt.swig
|
$(WRAP): $(PYLIBFDT_srcdir)/libfdt.swig
|
||||||
|
|
@ -17,7 +18,7 @@ $(WRAP): $(PYLIBFDT_srcdir)/libfdt.swig
|
||||||
install_pylibfdt: $(WRAP) $(PYMODULE)
|
install_pylibfdt: $(WRAP) $(PYMODULE)
|
||||||
$(VECHO) INSTALL-PYLIB; \
|
$(VECHO) INSTALL-PYLIB; \
|
||||||
SOURCES="$(PYLIBFDT_srcs) $(WRAP)" CPPFLAGS="$(CPPFLAGS)" \
|
SOURCES="$(PYLIBFDT_srcs) $(WRAP)" CPPFLAGS="$(CPPFLAGS)" \
|
||||||
OBJDIR="$(PYLIBFDT_objdir)" \
|
OBJDIR="$(PYLIBFDT_objdir)" VERSION="$(dtc_version)" \
|
||||||
python $(PYLIBFDT_objdir)/setup.py --quiet install \
|
python $(PYLIBFDT_objdir)/setup.py --quiet install \
|
||||||
$(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX))
|
$(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ progname = sys.argv[0]
|
||||||
files = os.environ['SOURCES'].split()
|
files = os.environ['SOURCES'].split()
|
||||||
cflags = os.environ['CPPFLAGS'].split()
|
cflags = os.environ['CPPFLAGS'].split()
|
||||||
objdir = os.environ['OBJDIR']
|
objdir = os.environ['OBJDIR']
|
||||||
|
version = os.environ['VERSION']
|
||||||
|
|
||||||
libfdt_module = Extension(
|
libfdt_module = Extension(
|
||||||
'_libfdt',
|
'_libfdt',
|
||||||
|
|
@ -24,7 +25,7 @@ libfdt_module = Extension(
|
||||||
)
|
)
|
||||||
|
|
||||||
setup (name = 'libfdt',
|
setup (name = 'libfdt',
|
||||||
version = '0.1',
|
version = version,
|
||||||
author = "Simon Glass <sjg@chromium.org>",
|
author = "Simon Glass <sjg@chromium.org>",
|
||||||
description = """Python binding for libfdt""",
|
description = """Python binding for libfdt""",
|
||||||
ext_modules = [libfdt_module],
|
ext_modules = [libfdt_module],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue