mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

dtc: use Meson to build

Browse Source 
(From OE-Core rev: f8f25c424079074b9ed4a7801122c2f59f22aacf)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2021-11-12 14:02:33 +00:00
committed by Richard Purdie
parent ca02d07869
commit cf9782c18a
3 changed files with 4 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-kernel/dtc/dtc/0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch
View File

@@ -1,36 +0,0 @@
From f0119060ef1b9bd80e2cae487df1e4aedffb0e9b Mon Sep 17 00:00:00 2001
From: Oleksiy Obitotskyy <oobitots@cisco.com>
Date: Fri, 22 Jan 2021 09:12:48 +0200
Subject: [PATCH] dtc: Fix Makefile to add CFLAGS not override
Makefile override CFLAGS not extend them, so some of them
missing. Sources builds out of kernel tree and probably not all
options could be used (?). We need at least -fmacro-prefix-map/
debug-prefix-map to eliminate absolute path in binaries.
Upstream-Status: Pending
Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 35d936f..b5b13cf 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,10 @@ CONFIG_LOCALVERSION =
# See libfdt_internal.h for details
ASSUME_MASK ?= 0
-CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
+CPPFLAGS += -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
+CFLAGS += -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
BISON = bison
LEX = flex
--
2.25.1

26
meta/recipes-kernel/dtc/dtc/make_install.patch
View File

@@ -1,26 +0,0 @@
From e9852b9d206df1e42aa4c8afec55a0f5e099b533 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 3 Nov 2011 08:35:47 -0700
Subject: [PATCH] dtc: Add patch to correctly install shared libraries and
Upstream-Status: Inappropriate [configuration]
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index d8ebc4f..f5e01be 100644
--- a/Makefile
+++ b/Makefile
@@ -205,8 +205,8 @@ install-bin: all $(SCRIPTS)
install-lib: all
@$(VECHO) INSTALL-LIB
$(INSTALL) -d $(DESTDIR)$(LIBDIR)
- $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
- ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
+ $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
+ ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
$(INSTALL_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)

15
meta/recipes-kernel/dtc/dtc_1.6.1.bb
View File

@@ -8,23 +8,16 @@ DEPENDS = "flex-native bison-native"
LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407"
SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
file://make_install.patch \
file://0001-dtc-Fix-Makefile-to-add-CFLAGS-not-override.patch \
"
SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master"
SRCREV = "b6910bec11614980a21e46fbccc35934b671bd81"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"'
inherit pkgconfig
S = "${WORKDIR}/git"
do_install () {
oe_runmake install
}
inherit meson pkgconfig
EXTRA_OEMESON = "-Dpython=disabled -Dvalgrind=disabled"
PACKAGES =+ "${PN}-misc"
FILES:${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff"