From 07e1d88d7beb43a4152460b82976dbe49919b264 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 18 Feb 2020 17:47:20 -0300 Subject: kernel: avoid underscore in *6lowpan package names Packages kmod-bluetooth_6lowpan and kmod-ieee802154_6lowpan contain an underscore in the package name. This causes problems in package/install because when building a list of package files to install offline using opkg, it uses a wildcard of the form $(dir)/$(pkg)_*.ipk. If you were to select kmod-bluetooth=y, but kmod-bluetooth_6lowpan=m, the latter would be picked up by that wildcard, and make package/install would fail: Collected errors: * satisfy_dependencies_for: Cannot satisfy the following dependencies * for kmod-bluetooth_6lowpan: * kmod-6lowpan * opkg_install_cmd: Cannot install package kmod-bluetooth_6lowpan. Changing the wildcard pattern is not trivial, and there may be other places in the build system making this assumption about the package name format. Using a dash in place of the underscore avoids the issue. Signed-off-by: Eneas U de Queiroz --- package/kernel/linux/modules/wpan.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/kernel/linux/modules/wpan.mk') diff --git a/package/kernel/linux/modules/wpan.mk b/package/kernel/linux/modules/wpan.mk index b9e9fa5699..053fa1e4bf 100644 --- a/package/kernel/linux/modules/wpan.mk +++ b/package/kernel/linux/modules/wpan.mk @@ -116,7 +116,7 @@ endef $(eval $(call KernelPackage,cc2520)) -define KernelPackage/ieee802154_6lowpan +define KernelPackage/ieee802154-6lowpan SUBMENU:=$(WPAN_MENU) TITLE:= 6LoWPAN support over IEEE-802.15.4 DEPENDS:=+kmod-6lowpan +kmod-ieee802154 @@ -126,8 +126,8 @@ define KernelPackage/ieee802154_6lowpan AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan) endef -define KernelPackage/ieee802154_6lowpan/description +define KernelPackage/ieee802154-6lowpan/description IPv6 compression over IEEE 802.15.4 endef -$(eval $(call KernelPackage,ieee802154_6lowpan)) +$(eval $(call KernelPackage,ieee802154-6lowpan)) -- cgit v1.2.3