aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/feeds
Commit message (Collapse)AuthorAgeFilesLines
* scripts/feeds: Reuse TOPDIR if defined in environmentMichal Sojka2017-02-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feeds script sets value of TOPDIR in a way that is inconsistent with how toplevel Makefile sets it. The inconsistency manifests when I use a "build directory" with symlinks to LEDE source (see below). When make is invoked in such a directory, make's TOPDIR variable is set to that directory, whereas scripts/feeds sets TOPDIR to the top of LEDE source, which results in creating feeds directory inside the LEDE source instead of in the build directory. This patch changes the script so that it reuses the TOPDIR value form the environment if it exists. The result is that 'make package/symlinks' correctly fetches feeds to the build directory instead in the source. I use the following commands to create the build directory: ln -s $SRC/config config ln -s $SRC/Config.in Config.in ln -s $SRC/feeds.conf.default feeds.conf.default ln -s $SRC/include include ln -s $SRC/Makefile Makefile mkdir package ln -s $SRC/package/base-files package/base-files ln -s $SRC/package/boot package/boot ln -s $SRC/package/devel package/devel ln -s $SRC/package/firmware package/firmware ln -s $SRC/package/kernel package/kernel ln -s $SRC/package/libs package/libs ln -s $SRC/package/Makefile package/Makefile ln -s $SRC/package/network package/network ln -s $SRC/package/system package/system ln -s $SRC/package/utils package/utils ln -s $SRC/rules.mk rules.mk ln -s $SRC/scripts scripts ln -s $SRC/target target ln -s $SRC/toolchain toolchain ln -s $SRC/tools tools This allows me to easily test changes in LEDE on multiple targets. Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
* feeds: add option to force feed update despite modified filesJo-Philipp Wich2017-02-151-9/+26
| | | | | | | | Implement a new flag "-f" for the feeds update command which causes the script to fall back to a more agressive git update strategy in case there are locally modified files in the feeds directory. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* scripts/feeds: use git rev-parse for getting revisionRafał Miłecki2016-11-081-3/+3
| | | | | | It provides simpler output so we don't need extra head and cut commands. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* scripts/feeds: display "X" as revision of uninitialized feedsRafał Miłecki2016-11-081-1/+1
| | | | | | | | So far we were displaying "local" which could be misinterpreted. It wasn't possible e.g. to say if src-link feed was initialized or not. Hopefully "X" makes (a bit) more sense. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* scripts/feeds: use 10 chars for feed name column widthRafał Miłecki2016-11-031-1/+1
| | | | | | | | It's always hard to find a reasonable width that will make everyone happy. This one at least makes "telephony" (one of default feeds) name fit the column and hopefully isn't too big. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* scripts/feeds: Prevent .config autocreationDaniel Dickinson2016-07-051-0/+5
| | | | | | | | | | | | | When using scripts/feeds upgrade the .config needs to be updated but the code to do so was also autocreating a .config if one didn't exist. This is counter-productive when you have not yet used menuconfig (or other config targets) because things like selecting or deselecting CONFIG_ALL (to build all package by default) only works if the package selection has not already been done via an existing .config selection. Signed-off-by: Daniel Dickinson <lede@daniel.thecshore.com>
* scripts: feeds: fix version detection for Make >= 4.2.1Jo-Philipp Wich2016-06-151-1/+4
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* scripts: avoid hard-coded paths in scriptsIblis Lin2016-04-281-1/+1
| | | | Signed-off-by: Iblis Lin <e196819@hotmail.com>
* scripts/feeds: allow export of feeds with static revisionsJonas Gorski2015-08-231-1/+10
| | | | | | | | | | | | 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> SVN-Revision: 46706
* scripts/feeds: return error status from feed updateJo-Philipp Wich2015-07-141-4/+4
| | | | | | | | | | | | | | | | 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> SVN-Revision: 46374
* scripts/feeds: print the source of packages installedSteven Barth2015-07-071-2/+2
| | | | | | | | | Can be helpful in diagnosing unexpected package overlaps between feeds/core. Signed-off-by: Karl Palsson <karlp@remake.is> SVN-Revision: 46255
* scripts/feeds: observe -p flag for preferential feedsSteven Barth2015-06-241-3/+3
| | | | | | | | | | | 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> SVN-Revision: 46120
* scripts/feeds: fix typo in copied codeFelix Fietkau2015-05-271-1/+1
| | | | | | | | | do_install_target copied code from do_install_package, but didn't replace all text. Signed-off-by: Karl Palsson <karlp@remake.is> SVN-Revision: 45784
* scripts/feeds: Delete package/feeds folder in the clean procedure to prevent ↵John Crispin2015-05-231-1/+1
| | | | | | | | | | | | | | | | | 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> SVN-Revision: 45738
* scripts/feeds: add support for optionally using a full clone of git repositoriesFelix Fietkau2015-05-101-1/+8
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45668
* scripts/feeds: add support for uninstalling targetsFelix Fietkau2015-03-151-0/+22
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44782
* scripts/feeds: add support for installing targetsFelix Fietkau2015-03-151-0/+57
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44781
* scripts/feeds: get rid of redundant feed cache copyFelix Fietkau2015-03-151-8/+6
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44779
* scripts/feeds: remove useless install_method abstractionFelix Fietkau2015-03-151-18/+2
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44778
* scripts/feeds: add support for searching for targetsFelix Fietkau2015-03-151-1/+44
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44777
* scripts/feeds: scan for target metadataFelix Fietkau2015-03-151-0/+2
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44775
* scripts/feeds: remove a few trailing tabsFelix Fietkau2015-03-151-2/+2
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44773
* build: allow openwrt.git packages to be replaced by feedsJohn Crispin2015-02-091-8/+22
| | | | | | | | | | | | | | | | | | | | | 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
* build: revert r44076John Crispin2015-01-221-18/+7
| | | | | | | | the patch causes issues when installing feeds Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44078
* 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> SVN-Revision: 44076
* 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> SVN-Revision: 42891
* 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> SVN-Revision: 42002
* scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)Felix Fietkau2014-06-301-0/+1
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 41407
* 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> SVN-Revision: 38172
* 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> SVN-Revision: 37884
* feeds: fix check for core packages that are not in the package/ toplevel ↵Jo-Philipp Wich2013-05-291-1/+10
| | | | | | directory SVN-Revision: 36763
* 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 SVN-Revision: 32499
* add further countermeasures against the git core.autocrlf option (fixes #9075)Felix Fietkau2012-05-081-0/+1
| | | | SVN-Revision: 31650
* 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) SVN-Revision: 31484
* re-enable shallow git clones ('--depth 1')Mirko Vogt2012-04-241-2/+2
| | | | SVN-Revision: 31469
* include revisions of feeds when listing themMirko Vogt2012-04-241-14/+37
| | | | SVN-Revision: 31467
* scripts/feeds: override the OPENWRT_BUILD variable when calling internal ↵Felix Fietkau2011-10-211-2/+2
| | | | | | targets (based on patch from #10212) SVN-Revision: 28503
* Add support for git-svn package feeds Signed-off-by: Jonathan McCrohan ↵Jo-Philipp Wich2011-05-241-0/+5
| | | | | | <jmccrohan@gmail.com> SVN-Revision: 26988
* scripts/feeds: support checking out git trees with different branchesFelix Fietkau2010-12-061-1/+7
| | | | SVN-Revision: 24285
* 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> SVN-Revision: 23616
* Fix typoMichael Büsch2010-10-181-1/+1
| | | | SVN-Revision: 23524
* feeds: restore previously active feed after install_package(), fixes install ↵Jo-Philipp Wich2010-10-021-0/+1
| | | | | | all case for packages with inter-feed dependencies SVN-Revision: 23171
* scripts/feeds: fix a bug in the metadata caching changeFelix Fietkau2010-08-261-2/+2
| | | | SVN-Revision: 22819
* 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) SVN-Revision: 22815
* scripts/feeds: cache feed metadata instead of re-reading it on every ↵Felix Fietkau2010-08-261-14/+24
| | | | | | get_feed() call SVN-Revision: 22814
* Revert r22094 and r22095Hamish Guthrie2010-07-081-1/+1
| | | | SVN-Revision: 22096
* Added --non-interactive flag to svn package downloadsHamish Guthrie2010-07-081-1/+1
| | | | SVN-Revision: 22095
* add --trust-server-cert to svn checkout of feedsHamish Guthrie2010-07-081-1/+1
| | | | SVN-Revision: 22094
* scripts/feeds: fix an error messageFelix Fietkau2009-08-311-1/+1
| | | | SVN-Revision: 17451
* scripts/feeds: ignore virtual packagesFelix Fietkau2009-05-081-0/+3
| | | | SVN-Revision: 15706
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:19:45 +0000