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

include: fix nonshared flag handling

Browse Source 
Fix nonshared flag handling to properly deal with source packages defining
both kmod and non-kmod ipks.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-04-15 10:26:36 +02:00
parent abc828b085
commit 349e7b635e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/kernel.mk
View File

@ -81,6 +81,7 @@ endif
define KernelPackage/Defaults define KernelPackage/Defaults
FILES:= FILES:=
AUTOLOAD:= AUTOLOAD:=
PKGFLAGS+=nonshared
endef endef
define ModuleAutoLoad define ModuleAutoLoad
@ -155,7 +156,7 @@ define KernelPackage
DESCRIPTION:=$(DESCRIPTION) DESCRIPTION:=$(DESCRIPTION)
EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)) EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC))
VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
PKG_FLAGS:=nonshared PKGFLAGS:=$(PKGFLAGS)
$(call KernelPackage/$(1)) $(call KernelPackage/$(1))
$(call KernelPackage/$(1)/$(BOARD)) $(call KernelPackage/$(1)/$(BOARD))
endef endef

2
include/package-dumpinfo.mk
View File

@ -41,7 +41,7 @@ $(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT)
)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES) )$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
)Section: $(SECTION) )Section: $(SECTION)
Category: $(CATEGORY) Category: $(CATEGORY)
$(if $(filter nonshared,$(PKG_FLAGS)),,Repository: $(if $(FEED),$(FEED),base) $(if $(filter nonshared,$(PKGFLAGS)),,Repository: $(if $(FEED),$(FEED),base)
)Title: $(TITLE) )Title: $(TITLE)
Maintainer: $(MAINTAINER) Maintainer: $(MAINTAINER)
$(if $(USERID),Require-User: $(USERID) $(if $(USERID),Require-User: $(USERID)