diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk index 34ae24327a..a731a23c59 100644 --- a/packages/tools/dtc/package.mk +++ b/packages/tools/dtc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dtc" -PKG_VERSION="1.4.5" -PKG_SHA256="cfb9394690ebec1e4f942ee0c3b863b660eb0c4ef85bab19429f30c3469a3415" +PKG_VERSION="1.5.0" +PKG_SHA256="14343cb204aaff386206ea27e39e93d6e35d9a797222e8426f95e57828ca6b94" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/" PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz" @@ -24,8 +24,6 @@ makeinstall_host() { post_makeinstall_host() { python ./pylibfdt/setup.py build_ext --inplace exec_thread_safe python ./pylibfdt/setup.py install --prefix=$TOOLCHAIN - - touch $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/site-packages/pylibfdt/__init__.py } pre_make_target() { diff --git a/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch b/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch index e79f54b7a3..c070ddddc5 100644 --- a/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch +++ b/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch @@ -1,12 +1,13 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2017-03-09 16:17:23.000000000 -0800 -+++ b/Makefile 2017-05-31 16:04:29.052439734 -0700 -@@ -134,7 +134,7 @@ - LIBFDT_objdir = libfdt - LIBFDT_srcdir = libfdt - LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a --LIBFDT_lib = $(LIBFDT_objdir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) -+LIBFDT_lib = $(LIBFDT_objdir)/libfdt.$(SHAREDLIB_EXT) - LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) - LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) +diff --git a/Makefile b/Makefile +index e6b32cf..c50789d 100644 +--- a/Makefile ++++ b/Makefile +@@ -184,7 +184,7 @@ endif + # + LIBFDT_dir = libfdt + LIBFDT_archive = $(LIBFDT_dir)/libfdt.a +-LIBFDT_lib = $(LIBFDT_dir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) ++LIBFDT_lib = $(LIBFDT_dir)/libfdt.$(SHAREDLIB_EXT) + LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES)) + LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION)) diff --git a/packages/tools/dtc/patches/dtc-0002-fix-format-errors.patch b/packages/tools/dtc/patches/dtc-0002-fix-format-errors.patch deleted file mode 100644 index 0976e6e971..0000000000 --- a/packages/tools/dtc/patches/dtc-0002-fix-format-errors.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 497432fd2131967f349e69dc5d259072151cc4b4 Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Wed, 27 Sep 2017 15:04:09 +0200 -Subject: checks: Use proper format modifier for size_t - -The size of size_t can vary between architectures, so using %ld isn't -going to work on 32-bit builds. Use the %zu modifier to make sure it is -always correct. - -Signed-off-by: Thierry Reding -Acked-by: Rob Herring -Signed-off-by: David Gibson ---- - checks.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -(limited to 'checks.c') - -diff --git a/checks.c b/checks.c -index 902f2e3..08a3a29 100644 ---- a/checks.c -+++ b/checks.c -@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c, - int cell, cellsize = 0; - - if (prop->val.len % sizeof(cell_t)) { -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - prop->name, prop->val.len, sizeof(cell_t), node->fullpath); - return; - } -@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c, - return; - - if (irq_prop->val.len % sizeof(cell_t)) -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - irq_prop->name, irq_prop->val.len, sizeof(cell_t), - node->fullpath); - --- -cgit v1.1 -