EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel: avoid underscore in *6lowpan package names

Browse Source 
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 <cotequeiroz@gmail.com>
This commit is contained in:
Eneas U de Queiroz 2020-02-18 17:47:20 -03:00 committed by Hans Dedecker
parent 731f7ea48a
commit 07e1d88d7b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/linux/modules/other.mk
View File

@ -84,7 +84,7 @@ endef
$(eval $(call KernelPackage,ath3k)) $(eval $(call KernelPackage,ath3k))
define KernelPackage/bluetooth_6lowpan define KernelPackage/bluetooth-6lowpan
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth 6LoWPAN support TITLE:=Bluetooth 6LoWPAN support
DEPENDS:=+kmod-6lowpan +kmod-bluetooth DEPENDS:=+kmod-6lowpan +kmod-bluetooth
@ -93,11 +93,11 @@ define KernelPackage/bluetooth_6lowpan
AUTOLOAD:=$(call AutoProbe,bluetooth_6lowpan) AUTOLOAD:=$(call AutoProbe,bluetooth_6lowpan)
endef endef
define KernelPackage/bluetooth_6lowpan/description define KernelPackage/bluetooth-6lowpan/description
Kernel support for 6LoWPAN over Bluetooth Low Energy devices Kernel support for 6LoWPAN over Bluetooth Low Energy devices
endef endef
$(eval $(call KernelPackage,bluetooth_6lowpan)) $(eval $(call KernelPackage,bluetooth-6lowpan))
define KernelPackage/btmrvl define KernelPackage/btmrvl

6
package/kernel/linux/modules/wpan.mk
View File

@ -116,7 +116,7 @@ endef
$(eval $(call KernelPackage,cc2520)) $(eval $(call KernelPackage,cc2520))
define KernelPackage/ieee802154_6lowpan define KernelPackage/ieee802154-6lowpan
SUBMENU:=$(WPAN_MENU) SUBMENU:=$(WPAN_MENU)
TITLE:= 6LoWPAN support over IEEE-802.15.4 TITLE:= 6LoWPAN support over IEEE-802.15.4
DEPENDS:=+kmod-6lowpan +kmod-ieee802154 DEPENDS:=+kmod-6lowpan +kmod-ieee802154
@ -126,8 +126,8 @@ define KernelPackage/ieee802154_6lowpan
AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan) AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan)
endef endef
define KernelPackage/ieee802154_6lowpan/description define KernelPackage/ieee802154-6lowpan/description
IPv6 compression over IEEE 802.15.4 IPv6 compression over IEEE 802.15.4
endef endef
$(eval $(call KernelPackage,ieee802154_6lowpan)) $(eval $(call KernelPackage,ieee802154-6lowpan))