diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-27 11:22:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-27 11:22:20 +0000 |
| commit | 6c21bcaa65d0b9c38f60a9735de59cf441c3be52 (patch) | |
| tree | 43d42290c9a785d8290d37b7e61f25b44d0f46a5 /target/imagebuilder/Makefile | |
| parent | 4d96170c32c8f4ae54d1a632261c13f2b19eed1e (diff) | |
| download | upstream-6c21bcaa65d0b9c38f60a9735de59cf441c3be52.tar.gz upstream-6c21bcaa65d0b9c38f60a9735de59cf441c3be52.tar.bz2 upstream-6c21bcaa65d0b9c38f60a9735de59cf441c3be52.zip | |
IB: use online repositories
Change the IB packaging to only embed libc, kernel and kmod packages by default
and generate repositories.conf to refer to the remote package repositories.
Introduce a new config option CONFIG_IB_STANDALONE which restores the old
behaviour of building self contained IB archives.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 45772
Diffstat (limited to 'target/imagebuilder/Makefile')
| -rw-r--r-- | target/imagebuilder/Makefile | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 1f97cb8613..218def7e1d 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/version.mk +include $(INCLUDE_DIR)/feeds.mk override MAKEFLAGS= @@ -33,8 +34,38 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ $(PKG_BUILD_DIR)/ + +ifeq ($(CONFIG_IB_STANDALONE),) + echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf + ifeq ($(CONFIG_PER_FEED_REPO),) + echo "src/gz %n %U" >> $(PKG_BUILD_DIR)/repositories.conf + else + for d in base $(FEEDS_ENABLED); do \ + echo "src/gz %n_$$d %U/$$d" >> $(PKG_BUILD_DIR)/repositories.conf; \ + done + ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) + for d in $(FEEDS_DISABLED); do \ + echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$$d %U/$$d" >> $(PKG_BUILD_DIR)/repositories.conf; \ + done + endif + endif +endif + + echo '## This is the local package repository, do not remove!' >> $(PKG_BUILD_DIR)/repositories.conf + echo 'src imagebuilder file:packages' >> $(PKG_BUILD_DIR)/repositories.conf + $(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf + +ifeq ($(CONFIG_IB_STANDALONE),) + (cd $(PACKAGE_DIR); $(FIND) -type f -name 'libc_*.ipk' -or -name 'kernel_*.ipk' -or -name 'kmod-*.ipk') | \ + while read path; do \ + mkdir -p "$(PKG_BUILD_DIR)/packages/$${path%/*}"; \ + cp "$(PACKAGE_DIR)/$$path" "$(PKG_BUILD_DIR)/packages/$$path"; \ + done +else $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages +endif + $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \ $(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \ |