MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2025-10-22 14:52:19 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #894 from hongxu-jia/master

Browse Source 
support user merge
This commit is contained in:
Otavio Salvador 2021-10-21 09:03:35 -03:00 committed by GitHub
commit 537fc132d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-dpaa2/dce/dce_git.bb
View File

@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf"
SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \
git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \
file://0001-support-user-merge.patch \
"
SRCREV = "9db9c08379aa89f45f514f4f3f0a8e8212198758"
SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3"

31
recipes-dpaa2/dce/files/0001-support-user-merge.patch Normal file
View File

@ -0,0 +1,31 @@
From d4aa7f64db5841242257c5b30dd652afd0f6ff68 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 20 Oct 2021 14:00:35 +0800
Subject: [PATCH] support user merge
Use Yocto base_sbindir to replace hardcode ./sbin
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 62eff25..18b79b1 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ CFLAGS += -fdiagnostics-color
LDFLAGS = -static -Wl,--hash-style=gnu ${EXTRA_CFLAGS}
-PREFIX = $(DESTDIR)/sbin
+base_sbindir ?= ./sbin
+PREFIX = $(DESTDIR)/${base_sbindir}
HEADER_DEPENDENCIES = $(subst .o,.d,$(OBJS))
--
2.27.0

4
recipes-extended/odp/odp-counters_git.bb
View File

@ -9,6 +9,6 @@ do_compile:prepend () {
}
do_install () {
install -d ${D}/lib/modules/${KERNEL_VERSION}/odp
install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}/lib/modules/${KERNEL_VERSION}/odp
install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
install -m 755 ${S}/test/debug/perf_counters/odpfsl_perfcounters.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
}

4
recipes-extended/odp/odp-module_git.bb
View File

@ -9,8 +9,8 @@ do_compile:prepend () {
}
do_install () {
install -d ${D}/lib/modules/${KERNEL_VERSION}/odp
install -m 755 ${S}/kern/odpfsl_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/odp
install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
install -m 755 ${S}/kern/odpfsl_kni.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/odp
}
PKG:${PN} = "kernel-module-${PN}"

4
recipes-kernel/kernel-modules/kernel-module-ar_git.bb
View File

@ -19,9 +19,9 @@ do_compile:prepend() {
}
do_install(){
install -d ${D}/lib/modules/${KERNEL_VERSION}
install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
install -d ${D}${bindir}
install -m 644 ${B}/bin/ar.ko ${D}/lib/modules/${KERNEL_VERSION}/
install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
cp -f ${S}/bin/ar_* ${D}${bindir}/
}