diff mbox series

libdnf: Fix arm arch mapping issues for qemuarmv5

Message ID 20231109103432.1639496-1-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 7d620c754c92da9dcc56a0a7ec9f3355c2ba733e
Headers show
Series libdnf: Fix arm arch mapping issues for qemuarmv5 | expand

Commit Message

Richard Purdie Nov. 9, 2023, 10:34 a.m. UTC 
qemuarmv5 currently fails with:

$ dnf --help
Error: Incorrect or unknown "arch": armv5hl

Fix this by removing the code in libdnf which is trying to be too
clever, we don't need this mappings given the way OE configures rpm.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/libdnf/libdnf_0.72.0.bb             | 1 +
 meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb
index d58ad0353ff..a8685a16048 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.72.0.bb
@@ -10,6 +10,7 @@  SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
            file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
            file://enable_test_data_dir_set.patch \
            file://0001-drop-FindPythonInstDir.cmake.patch \
+           file://armarch.patch \
            "
 
 SRCREV = "908dba63c9e18c86a2d81166ce7523559e65338c"
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
index 671c0a290e8..c9bf85013f4 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
@@ -17,7 +17,7 @@  S = "${WORKDIR}"
 # Since we refer to ROOTLESS_X which is normally enabled per-machine
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit update-rc.d systemd features_check
+inherit systemd features_check
 
 REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}"
 
@@ -64,8 +64,8 @@  do_install() {
 
 RDEPENDS:${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}"
 
-INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ."
-SYSTEMD_SERVICE:${PN} = "xserver-nodm.service"
+#INITSCRIPT_NAME = "xserver-nodm"
+#INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ."
+#SYSTEMD_SERVICE:${PN} = "xserver-nodm.service"
 
 RCONFLICTS:${PN} = "xserver-common (< 1.34-r9) x11-common"