Commit graph

55 commits

Author SHA1 Message Date
John Crispin
2e2c04777b build: allow openwrt.git packages to be replaced by feeds
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>

SVN-Revision: 44334
2015-02-09 12:09:23 +00:00
John Crispin
b6f268d775 build: revert r44076
the patch causes issues when installing feeds

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 44078
2015-01-22 13:13:09 +00:00
John Crispin
de3bf7e4c2 build: allow openwrt.git packages to be replaced by feeds
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>

SVN-Revision: 44076
2015-01-22 09:35:40 +00:00
John Crispin
590b855c26 scripts/feeds: handle missing/broken feeds better
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>

SVN-Revision: 42891
2014-10-13 19:41:27 +00:00
Jo-Philipp Wich
a720dd209f build: introduce per feed repository support
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
2014-08-05 11:24:24 +00:00
Felix Fietkau
dcb5d00875 scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41407
2014-06-30 06:50:22 +00:00
Luka Perkov
49722e7dcb feeds: enable cloning of specific git commit
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>

SVN-Revision: 38172
2013-09-25 13:02:55 +00:00
Florian Fainelli
a1267290ed scripts/feeds: ensure that --ff is enabled
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>

SVN-Revision: 37884
2013-09-02 18:25:10 +00:00
Jo-Philipp Wich
103b69e250 feeds: fix check for core packages that are not in the package/ toplevel directory
SVN-Revision: 36763
2013-05-29 18:17:07 +00:00
Felix Fietkau
3df534502c scripts/feeds: redirect stderr of the which call to /dev/null to avoid potentially confusing error messages on some systems
SVN-Revision: 32499
2012-06-25 00:27:03 +00:00
Felix Fietkau
85f1a2c67a add further countermeasures against the git core.autocrlf option (fixes #9075)
SVN-Revision: 31650
2012-05-08 13:30:54 +00:00
Felix Fietkau
34ffb526a2 build: rework verbosity level selection
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)

SVN-Revision: 31484
2012-04-26 17:53:56 +00:00
Mirko Vogt
1f489e4084 re-enable shallow git clones ('--depth 1')
SVN-Revision: 31469
2012-04-24 18:19:16 +00:00
Mirko Vogt
2ebcd4707c include revisions of feeds when listing them
SVN-Revision: 31467
2012-04-24 12:56:18 +00:00
Felix Fietkau
e925dbf704 scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)
SVN-Revision: 28503
2011-10-21 13:03:37 +00:00
Jo-Philipp Wich
a02ba6ccc2 Add support for git-svn package feeds Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
SVN-Revision: 26988
2011-05-24 09:30:24 +00:00
Felix Fietkau
3945267a99 scripts/feeds: support checking out git trees with different branches
SVN-Revision: 24285
2010-12-06 16:57:25 +00:00
Florian Fainelli
0d74b45467 add support for darcs-based feeds
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>

SVN-Revision: 23616
2010-10-24 12:36:51 +00:00
Michael Büsch
b5cfdcd278 Fix typo
SVN-Revision: 23524
2010-10-18 21:43:50 +00:00
Jo-Philipp Wich
adcfdc46e0 feeds: restore previously active feed after install_package(), fixes install all case for packages with inter-feed dependencies
SVN-Revision: 23171
2010-10-02 02:37:27 +00:00
Felix Fietkau
198f027c4b scripts/feeds: fix a bug in the metadata caching change
SVN-Revision: 22819
2010-08-26 21:40:16 +00:00
Felix Fietkau
76d517b629 scripts/feeds: switch to the right feed metadata when installing a package to fix dependency handling (patch by matthijs from #5891)
SVN-Revision: 22815
2010-08-26 15:13:47 +00:00
Felix Fietkau
f9ff9d02f6 scripts/feeds: cache feed metadata instead of re-reading it on every get_feed() call
SVN-Revision: 22814
2010-08-26 15:13:42 +00:00
Hamish Guthrie
1d2f157928 Revert r22094 and r22095
SVN-Revision: 22096
2010-07-08 16:15:57 +00:00
Hamish Guthrie
6a7c2c244f Added --non-interactive flag to svn package downloads
SVN-Revision: 22095
2010-07-08 15:44:24 +00:00
Hamish Guthrie
6615374f13 add --trust-server-cert to svn checkout of feeds
SVN-Revision: 22094
2010-07-08 15:27:33 +00:00
Felix Fietkau
caf8074566 scripts/feeds: fix an error message
SVN-Revision: 17451
2009-08-31 14:28:24 +00:00
Felix Fietkau
1428bca7f5 scripts/feeds: ignore virtual packages
SVN-Revision: 15706
2009-05-08 10:39:32 +00:00
Felix Fietkau
ddcfaeb1e5 move host build in packages into a separate namespace: package/<name>/host/<target> this allows dependencies between host and target packages, and saves unnecessary host builds for packages that contain both variants
SVN-Revision: 14905
2009-03-17 02:20:34 +00:00
Ralph Hempel
89181213dc check for correct make version ( thanks to Thomas )
SVN-Revision: 14727
2009-03-02 17:34:34 +00:00
Nicolas Thill
177b22a541 feeds: extend 'search' to lookup in source package names too
SVN-Revision: 14537
2009-02-17 03:44:43 +00:00
Felix Fietkau
5918719e1e scripts/feeds update:
* 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

SVN-Revision: 13782
2008-12-31 14:52:10 +00:00
Mirko Vogt
b49a749114 increased SCAN_DEPTH for feeds/ by 1
SVN-Revision: 13572
2008-12-09 23:37:21 +00:00
Steven Barth
af42e36df0 Detect changed feed urls and rebase working copies if needed. (Patch by xMff)
SVN-Revision: 13138
2008-11-07 14:01:22 +00:00
Felix Fietkau
df90f52b5a add support for conditional depends to the feeds script
SVN-Revision: 13004
2008-10-18 19:36:44 +00:00
Felix Fietkau
b0e7c7ba79 implement conditional dependencies for menuconfig and build deps
SVN-Revision: 12820
2008-10-01 21:26:19 +00:00
Felix Fietkau
033d2f6ca6 scripts/feeds: allow multiple alternative urls for a single feed. this will be useful for maintaining release branch forks of /packages
SVN-Revision: 12746
2008-09-27 22:57:58 +00:00
Steven Barth
551bee5fa6 Fixed dependency handling for feeds
SVN-Revision: 12615
2008-09-16 20:25:36 +00:00
Felix Fietkau
2311fc9850 replace the deprecated git-* command calls with git *
SVN-Revision: 12379
2008-08-24 13:40:21 +00:00
Felix Fietkau
a74bb3b417 rename feeds.conf to feeds.conf.default, make feeds.conf override feeds.conf.default this makes it possible to change the feeds lists without having the version control system record it as a change
SVN-Revision: 12328
2008-08-17 09:05:01 +00:00
Florian Fainelli
067a1fe3b6 scripts/feeds calls 'make' irrespective of the platform it is 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>

SVN-Revision: 12246
2008-08-08 21:30:08 +00:00
Felix Fietkau
bcf75aca7b scripts/feeds: fix some installation warnings for locally installed packages
SVN-Revision: 12102
2008-08-04 22:22:29 +00:00
Felix Fietkau
311553c77b fix scripts/feeds dependency lookup: process deps for all virtual packages of a src package that belongs to the package that the user wants to install
SVN-Revision: 12101
2008-08-04 22:03:28 +00:00
Nicolas Thill
c7b3dff10c install dependencies after installing package to avoid deep recursion and mass memory consuption
SVN-Revision: 10823
2008-04-13 22:36:51 +00:00
Nicolas Thill
4e319c572f install build-depends packages as well
SVN-Revision: 10793
2008-04-12 09:37:44 +00:00
Felix Fietkau
7e2fc31830 fix error message in scripts/feeds when indexes are missing
SVN-Revision: 10736
2008-04-05 14:32:08 +00:00
Felix Fietkau
1d3ed2fca0 fix a recursive symlink issue with scripts/feeds and src-link
SVN-Revision: 10714
2008-04-02 21:27:21 +00:00
Ralph Hempel
585997f8d2 fix package/symlinks target, will call scripts/feeds update / install 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)
SVN-Revision: 10634
2008-03-20 17:08:24 +00:00
Ralph Hempel
0e158467a4 fix multiple update (cpy), 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
SVN-Revision: 10614
2008-03-18 15:50:29 +00:00
Ralph Hempel
2dd0677c86 - added package list function -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

SVN-Revision: 10322
2008-01-30 09:22:05 +00:00