Skip to contentSkip to conversation

recipes,packagegroups: Remove riscv non-building recipes and dependencies

PATCH New Khem Raj 1 participant 1 message Apr 23, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 recipes,packagegroups: Remove riscv non-building recipes and dependencies

since libunwind is not buildable, it results in glog not being buildable and that results in ceres-solver and gperftools opencv needs glob to eenable libeigen

Remove these packages from paackagegroup dependencies as well

---
 .../packagegroups/packagegroup-meta-oe.bb          | 14 ++++++++++----
 .../ceres-solver/ceres-solver_1.14.0.bb            |  3 +++
 meta-oe/recipes-support/glog/glog_0.3.5.bb         |  3 +++
 .../gperftools/gperftools_2.7.90.bb                |  3 +++
 meta-oe/recipes-support/opencv/opencv_4.1.0.bb     |  3 +++
 5 files changed, 22 insertions(+), 4 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +10 -4
index fabb45c88d..650809b625 100644
@@ -129,8 +129,8 @@ RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64el = "nodejs"
 RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad uftrace lshw"
 RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools uftrace lshw"
 RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools uftrace lshw"
-RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "nodejs uftrace lshw"
-RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "nodejs uftrace lshw"
+RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad ltrace nodejs uftrace lshw"
+RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad ltrace nodejs uftrace lshw"
 
 RDEPENDS_packagegroup-meta-oe-extended ="\
     byacc cfengine cfengine-masterfiles cmpi-bindings \
@@ -203,6 +203,9 @@ RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash minicoredumper"
 RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash"
 RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash"
 
+RDEPENDS_packagegroup-meta-oe-kernel_remove_riscv64 = "crash oprofile"
+RDEPENDS_packagegroup-meta-oe-kernel_remove_riscv32 = "crash oprofile"
+
 RDEPENDS_packagegroup-meta-oe-multimedia ="\
     alsa-oss audiofile cdrkit id3lib \
     a2jmidid jack libass libburn libcdio libcdio-paranoia \
@@ -272,8 +275,8 @@ RDEPENDS_packagegroup-meta-oe-support ="\
 
 RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl"
 RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch = "gperftools"
-RDEPENDS_packagegroup-meta-oe-support_remove_riscv64 = "uim"
-RDEPENDS_packagegroup-meta-oe-support_remove_riscv32 = "uim"
+RDEPENDS_packagegroup-meta-oe-support_remove_riscv64 = "ceres-solver glog gperftools uim"
+RDEPENDS_packagegroup-meta-oe-support_remove_riscv32 = "ceres-solver glog gperftools uim"
 RDEPENDS_packagegroup-meta-oe-support_remove_powerpc = "ssiapi"
 
 RDEPENDS_packagegroup-meta-oe-support-egl ="\
@@ -304,6 +307,9 @@ RDEPENDS_packagegroup-meta-oe-ptest-packages = "\
     libee-ptest \
     poco-ptest \
     "
+RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_riscv64 = "oprofile-ptest"
+RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_riscv32 = "oprofile-ptest"
+
 RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = "\
     mcelog-ptest \
 "
meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb +3 -0
index ac463038aa..651c110f75 100644
@@ -13,6 +13,9 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
+COMPATIBLE_HOST_riscv64 = "null"
+COMPATIBLE_HOST_riscv32 = "null"
+
 # We don't want path to eigen3 in ceres-solver RSS to be
 # used by components which use CeresConfig.cmake from their
 # own RSS
meta-oe/recipes-support/glog/glog_0.3.5.bb +3 -0
index 70eef72057..3b416009a2 100644
@@ -21,6 +21,9 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
+COMPATIBLE_HOST_riscv64 = "null"
+COMPATIBLE_HOST_riscv32 = "null"
+
 RDEPENDS_${PN} += "libunwind"
 
 EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
meta-oe/recipes-support/gperftools/gperftools_2.7.90.bb +3 -0
index 9dfb0d974f..dab34f2b04 100644
@@ -20,6 +20,9 @@ S = "${WORKDIR}/git"
 #   do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008
 #   Segmentation fault (core dumped)
 COMPATIBLE_HOST_mipsarch = "null"
+COMPATIBLE_HOST_riscv64 = "null"
+COMPATIBLE_HOST_riscv32 = "null"
+
 # Disable thumb1
 # {standard input}: Assembler messages:
 # {standard input}:434: Error: lo register required -- `ldr pc,[sp]'
meta-oe/recipes-support/opencv/opencv_4.1.0.bb +3 -0
index d781da6005..6fd7bf85ff 100644
@@ -100,6 +100,9 @@ PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
     ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
 
+PACKAGECONFIG_remove_riscv64 = "eigen"
+PACKAGECONFIG_remove_riscv32 = "eigen"
+
 PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
 PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
 PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
Signature · 1 line
2.26.2