Skip to contentSkip to conversation

recipes: Mark compatible machines as restricted by dependencies

PATCH New Khem Raj 3 participants 6 messages Sep 28, 2018 – Oct 1, 2018 Arm i.MX and Layerscape

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 recipes: Mark compatible machines as restricted by dependencies

---
 recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb       | 1 +
 recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb | 1 +
 recipes-security/optee/optee-test-qoriq_git.bb        | 1 +
 3 files changed, 3 insertions(+)
recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb +1 -0
index ae62d544..0b237a65 100644
@@ -30,3 +30,4 @@ INSANE_SKIP_${PN} = "ldflags"
 INHIBIT_PACKAGE_STRIP = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 PARALLEL_MAKE = ""
+COMPATIBLE_MACHINE = "(ls2080ardb|ls2084ardb|ls2088a|ls1043a|ls1046a|ls1088a)"
recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb +1 -0
index 5638f084..ab378cf5 100644
@@ -46,3 +46,4 @@ RDEPENDS_${PN}-extfs = " \
     e2fsprogs-mke2fs \
     e2fsprogs-e2fsck \
 "
+COMPATIBLE_MACHINE = "(imx)"
recipes-security/optee/optee-test-qoriq_git.bb +1 -0
index 06b8f642..b01339b6 100644
@@ -46,3 +46,4 @@ FILES_${PN} += "/lib/optee_armtz/"
 
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls1043ardb|ls1046ardb|ls1012ardb)"
Signature · 1 line
2.19.0
author
#1 lore raw

PATCH v5 2/4 recipes: Limit BSP specific recipes on relevant SOCs

This helps in using meta-freescale with other BSP layers in same projects, which is common usecase

Cc Andreas Müller <[email protected]>
Cc Zhenhua Luo <[email protected]>
Cc Otavio Salvador <[email protected]>

---
v2: nativesdk-mxsldr is needed in SDK packagegroups
v3: Fine tune the overrides for qorq and mainline bsp specific recipes
v4: Set COMPATIBLE_HOST to (imx)
v5: Use COMAPTIBLE_MACHINE instead of COMPATIBLE_HOST, add more recipes

 dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb   | 1 +
 recipes-bsp/firmware-imx/firmware-imx_7.6.bb                    | 2 ++
 recipes-bsp/imx-uuc/imx-uuc_git.bb                              | 2 ++
 recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc               | 2 ++
 recipes-bsp/uefi/uefi_git.bb                                    | 1 +
 recipes-dpaa/fmlib/fmlib_git.bb                                 | 1 +
 recipes-graphics/drm/libdrm-armada_git.bb                       | 2 ++
 recipes-graphics/xorg-driver/xf86-video-armada_git.bb           | 2 ++
 recipes-kernel/dtc/dtc-145_git.bb                               | 1 +
 .../kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb | 1 +
 .../kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.6.bb      | 1 +
 recipes-security/optee/optee-client-qoriq.bb                    | 2 ++
 12 files changed, 18 insertions(+)
dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +1 -0
index 76ece625..d839b6fc 100644
@@ -45,3 +45,4 @@ PARALLEL_MAKE = ""
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
+COMPATIBLE_MACHINE = "(qoriq)"
recipes-bsp/firmware-imx/firmware-imx_7.6.bb +2 -0
index 6c5f73ce..4f7b3890 100644
@@ -100,3 +100,5 @@ PACKAGES =+ "${PN}-epdc ${PN}-brcm"
 
 FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
 FILES_${PN}-brcm = "${base_libdir}/firmware/bcm/*/*.bin ${base_libdir}/firmware/bcm/*/*.cal ${sysconfdir}/firmware/"
+
+COMPATIBLE_MACHINE = "(imx)"
recipes-bsp/imx-uuc/imx-uuc_git.bb +2 -0
index 381c214a..a3a8387b 100644
@@ -16,3 +16,5 @@ SRCREV = "323efa5e4c799c40503ac92a8104c33b090e6731"
 S = "${WORKDIR}/git"
 
 FILES_${PN} += "/linuxrc /fat"
+
+COMPATIBLE_MACHINE = "(imx)"
recipes-bsp/u-boot/u-boot-fslc-common_2018.09.inc +2 -0
index aaefd67f..18be28a3 100644
@@ -14,3 +14,5 @@ SRCBRANCH = "2018.09+fslc"
 PV = "v2018.09+git${SRCPV}"
 
 S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "(imx)"
recipes-bsp/uefi/uefi_git.bb +1 -0
index f157d03d..baf430d8 100644
@@ -28,3 +28,4 @@ FILES_${PN}-image += "/uefi/*"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
+COMPATIBLE_MACHINE = "(qoriq)"
recipes-dpaa/fmlib/fmlib_git.bb +1 -0
index bbe1e535..1f31f631 100644
@@ -28,3 +28,4 @@ ALLOW_EMPTY_${PN} = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+COMPATIBLE_MACHINE ?= "(qoriq)"
recipes-graphics/drm/libdrm-armada_git.bb +2 -0
index 937c68d7..0a14e371 100644
@@ -13,3 +13,5 @@ SRC_URI = "git://git.armlinux.org.uk/~rmk/libdrm-armada.git"
 inherit autotools pkgconfig
 
 S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE ?= "(imx)"
recipes-graphics/xorg-driver/xf86-video-armada_git.bb +2 -0
index 30e3ae47..30372eff 100644
@@ -44,3 +44,5 @@ EXTRA_OECONF = "--disable-etnaviv \
                 --disable-vivante \
                 --with-etnaviv-source=${WORKDIR}/etna_viv \
                 "
+
+COMPATIBLE_MACHINE = "(imx)"
recipes-kernel/dtc/dtc-145_git.bb +1 -0
index 2776cc5e..bdd83990 100644
@@ -16,3 +16,4 @@ do_install () {
     install -d ${D}/${bindir}
     install -m 755 dtc ${D}/${bindir}/dtc-145
 }
+COMPATIBLE_MACHINE = "(imx)"
recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.2+fslc.bb +1 -0
index 19f2dc7f..f9307fb4 100644
@@ -17,3 +17,4 @@ S = "${WORKDIR}/git"
 inherit module
 
 KERNEL_MODULE_AUTOLOAD = "galcore"
+COMPATIBLE_MACHINE = "(imx)"
recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p1.6.bb +1 -0
index 0170695b..32279493 100644
@@ -24,3 +24,4 @@ inherit module
 EXTRA_OEMAKE += "CONFIG_MXC_GPU_VIV=m"
 
 KERNEL_MODULE_AUTOLOAD = "galcore"
+COMPATIBLE_MACHINE = "(imx)"
recipes-security/optee/optee-client-qoriq.bb +2 -0
index 0a76743b..a5042703 100644
@@ -27,3 +27,5 @@ do_install() {
 
     cp -a ${S}/out/export/include ${D}/usr/
 }
+
+COMPATIBLE_MACHINE = "(qoriq)"
Signature · 1 line
2.19.0
#2 lore raw

Re: [PATCH v5 2/4] recipes: Limit BSP specific recipes on relevant SOCs

Quoted 8 lines · Khem Raj

This helps in using meta-freescale with other BSP layers in same projects, which is common usecase

Cc Andreas Müller <[email protected]>
Cc Zhenhua Luo <[email protected]>
Cc Otavio Salvador <[email protected]>

I applied the whole series and also backported it for sumo. Thanks for the good work!

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750
#3 lore raw

Re: [PATCH v5 2/4] recipes: Limit BSP specific recipes on relevant SOCs

Quoted 6 lines · Otavio Salvador
Quoted 4 lines · Khem Raj

This helps in using meta-freescale with other BSP layers in same projects, which is common usecase

Quoted 8 lines
Quoted 4 lines
Cc Andreas Müller <[email protected]>
Cc Zhenhua Luo <[email protected]>
Cc Otavio Salvador <[email protected]>

I applied the whole series and also backported it for sumo. Thanks for the good work!

FYI: From use_mainline_bsp point of view this series is fine and does not cause issues.

Thanks also from my side for doing this enhancements

Andreas

author
#4 lore raw

PATCH 3/4 mxldr: Fix QA errors seen on x86 builds

In reply to Khem Raj

* Respect OE flags inside makefiles
* Its not a autotooled recipe but a simple makefile based one

Fixes
NOTE: i586-yoe-linux-musl-objdump -p TOPDIR/build/tmp/work/i586-yoe-linux-musl/mxsldr/0.0.0+gitAUTOINC+c40d804725-r0/packages-split/mxsldr/usr/bin/mxsldr
ERROR: QA Issue: No GNU_HASH in the elf binary:
'TOPDIR/build/tmp/work/i586-yoe-linux-musl/mxsldr/0.0.0+gitAUTOINC+c40d804725-r0/packages-split/mxsldr/usr/bin/mxsldr' [ldflags]

---
 ...-Do-not-ignore-OE-cflags-and-ldflags.patch | 28 +++++++++++++++++++
 recipes-bsp/mxsldr/mxsldr_git.bb              | 12 ++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 recipes-bsp/mxsldr/mxsldr/0001-Do-not-ignore-OE-cflags-and-ldflags.patch
recipes-bsp/mxsldr/mxsldr/0001-Do-not-ignore-OE-cflags-and-ldflags.patch new file +28 -0
new file mode 100644
index 00000000..c8c8413a
@@ -0,0 +1,28 @@
+From 2f2e1ca77b4459475e5d649bd22e6bc8c3873695 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 25 Sep 2018 01:23:02 -0700
+Subject: [PATCH] Do not ignore OE cflags and ldflags
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index afb4e32..d2763ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,8 @@ prefix ?= "/usr/local"
+ 
+ all: mxsldr
+ 
+-CFLAGS = `pkg-config --cflags libusb-1.0`
+-LDFLAGS = `pkg-config --libs libusb-1.0`
++CFLAGS += `pkg-config --cflags libusb-1.0`
++LDFLAGS += `pkg-config --libs libusb-1.0`
+ 
+ mxsldr: mxsldr.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lusb-1.0
+-- 
+2.19.0
+
recipes-bsp/mxsldr/mxsldr_git.bb +10 -2
index 5c4b874b..a7df725f 100644
@@ -7,12 +7,20 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRCREV = "c40d80472525e1d57dae5317c028b745968c0399"
-SRC_URI = "git://git.denx.de/mxsldr.git"
+SRC_URI = "git://git.denx.de/mxsldr.git \
+           file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \
+           "
 
 PV = "0.0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep pkgconfig
+inherit pkgconfig
 
+do_compile() {
+	oe_runmake
+}
+do_install() {
+	oe_runmake install DESTDIR="${D}"
+}
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.19.0
author
#5 lore raw

PATCH 4/4 layer.conf: Add thud to LAYERSERIES_COMPAT

In reply to Khem Raj

2.6 is called thud and is upcoming

---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
index 843277b9..d2a81521 100644
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "freescale-layer"
 BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_freescale-layer = "5"
-LAYERSERIES_COMPAT_freescale-layer = "sumo"
+LAYERSERIES_COMPAT_freescale-layer = "sumo thud"
 
 # Add the Freescale-specific licenses into the metadata
 LICENSE_PATH += "${LAYERDIR}/custom-licenses"
Signature · 1 line
2.19.0