diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-04-15 10:26:36 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-04-15 10:26:36 +0200 |
| commit | 349e7b635ea819ad34a571bc0adcce9b205df4e9 (patch) | |
| tree | 7471e6116360fba3fcbf989fdfd10ff6d89cf9f5 | |
| parent | abc828b0854b934064b5fe3f6272c3d2158b30c0 (diff) | |
| download | upstream-349e7b635ea819ad34a571bc0adcce9b205df4e9.tar.gz upstream-349e7b635ea819ad34a571bc0adcce9b205df4e9.tar.bz2 upstream-349e7b635ea819ad34a571bc0adcce9b205df4e9.zip | |
include: fix nonshared flag handling
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>
| -rw-r--r-- | include/kernel.mk | 3 | ||||
| -rw-r--r-- | include/package-dumpinfo.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 7333697305..2b87aeba33 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -81,6 +81,7 @@ endif define KernelPackage/Defaults FILES:= AUTOLOAD:= + PKGFLAGS+=nonshared endef define ModuleAutoLoad @@ -155,7 +156,7 @@ define KernelPackage DESCRIPTION:=$(DESCRIPTION) EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)) 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)/$(BOARD)) endef diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index dabeb957c2..b717c1b472 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -41,7 +41,7 @@ $(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT) )$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES) )Section: $(SECTION) Category: $(CATEGORY) -$(if $(filter nonshared,$(PKG_FLAGS)),,Repository: $(if $(FEED),$(FEED),base) +$(if $(filter nonshared,$(PKGFLAGS)),,Repository: $(if $(FEED),$(FEED),base) )Title: $(TITLE) Maintainer: $(MAINTAINER) $(if $(USERID),Require-User: $(USERID) |