aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-07-18 10:47:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-07-18 10:47:00 +0000
commit6640b83a3ed626b6c233a48b9f271a52b5ffb980 (patch)
treef5143305b9fe5446dd0f6378d4825c2171a3ff4f
parent8aa106cf43fff5c05c14cff09071e95fc0a22996 (diff)
downloadupstream-6640b83a3ed626b6c233a48b9f271a52b5ffb980.tar.gz
upstream-6640b83a3ed626b6c233a48b9f271a52b5ffb980.tar.bz2
upstream-6640b83a3ed626b6c233a48b9f271a52b5ffb980.zip
build: add kernel modules to package provides info (along with shared libs)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37385
-rw-r--r--include/package-ipkg.mk4
-rw-r--r--package/kernel/linux/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 20361de9e8..73fed05b17 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -128,12 +128,12 @@ ifeq ($(DUMP),)
$(call Package/$(1)/install,$$(IDIR_$(1)))
-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
@( \
- find $$(IDIR_$(1)) -name lib\*.so\* | awk -F/ '{ print $$$$NF }'; \
+ find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \
for file in $$(patsubst %,$(PKG_INFO_DIR)/%.provides,$$(IDEPEND_$(1))); do \
if [ -f "$$$$file" ]; then \
cat $$$$file; \
fi; \
- done; \
+ done; $(Package/$(1)/extra_provides) \
) | sort -u > $(PKG_INFO_DIR)/$(1).provides
$(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
$(CheckDependencies)
diff --git a/package/kernel/linux/Makefile b/package/kernel/linux/Makefile
index d44b5a7767..4ca442f2a5 100644
--- a/package/kernel/linux/Makefile
+++ b/package/kernel/linux/Makefile
@@ -46,6 +46,10 @@ define Package/kernel/install
# nothing to do
endef
+define Package/kernel/extra_provides
+ sed -e 's,.*/,,' $(LINUX_DIR)/modules.builtin;
+endef
+
$(eval $(if $(DUMP),,$(call BuildPackage,kernel)))
include $(sort $(wildcard ./modules/*.mk))