c72f3b5e2b
commit 514a4b3e1b4e4 ("include/feeds.mk: rework generation of opkg
distfeeds.conf") made the per-feed "base" repo unconditional, making
the default configuration fail when PER_FEED_REPO is disabled:
root@wrt1900ac-1:~# cat /etc/opkg/distfeeds.conf
src/gz openwrt_core http://openwrt.mork.no/18.06.0/targets/mvebu/cortexa9/packages
src/gz openwrt_base http://openwrt.mork.no/18.06.0/packages/arm_cortex-a9_vfpv3/base
root@wrt1900ac-1:~# opkg update
Downloading http://openwrt.mork.no/18.06.0/targets/mvebu/cortexa9/packages/Packages.gz
Updated list of available packages in /var/opkg-lists/openwrt_core
Downloading http://openwrt.mork.no/18.06.0/targets/mvebu/cortexa9/packages/Packages.sig
Signature check passed.
Downloading http://openwrt.mork.no/18.06.0/packages/arm_cortex-a9_vfpv3/base/Packages.gz
*** Failed to download the package list from http://openwrt.mork.no/18.06.0/packages/arm_cortex-a9_vfpv3/base/Packages.gz
Collected errors:
* opkg_download: Failed to download http://openwrt.mork.no/18.06.0/packages/arm_cortex-a9_vfpv3/base/Packages.gz, wget returned 8.
Cc: Matthias Schiffer <mschiffer@universe-factory.net>
Fixes: 514a4b3e1b4e ("include/feeds.mk: rework generation of opkg distfeeds.conf")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
[whitespace/indentation fix]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
43 lines
1.3 KiB
Makefile
43 lines
1.3 KiB
Makefile
#
|
|
# Copyright (C) 2014 OpenWrt.org
|
|
# Copyright (C) 2016 LEDE Project
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
-include $(TMP_DIR)/.packagesubdirs
|
|
|
|
FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
|
|
FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n))
|
|
|
|
PACKAGE_SUBDIRS=$(PACKAGE_DIR)
|
|
ifneq ($(CONFIG_PER_FEED_REPO),)
|
|
PACKAGE_SUBDIRS += $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/base
|
|
PACKAGE_SUBDIRS += $(foreach FEED,$(FEEDS_AVAILABLE),$(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(FEED))
|
|
endif
|
|
|
|
opkg_package_files = $(wildcard \
|
|
$(foreach dir,$(PACKAGE_SUBDIRS), \
|
|
$(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
|
|
|
|
# 1: package name
|
|
define FeedPackageDir
|
|
$(strip $(if $(CONFIG_PER_FEED_REPO), \
|
|
$(if $(Package/$(1)/subdir), \
|
|
$(abspath $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES)/$(Package/$(1)/subdir)), \
|
|
$(PACKAGE_DIR)), \
|
|
$(PACKAGE_DIR)))
|
|
endef
|
|
|
|
# 1: destination file
|
|
define FeedSourcesAppend
|
|
( \
|
|
echo 'src/gz %d_core %U/targets/%S/packages'; \
|
|
$(strip $(if $(CONFIG_PER_FEED_REPO), \
|
|
echo 'src/gz %d_base %U/packages/%A/base'; \
|
|
$(foreach feed,$(FEEDS_AVAILABLE), \
|
|
$(if $(CONFIG_FEED_$(feed)), \
|
|
echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )src/gz %d_$(feed) %U/packages/%A/$(feed)';)))) \
|
|
) >> $(1)
|
|
endef
|