diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-18 10:47:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-18 10:47:00 +0000 |
| commit | 0cc7b30e786eacb44c650c170b092f408f4b5906 (patch) | |
| tree | bfa64c8fae501a3159dc11822d2289449df8b2a1 | |
| parent | b476b188506664176b010366e05131156ab02f66 (diff) | |
| download | master-187ad058-0cc7b30e786eacb44c650c170b092f408f4b5906.tar.gz master-187ad058-0cc7b30e786eacb44c650c170b092f408f4b5906.tar.bz2 master-187ad058-0cc7b30e786eacb44c650c170b092f408f4b5906.zip | |
build: add kernel modules to package provides info (along with shared libs)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37385 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-ipkg.mk | 4 | ||||
| -rw-r--r-- | package/kernel/linux/Makefile | 4 |
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)) |