scripts: feeds: fix version detection for Make >= 4.2.1

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

scripts: avoid hard-coded paths in scripts

Signed-off-by: Iblis Lin <e196819@hotmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49267 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: allow export of feeds with static revisions

Add a switch to scripts/feeds that allows listing the feeds with their
currently checked out revisions in feeds.conf compatible format.

This allows providing a feeds.conf for public builds to make replication
of the build easier.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46706 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: return error status from feed update

This patch is a modified version of the patch being discussed at here:
https://patchwork.ozlabs.org/patch/471303/
from Martin Strbacka <martin.strbacka@nic.cz>

My version modifies scripts/feeds so that an error with one of the feeds just
raises the error flag, but script continues and tries to update the other
feeds. After all feeds have been updated, the script returns 1 if at least
one feed failed, and 0 on success with all feeds. The user can then utilise
the status in his build script, if he wants.

signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46374 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: print the source of packages installed

Can be helpful in diagnosing unexpected package overlaps between
feeds/core.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46255 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: observe -p flag for preferential feeds

lookup_target was trampling the $feed variable, resulting in the -p flag
no longer preferentially installing from the named feed.

Make sure to use a local variable for this instead.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46120 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: fix typo in copied code

do_install_target copied code from do_install_package, but didn't
replace all text.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45784 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: Delete package/feeds folder in the clean procedure to prevent dangling links.

Hello,

if you run:
./scripts/feeds clean
It removes ./feeds folder but not ./package/feeds/ which is full of dangling links then. This patch fixes it.

Best Regards,
Martin Strbačka

Signed-off-by: Martin Strbacka <martin.strbacka@nic.cz>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45738 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: add support for optionally using a full clone of git repositories

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45668 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: add support for uninstalling targets

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44782 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: add support for installing targets

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44781 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: get rid of redundant feed cache copy

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44779 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: remove useless install_method abstraction

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44778 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: add support for searching for targets

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44777 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: scan for target metadata

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44775 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: remove a few trailing tabs

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44773 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

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

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

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

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

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

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

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

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

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

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

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

[scripts/feeds] re-enable shallow git clones ('--depth 1')

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31469 3c298f89-4303-0410-b956-a3cf2f4a3e73

[scripts/feeds] include revisions of feeds when listing them

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 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 feeds
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 branches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24285 3c298f89-4303-0410-b956-a3cf2f4a3e73

[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

Fix typo


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23524 3c298f89-4303-0410-b956-a3cf2f4a3e73

[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

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

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

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

Revert r22094 and r22095


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22096 3c298f89-4303-0410-b956-a3cf2f4a3e73

Added --non-interactive flag to svn package downloads


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22095 3c298f89-4303-0410-b956-a3cf2f4a3e73

add --trust-server-cert to svn checkout of feeds


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22094 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: fix an error message

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17451 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: ignore virtual packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15706 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

check for correct make version
( 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 too


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14537 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

increased SCAN_DEPTH for feeds/ by 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)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13138 3c298f89-4303-0410-b956-a3cf2f4a3e73

add support for conditional depends to the feeds script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73

implement conditional dependencies for menuconfig and build deps

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 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 feeds

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12615 3c298f89-4303-0410-b956-a3cf2f4a3e73

replace the deprecated git-* command calls with git *

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 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 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

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

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

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

install build-depends packages as well


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10793 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

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

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

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

- 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

cleanups, small fixes and improvements for the feeds script


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10281 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds: Add support for git feeds.

Invokes 'git clone' on initial feed-update and 'git pull' later on.

Signed-off-by: Michel Marti <mcdmx@users.sf.net>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10280 3c298f89-4303-0410-b956-a3cf2f4a3e73

the attached patch adds the -a option to the feeds install command.
Therefore following command option should work now

./scripts/feeds install -a
./scripts/feeds install -a -p xwrt

To-do:
- The next step should be to replace the current make package/symlinks implementation with ./scripts/feeds install -a .
( the locations of the packages within ./packages are different with both methods )
- The current feed script is not able to handle "Provides" statements properly. The dependencies will be installed only if they are real package names and not aliases (provides) .

Note:
This patch also includes the previous patch reg. directory (ClearCase) support from 30.12.07.

br/R

Signed-off-by: ralph <ralph.hempel@infineon.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10252 3c298f89-4303-0410-b956-a3cf2f4a3e73

fix a warning


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9667 3c298f89-4303-0410-b956-a3cf2f4a3e73

add initial version of a package feeds management script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8973 3c298f89-4303-0410-b956-a3cf2f4a3e73