aboutsummaryrefslogtreecommitdiffstats
path: root/include/feeds.mk
Commit message (Collapse)AuthorAgeFilesLines
* include/feeds.mk: fix distfeeds.conf without per-feed reposBjørn Mork2018-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* include/feeds.mk: rework generation of opkg distfeeds.confMatthias Schiffer2018-07-121-6/+5
| | | | | | | Allow enabling/commenting/disabling each feed individually by using a tristate config symbol. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* include/feeds.mk: always add available feeds to PACKAGE_SUBDIRSMatthias Schiffer2018-07-121-5/+1
| | | | | | | | | | | | | | | Setting CONFIG_FEED_... symbols combined two different effects: Disabling a feed in the generated opkg distfeeds.conf, and omitting the feed from PACKAGE_SUBDIRS. It does not make sense to omit built feeds from PACKAGE_SUBDIRS, as it will only lead to packages that can be enabled in .config (and that will consequently be built) not to be found during rootfs creation, breaking the build. All feeds that packages are emitted to should simply always be added to PACKAGE_SUBDIRS instead; the CONFIG_FEED_... only configure the generated distfeeds.conf like this. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* imagebuilder: reuse rootfs preparation from rootfs.mkMatthias Schiffer2018-03-071-2/+0
| | | | | | | | | | | | In addition to removing redundant code, this fixes various issues in IB-generated images that have been fixed in prepare_rootfs before, including better handling of CONFIG_CLEAN_IPKG and enabling of initscripts from FILES. We also reuse the opkg macro and remove --force-... flags that have been removed from rootfs.mk as well. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* merge: properly remove %n / %N referencesJo-Philipp Wich2017-12-091-3/+3
| | | | | | | | | | - use %d instead of %n for opkg feed identifiers - remove %n / %N references from version files Fixes bf5cef47b3 merge: release/banner: drop release name and update banner. Fixes FS#1213. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* build: move PKG_CONFIG_DEPENDS from feeds.mk to opkgFelix Fietkau2017-04-031-6/+0
| | | | | | | Normal packages don't rely on the feed configuration variables for the build step Signed-off-by: Felix Fietkau <nbd@nbd.name>
* include/feeds.mk: base list of enabled feeds on available instead of ↵Matthias Schiffer2017-01-161-1/+1
| | | | | | | | installed feeds This fixes handling of CONFIG_FEED_* options for uninstalled feeds. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* build: remove stale .ipk files if package dir changesFelix Fietkau2016-11-081-0/+4
| | | | | | | | | If a package nonshared status is changed, a stale .ipk file might still be present in the old package directory. Remove the .ipk file from all package directories when building a new one (or explicitly running clean) Signed-off-by: Felix Fietkau <nbd@nbd.name>
* build: move merged package directory from bin/ to staging_dirFelix Fietkau2016-08-031-1/+1
| | | | Signed-off-by: Felix Fietkau <nbd@nbd.name>
* build: create a package feed directory containing all packagesFelix Fietkau2016-08-011-0/+2
| | | | | | Needed for proper dependency handling for per-device rootfs Signed-off-by: Felix Fietkau <nbd@nbd.name>
* build: fix tabs vs whitespace issueFelix Fietkau2016-08-011-6/+6
| | | | Signed-off-by: Felix Fietkau <nbd@nbd.name>
* include/feeds.mk: allow installation from feed packages that are installed ↵Felix Fietkau2016-06-161-1/+1
| | | | | | but no longer in feeds.conf Signed-off-by: Felix Fietkau <nbd@nbd.name>
* include: remove unused FeedPackageDir macro argumentsJo-Philipp Wich2016-04-221-2/+0
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* include/version.mk: rework repository url handlingJo-Philipp Wich2016-04-131-5/+3
| | | | | | | | - Add %A placeholder for substituting the package architecture - Change %U placeholder to refer to the toplevel repository URL - Construct package feed URLs relative to the toplevel one to match new layout Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* include: choose package output directory based on repository infoJo-Philipp Wich2016-04-061-1/+16
| | | | | | | | | | | Use the new repository metadata field to choose the output directory of the final package archives. Non-sharable packages will be placed in the per-target package directory while the rest will be placed in a per-repository sub directory within the $OUTPUT_DIR/packages/$CPU_TYPE/ prefix. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* include: group kmod ipk files into a "kernel" subdirectoryJo-Philipp Wich2016-01-241-3/+3
| | | | | | | | | | 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
* feeds: use common macro "FeedSourcesAppend" to populate opkg configurationsJo-Philipp Wich2015-05-281-0/+13
| | | | | | | | | This introduces a common macro to assemble the correct url templates to avoid code duplication and have the feed config handling in a central place. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 45799
* build: improve feed handling for opkg.confJo-Philipp Wich2014-10-161-1/+3
| | | | | | | | | - Consider not installed feeds as well - Add option to decide whether to comment disabled feeds Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 42931
* include: fix detection of installed feedsJo-Philipp Wich2014-08-061-1/+2
| | | | | | Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 42003
* build: introduce per feed repository supportJo-Philipp Wich2014-08-051-0/+23
This changeset implements a new menuconfig option to generate separate repositories for each enabled package feed instead of one monolithic one. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 42002
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 20:33:07 +0000