From 91d222df49cf8f257a0e08552f64c08d72a6ce1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 11 Jul 2024 06:07:06 +0000 Subject: [PATCH] PROVISORY: profiles: fix debug.yml iw-full package clashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently both MxL and QCA based reference targets use heavilly patched `iw` packages which are clashing with the upstream `iw-full` package which can be added via `debug.yml` profile and results in following build failure: Collected errors: * check_data_file_clashes: Package iw-full wants to install file build_dir/target-aarch64_cortex-a73+neon-vfpv4_musl/root-ipq95xx/usr/sbin/iw But that file is already provided by package * iw-qca * opkg_install_cmd: Cannot install package iw-full. This is a violation of prpl LL-API compliance and is hopefully going to be resolved soon, but until the `iw-qca` and `iwlwav-iw` packages are finally gone, lets workaround it by removing the `iw-full` package from `debug.yml` and moving it into respective profiles, thus shipping `iw-full` package in those targets by default. References: PCF-558 Signed-off-by: Petr Štetiar --- profiles/debug.yml | 1 - profiles/ipq807x.yml | 1 + profiles/mvebu.yml | 1 + profiles/x86_64.yml | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/profiles/debug.yml b/profiles/debug.yml index 1a43cdef4e..45b4fe2dde 100644 --- a/profiles/debug.yml +++ b/profiles/debug.yml @@ -7,7 +7,6 @@ packages: - gdb - gdbserver - wpa-cli - - iw-full diffconfig: | CONFIG_BUSYBOX_DEFAULT_FEATURE_REVERSE_SEARCH=y diff --git a/profiles/ipq807x.yml b/profiles/ipq807x.yml index 5564da1f0b..199d17afe9 100644 --- a/profiles/ipq807x.yml +++ b/profiles/ipq807x.yml @@ -7,3 +7,4 @@ description: Build image for prpl Foundation Haze board packages: - hostapd-utils + - iw-full diff --git a/profiles/mvebu.yml b/profiles/mvebu.yml index 50196751ec..aab72a2635 100644 --- a/profiles/mvebu.yml +++ b/profiles/mvebu.yml @@ -9,6 +9,7 @@ description: Build image for the Linksys WRT3200ACM (Rango), WRT32X (Venom), Tur packages: - hostapd-utils + - iw-full diffconfig: | CONFIG_TESTING_KERNEL=y diff --git a/profiles/x86_64.yml b/profiles/x86_64.yml index 243e651af3..b69be24f38 100644 --- a/profiles/x86_64.yml +++ b/profiles/x86_64.yml @@ -7,6 +7,7 @@ description: Build image for x86/64 generic target packages: - hostapd-utils + - iw-full - kmod-mac80211-hwsim - wpad-basic