diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-24 15:36:05 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-24 15:36:05 +0000 |
| commit | 0333da8943275324d366d562b70f90febbe97e7d (patch) | |
| tree | d01138f8aa9c91cccbf8e85e4fe0f4bb27d602d4 /include | |
| parent | 96afb90f3f96c15cd4bfd6a050538292074cf9da (diff) | |
| download | master-31e0f0ae-0333da8943275324d366d562b70f90febbe97e7d.tar.gz master-31e0f0ae-0333da8943275324d366d562b70f90febbe97e7d.tar.bz2 master-31e0f0ae-0333da8943275324d366d562b70f90febbe97e7d.zip | |
include: group kmod ipk files into a "kernel" subdirectory
This is useful to just use the kmods from an official build while supplying
base packages from a custom feed or the other way around; for just overriding
the kmods with a local repo while using official repos for the rest.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 48475
Diffstat (limited to 'include')
| -rw-r--r-- | include/feeds.mk | 6 | ||||
| -rw-r--r-- | include/kernel.mk | 1 | ||||
| -rw-r--r-- | include/package-defaults.mk | 1 | ||||
| -rw-r--r-- | include/package-dumpinfo.mk | 2 | ||||
| -rw-r--r-- | include/toplevel.mk | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/include/feeds.mk b/include/feeds.mk index b1a8f81da9..4f71b39940 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # --include $(TMP_DIR)/.packagefeeds +-include $(TMP_DIR)/.packagesubdirs FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n) FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) @@ -21,7 +21,7 @@ PKG_CONFIG_DEPENDS += \ # 1: package name define FeedPackageDir $(strip $(if $(CONFIG_PER_FEED_REPO), \ - $(abspath $(PACKAGE_DIR)/$(if $(Package/$(1)/feed),$(Package/$(1)/feed),base)), \ + $(abspath $(PACKAGE_DIR)/$(if $(Package/$(1)/subdir),$(Package/$(1)/subdir),base)), \ $(PACKAGE_DIR))) endef @@ -29,7 +29,7 @@ endef define FeedSourcesAppend ( \ $(strip $(if $(CONFIG_PER_FEED_REPO), \ - $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/$(feed)";) \ + $(foreach feed,base kernel $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/$(feed)";) \ $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \ $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/$(feed)";)) \ , \ diff --git a/include/kernel.mk b/include/kernel.mk index 57185c5fd3..3fa9b89c20 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -155,6 +155,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)) + PACKAGE_SUBDIR:=kernel $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(BOARD)) endef diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 2896b4c783..09efaa39b8 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -17,6 +17,7 @@ define Package/Default CONFIGFILE:= SECTION:=opt CATEGORY:=Extra packages + PACKAGE_SUBDIR:=$(FEED) DEPENDS:= MDEPENDS:= CONFLICTS:= diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index 5bc931e6ab..666e9635bb 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -51,7 +51,7 @@ $(if $(PKG_LICENSE),License: $(PKG_LICENSE) $(if $(KCONFIG),Kernel-Config: $(KCONFIG) )$(if $(BUILDONLY),Build-Only: $(BUILDONLY) )$(if $(HIDDEN),Hidden: $(HIDDEN) -)$(if $(FEED),Feed: $(FEED) +)$(if $(PACKAGE_SUBDIR),Package-Subdir: $(PACKAGE_SUBDIR) )Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE)) $(if $(URL),$(URL) )$(MAINTAINER) diff --git a/include/toplevel.mk b/include/toplevel.mk index d13a37013c..0cba07c6e6 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -84,9 +84,9 @@ prepare-tmpinfo: FORCE f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \ [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $(_ignore) $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \ done - [ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in + [ tmp/.config-feeds.in -nt tmp/.packagesubdirs ] || ./scripts/feeds feed_config > tmp/.config-feeds.in ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; } - ./scripts/metadata.pl package_feeds tmp/.packageinfo > tmp/.packagefeeds || { rm -f tmp/.packagefeeds; false; } + ./scripts/metadata.pl package_subdirs tmp/.packageinfo > tmp/.packagesubdirs || { rm -f tmp/.packagesubdirs; false; } touch $(TOPDIR)/tmp/.build .config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo) |