diff options
| author | Bjørn Mork <bjorn@mork.no> | 2018-07-31 14:01:12 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-07-31 14:06:07 +0200 |
| commit | 5f23d0f3db94155ad4b621f68c18de7ad34d598d (patch) | |
| tree | a1d714cf131ebfb62028f6197151d945916160fe | |
| parent | 58281139866d6f18898680c7f6a80aaa3781a265 (diff) | |
| download | upstream-5f23d0f3db94155ad4b621f68c18de7ad34d598d.tar.gz upstream-5f23d0f3db94155ad4b621f68c18de7ad34d598d.tar.bz2 upstream-5f23d0f3db94155ad4b621f68c18de7ad34d598d.zip | |
include/feeds.mk: fix distfeeds.conf without per-feed repos
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>
(cherry picked from commit c72f3b5e2b7e9a86488046bb6e2396f2354b82c9)
| -rw-r--r-- | include/feeds.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/feeds.mk b/include/feeds.mk index 3e0801e656..d20cdfe069 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -34,8 +34,8 @@ endef define FeedSourcesAppend ( \ echo 'src/gz %d_core %U/targets/%S/packages'; \ - echo 'src/gz %d_base %U/packages/%A/base'; \ $(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)';)))) \ |