| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41407 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
directory
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36763 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
potentially confusing error messages on some systems
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32499 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31650 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31469 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31467 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
targets (based on patch from #10212)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28503 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
| |
Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26988 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24285 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23524 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22819 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
to fix dependency handling (patch by matthijs from #5891)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22815 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
get_feed() call
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22814 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22096 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22095 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22094 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17451 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15706 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
( thanks to Thomas )
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14727 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14537 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13572 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13138 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12820 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
be useful for maintaining release branch forks of /packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12746 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12615 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12379 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12102 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
mass memory consuption
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10823 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10793 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10736 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10714 3c298f89-4303-0410-b956-a3cf2f4a3e73
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-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
|
|
|
|
| |
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10281 3c298f89-4303-0410-b956-a3cf2f4a3e73
|