aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/feeds
Commit message (Collapse)AuthorAgeFilesLines
* build: revert r44076John Crispin2015-01-221-18/+7
| | | | | | | | the patch causes issues when installing feeds Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44078 3c298f89-4303-0410-b956-a3cf2f4a3e73
* build: allow openwrt.git packages to be replaced by feedsJohn Crispin2015-01-221-7/+18
| | | | | | | | | | | | | | | | | | | | | Currently, replacing a package available in openwrt.git requires modifications in openwrt.git, or requires duplicating the package in a feed but with a different name, which causes all kind of problems related to dependencies (all packages selecting it would have to be modified accordingly to select the new package). With this change, if a package with the same name is present both in feeds/ and package/ folders, the one in feeds/ can override the one in package/, both in the menuconfig and during the build, by passing the "-f" option to "./scripts/feeds install" This mechanism is particularly useful for vendor tree, or in general for application which needs to replace one particular package which exists within openwrt.git by a custom/newer version. Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44076 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: handle missing/broken feeds betterJohn Crispin2014-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pts/feeds update -a" can fail rather silently for feeds using git, as the script does not pause when updating a feed fails. Instead it prints the error message and calmly continues to the next feed. It is very easy to overlook update errors with the feeds updated first, as their text scrolls rapidly away from the screen. This behaviour has not been a big problem with svn feeds, as svn update stops with a conflict message and interactively forces the user to resolve or postpone the conflict. In any case the svn error is noticed by the user. Majority of the feeds use now git, so this silent failure can affect users doing private builds in an increasing amount. Below is an example of update failing and script continuing: perus@v1404:/Openwrt/barrier$ ./scripts/feeds update -a Updating feed 'packages' from 'https://github.com/openwrt/packages.git;for-14.07' ... remote: Counting objects: 17, done. remote: Compressing objects: 100% (15/15), done. remote: Total 17 (delta 10), reused 8 (delta 1) Unpacking objects: 100% (17/17), done. From https://github.com/openwrt/packages 62031da..dc26009 for-14.07 -> origin/for-14.07 Updating 62031da..dc26009 error: Your local changes to the following files would be overwritten by merge: utils/collectd/Makefile Please, commit your changes or stash them before you can merge. Aborting failed. Updating feed 'luci' from 'http://git.openwrt.org/project/luci.git;luci-0.12' ... Already up-to-date. Create index file './feeds/luci.index' Updating feed 'routing' from 'https://github.com/openwrt-routing/packages.git;for-14.07' ... ... The script prints "failed.", but does not break the updating process. The "update_feed" function returns an error code 1, but that value is not checked in the "update" function, which continues to the next feed. Return 1 as error: ​https://dev.openwrt.org/browser/trunk/scripts/feeds#L547 Call to update_feed without any error monitoring: ​https://dev.openwrt.org/browser/trunk/scripts/feeds#L585 The included patch makes the feeds script to stop updating after failing to update a feed. The script continues to the refresh_config step despite a possible failure in updating, so the stopping action just prevents the other feeds from updating and makes the error more clearly visible. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42891 3c298f89-4303-0410-b956-a3cf2f4a3e73
* build: introduce per feed repository supportJo-Philipp Wich2014-08-051-1/+25
| | | | | | | | | 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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42002 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)Felix Fietkau2014-06-301-0/+1
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41407 3c298f89-4303-0410-b956-a3cf2f4a3e73
* feeds: enable cloning of specific git commitLuka Perkov2013-09-251-2/+8
| | | | | | | | | | Following syntax should be used to enable this feature: src-git custom git://openwrt/custom-feed^SHA_COMMIT_ID Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38172 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: ensure that --ff is enabledFlorian Fainelli2013-09-021-1/+1
| | | | | | | | | | | Users may have merge.ff set to false, which will force merge commits to be generated. The intent here is to have a fast-forward merge when possible, so let's make sure fast-forwards are enabled. Signed-off-by: John Szakmeister <john@szakmeister.net> Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37884 3c298f89-4303-0410-b956-a3cf2f4a3e73
* feeds: fix check for core packages that are not in the package/ toplevel ↵Jo-Philipp Wich2013-05-291-1/+10
| | | | | | directory git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36763 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: redirect stderr of the which call to /dev/null to avoid ↵Felix Fietkau2012-06-251-1/+1
| | | | | | potentially confusing error messages on some systems git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32499 3c298f89-4303-0410-b956-a3cf2f4a3e73
* add further countermeasures against the git core.autocrlf option (fixes #9075)Felix Fietkau2012-05-081-0/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31650 3c298f89-4303-0410-b956-a3cf2f4a3e73
* build: rework verbosity level selectionFelix Fietkau2012-04-261-1/+1
| | | | | | | | | | | | | V=99 and V=1 are now deprecated in favor of a new verbosity class system, though the old flags are still supported. You can set the V variable on the command line (or OPENWRT_VERBOSE in the environment) to one or more of the following characters: - s: stdout+stderr (equal to the old V=99) - c: commands (for build systems that suppress commands by default, e.g. kbuild) - w: warnings/errors only (equal to the old V=1) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31484 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [scripts/feeds] re-enable shallow git clones ('--depth 1')Mirko Vogt2012-04-241-2/+2
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31469 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [scripts/feeds] include revisions of feeds when listing themMirko Vogt2012-04-241-14/+37
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31467 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: override the OPENWRT_BUILD variable when calling internal ↵Felix Fietkau2011-10-211-2/+2
| | | | | | targets (based on patch from #10212) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28503 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [PATCH] Add support for git-svn package feedsJo-Philipp Wich2011-05-241-0/+5
| | | | | | | Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26988 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: support checking out git trees with different branchesFelix Fietkau2010-12-061-1/+7
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24285 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [feeds] add support for darcs-based feedsFlorian Fainelli2010-10-241-1/+6
| | | | | | | | | | | | | The following patch adds support for darcs-based feeds. It is tested and works well for my purpose. I wish it were committed upstream so that I can share my feed with other users without converting it to svn/git/whatever. Best regards, Signed-off-by: Gabriel Kerneis <kerneis@pps.jussieu.fr> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23616 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Fix typoMichael Büsch2010-10-181-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23524 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [scripts] feeds: restore previously active feed after install_package(), ↵Jo-Philipp Wich2010-10-021-0/+1
| | | | | | fixes install all case for packages with inter-feed dependencies git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23171 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: fix a bug in the metadata caching changeFelix Fietkau2010-08-261-2/+2
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22819 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: switch to the right feed metadata when installing a package ↵Felix Fietkau2010-08-261-2/+5
| | | | | | to fix dependency handling (patch by matthijs from #5891) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22815 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: cache feed metadata instead of re-reading it on every ↵Felix Fietkau2010-08-261-14/+24
| | | | | | get_feed() call git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22814 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Revert r22094 and r22095Hamish Guthrie2010-07-081-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22096 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Added --non-interactive flag to svn package downloadsHamish Guthrie2010-07-081-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22095 3c298f89-4303-0410-b956-a3cf2f4a3e73
* add --trust-server-cert to svn checkout of feedsHamish Guthrie2010-07-081-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22094 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: fix an error messageFelix Fietkau2009-08-311-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17451 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: ignore virtual packagesFelix Fietkau2009-05-081-0/+3
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15706 3c298f89-4303-0410-b956-a3cf2f4a3e73
* move host build in packages into a separate namespace: ↵Felix Fietkau2009-03-171-1/+2
| | | | | | | | package/<name>/host/<target> this allows dependencies between host and target packages, and saves unnecessary host builds for packages that contain both variants git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14905 3c298f89-4303-0410-b956-a3cf2f4a3e73
* check for correct make versionRalph Hempel2009-03-021-2/+10
| | | | | | | ( thanks to Thomas ) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14727 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [scrips] feeds: extend 'search' to lookup in source package names tooNicolas Thill2009-02-171-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14537 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds update:Felix Fietkau2008-12-311-50/+42
| | | | | | | | | | | * Fix feed update via git. * Add support for bzr and hg. * Proper escaping of command line arguments handed to system. * Reduced code duplication. Patch by Justus Winter git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13782 3c298f89-4303-0410-b956-a3cf2f4a3e73
* increased SCAN_DEPTH for feeds/ by 1Mirko Vogt2008-12-091-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13572 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Detect changed feed urls and rebase working copies if needed. (Patch by xMff)Steven Barth2008-11-071-7/+43
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13138 3c298f89-4303-0410-b956-a3cf2f4a3e73
* add support for conditional depends to the feeds scriptFelix Fietkau2008-10-181-1/+2
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73
* implement conditional dependencies for menuconfig and build depsFelix Fietkau2008-10-011-0/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12820 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: allow multiple alternative urls for a single feed. this will ↵Felix Fietkau2008-09-271-5/+12
| | | | | | be useful for maintaining release branch forks of /packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12746 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Fixed dependency handling for feedsSteven Barth2008-09-161-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12615 3c298f89-4303-0410-b956-a3cf2f4a3e73
* replace the deprecated git-* command calls with git *Felix Fietkau2008-08-241-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12379 3c298f89-4303-0410-b956-a3cf2f4a3e73
* rename feeds.conf to feeds.conf.default, make feeds.conf override ↵Felix Fietkau2008-08-171-1/+3
| | | | | | feeds.conf.default this makes it possible to change the feeds lists without having the version control system record it as a change git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12328 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds calls 'make' irrespective of the platform it isFlorian Fainelli2008-08-081-5/+9
| | | | | | | | | | | running on. The attached patch changes the code to use gmake if available (which should cover non-linux platforms, and is the same logic used to adapt other programs in include/host.mk) (#3867) Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12246 3c298f89-4303-0410-b956-a3cf2f4a3e73
* scripts/feeds: fix some installation warnings for locally installed packagesFelix Fietkau2008-08-041-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12102 3c298f89-4303-0410-b956-a3cf2f4a3e73
* fix scripts/feeds dependency lookup: process deps for all virtual packages ↵Felix Fietkau2008-08-041-4/+6
| | | | | | of a src package that belongs to the package that the user wants to install git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12101 3c298f89-4303-0410-b956-a3cf2f4a3e73
* install dependencies after installing package to avoid deep recursion and ↵Nicolas Thill2008-04-131-7/+7
| | | | | | mass memory consuption git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10823 3c298f89-4303-0410-b956-a3cf2f4a3e73
* install build-depends packages as wellNicolas Thill2008-04-121-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10793 3c298f89-4303-0410-b956-a3cf2f4a3e73
* fix error message in scripts/feeds when indexes are missingFelix Fietkau2008-04-051-1/+7
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10736 3c298f89-4303-0410-b956-a3cf2f4a3e73
* fix a recursive symlink issue with scripts/feeds and src-linkFelix Fietkau2008-04-021-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10714 3c298f89-4303-0410-b956-a3cf2f4a3e73
* fix package/symlinks target, will call scripts/feeds update / installRalph Hempel2008-03-201-5/+5
| | | | | | | | | | introduce new package/symlinks-install and package/symlinks-clean targets - package/symlink-install will re-create the index files and the symlinks for all ./feeds (no update from repositories is performed) - package/symlink-clean will delete all installed symlinks (keeping the ./feeds untouched) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10634 3c298f89-4303-0410-b956-a3cf2f4a3e73
* fix multiple update (cpy), Ralph Hempel2008-03-181-40/+124
| | | | | | | | | added index generation (allows to re-create the index without updating the complete package) possible to specify the feed(s) which should be updated added -h switch to most of the commands git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10614 3c298f89-4303-0410-b956-a3cf2f4a3e73
* - added package list functionRalph Hempel2008-01-301-7/+47
| | | | | | | | | | | | | -r list packages of specified feed -s list the feed names only and their URL - refresh of usage text -d-This line, and those below, will be ignored-- M feeds git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10322 3c298f89-4303-0410-b956-a3cf2f4a3e73
* cleanups, small fixes and improvements for the feeds scriptFelix Fietkau2008-01-271-37/+28
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10281 3c298f89-4303-0410-b956-a3cf2f4a3e73