Commit Graph

55 Commits (bc66ec6772d914dd5b533aa9e059df2588620b22)

Author SHA1 Message Date
John Crispin 045c40fb05 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44334 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-02-09 12:09:23 +00:00
John Crispin 6b66328ef4 build: revert r44076
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
2015-01-22 13:13:09 +00:00
John Crispin 7fdb8680e3 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44076 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-22 09:35:40 +00:00
John Crispin 0834da1573 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42891 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-13 19:41:27 +00:00
Jo-Philipp Wich fdb795c3e4 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42002 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-05 11:24:24 +00:00
Felix Fietkau d78513c970 scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41407 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-30 06:50:22 +00:00
Luka Perkov 6eb901700c 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38172 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 13:02:55 +00:00
Florian Fainelli 8f5a397e4d 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37884 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-02 18:25:10 +00:00
Jo-Philipp Wich 018abd325e feeds: fix check for core packages that are not in the package/ toplevel directory
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36763 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-29 18:17:07 +00:00
Felix Fietkau 034fbb7af3 scripts/feeds: redirect stderr of the which call to /dev/null to avoid potentially confusing error messages on some systems
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32499 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-25 00:27:03 +00:00
Felix Fietkau a263dc5a12 add further countermeasures against the git core.autocrlf option (fixes #9075)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31650 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-08 13:30:54 +00:00
Felix Fietkau b5f3dda123 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)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31484 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-26 17:53:56 +00:00
Mirko Vogt cad43b2476 [scripts/feeds] re-enable shallow git clones ('--depth 1')
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31469 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-24 18:19:16 +00:00
Mirko Vogt 4ef95be3d1 [scripts/feeds] include revisions of feeds when listing them
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31467 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-24 12:56:18 +00:00
Felix Fietkau f7606791e3 scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28503 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-21 13:03:37 +00:00
Jo-Philipp Wich 4f4013df57 [PATCH] Add support for git-svn package feeds
Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26988 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-05-24 09:30:24 +00:00
Felix Fietkau 40786544ee scripts/feeds: support checking out git trees with different branches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24285 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-06 16:57:25 +00:00
Florian Fainelli 176fcbe9d8 [feeds] 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23616 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-24 12:36:51 +00:00
Michael Büsch ed2fe1cf2d Fix typo
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23524 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-18 21:43:50 +00:00
Jo-Philipp Wich 36dc978a0e [scripts] feeds: restore previously active feed after install_package(), 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
2010-10-02 02:37:27 +00:00
Felix Fietkau 3320327bad scripts/feeds: fix a bug in the metadata caching change
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22819 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-26 21:40:16 +00:00
Felix Fietkau 85bd82d06f scripts/feeds: switch to the right feed metadata when installing a package to fix dependency handling (patch by matthijs from #5891)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22815 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-26 15:13:47 +00:00
Felix Fietkau 5ec934567a scripts/feeds: cache feed metadata instead of re-reading it on every get_feed() call
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22814 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-26 15:13:42 +00:00
Hamish Guthrie 96e9790a87 Revert r22094 and r22095
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22096 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-08 16:15:57 +00:00
Hamish Guthrie 2f2cf51c25 Added --non-interactive flag to svn package downloads
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22095 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-08 15:44:24 +00:00
Hamish Guthrie 79e21b2ea4 add --trust-server-cert to svn checkout of feeds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22094 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-08 15:27:33 +00:00
Felix Fietkau 57efc68581 scripts/feeds: fix an error message
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17451 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-08-31 14:28:24 +00:00
Felix Fietkau 63629ed8a0 scripts/feeds: ignore virtual packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15706 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-08 10:39:32 +00:00
Felix Fietkau 353386a643 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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14905 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-03-17 02:20:34 +00:00
Ralph Hempel 21a5888e86 check for correct make version
( thanks to Thomas )


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14727 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-03-02 17:34:34 +00:00
Nicolas Thill 2c4b52a3b4 [scrips] feeds: extend 'search' to lookup in source package names too
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14537 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-02-17 03:44:43 +00:00
Felix Fietkau 89662da4f1 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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13782 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-12-31 14:52:10 +00:00
Mirko Vogt ab00ad48d5 increased SCAN_DEPTH for feeds/ by 1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13572 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-12-09 23:37:21 +00:00
Steven Barth eaa9cd922f Detect changed feed urls and rebase working copies if needed. (Patch by xMff)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13138 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-11-07 14:01:22 +00:00
Felix Fietkau e011924511 add support for conditional depends to the feeds script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-10-18 19:36:44 +00:00
Felix Fietkau 3eeaccee03 implement conditional dependencies for menuconfig and build deps
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12820 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-10-01 21:26:19 +00:00
Felix Fietkau 6907bedd84 scripts/feeds: allow multiple alternative urls for a single feed. this will be useful for maintaining release branch forks of /packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12746 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-27 22:57:58 +00:00
Steven Barth d85c243ab1 Fixed dependency handling for feeds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12615 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-09-16 20:25:36 +00:00
Felix Fietkau a251aef656 replace the deprecated git-* command calls with git *
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12379 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-24 13:40:21 +00:00
Felix Fietkau a9bbf998e4 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12328 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-17 09:05:01 +00:00
Florian Fainelli 7c94fda85f 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>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12246 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-08 21:30:08 +00:00
Felix Fietkau 763d1b4e13 scripts/feeds: fix some installation warnings for locally installed packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12102 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-04 22:22:29 +00:00
Felix Fietkau 439d252093 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12101 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-04 22:03:28 +00:00
Nicolas Thill 6e64b74230 install dependencies after installing package to avoid deep recursion and mass memory consuption
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10823 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-04-13 22:36:51 +00:00
Nicolas Thill c2a748ed6e install build-depends packages as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10793 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-04-12 09:37:44 +00:00
Felix Fietkau d6121b2ba6 fix error message in scripts/feeds when indexes are missing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10736 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-04-05 14:32:08 +00:00
Felix Fietkau 8a7cacf92b fix a recursive symlink issue with scripts/feeds and src-link
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10714 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-04-02 21:27:21 +00:00
Ralph Hempel e5baf6bef8 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)



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10634 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-03-20 17:08:24 +00:00
Ralph Hempel c4f3add071 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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10614 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-03-18 15:50:29 +00:00
Ralph Hempel 3b420c8414 - 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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10322 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-01-30 09:22:05 +00:00