1. 22 Jan, 2015 2 commits
    • blogic's avatar
      build: revert r44076 · 77be8e56
      blogic authored
      
      
      the patch causes issues when installing feeds
      
      Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
      
      git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44078 3c298f89-4303-0410-b956-a3cf2f4a3e73
      77be8e56
    • blogic's avatar
      build: allow openwrt.git packages to be replaced by feeds · 77e2b216
      blogic authored
      
      
      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: default avatarMathieu Olivari <mathieu@qca.qualcomm.com>
      
      git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44076 3c298f89-4303-0410-b956-a3cf2f4a3e73
      77e2b216
  2. 13 Oct, 2014 1 commit
    • blogic's avatar
      scripts/feeds: handle missing/broken feeds better · 692e0a27
      blogic authored
      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: default avatarHannu Nyman <hannu.nyman@iki.fi>
      
      git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42891 3c298f89-4303-0410-b956-a3cf2f4a3e73
      692e0a27
  3. 05 Aug, 2014 1 commit
  4. 30 Jun, 2014 1 commit
  5. 25 Sep, 2013 1 commit
  6. 02 Sep, 2013 1 commit
  7. 29 May, 2013 1 commit
  8. 25 Jun, 2012 1 commit
  9. 08 May, 2012 1 commit
  10. 26 Apr, 2012 1 commit
    • nbd's avatar
      build: rework verbosity level selection · 87e474d1
      nbd authored
      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
      87e474d1
  11. 24 Apr, 2012 2 commits
  12. 21 Oct, 2011 1 commit
  13. 24 May, 2011 1 commit
  14. 06 Dec, 2010 1 commit
  15. 24 Oct, 2010 1 commit
  16. 18 Oct, 2010 1 commit
  17. 02 Oct, 2010 1 commit
  18. 26 Aug, 2010 3 commits
  19. 08 Jul, 2010 3 commits
  20. 31 Aug, 2009 1 commit
  21. 08 May, 2009 1 commit
  22. 17 Mar, 2009 1 commit
  23. 02 Mar, 2009 1 commit
  24. 17 Feb, 2009 1 commit
  25. 31 Dec, 2008 1 commit
    • nbd's avatar
      scripts/feeds update: · 39eb535c
      nbd authored
      * 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
      39eb535c
  26. 09 Dec, 2008 1 commit
  27. 07 Nov, 2008 1 commit
  28. 18 Oct, 2008 1 commit
  29. 01 Oct, 2008 1 commit
  30. 27 Sep, 2008 1 commit
  31. 16 Sep, 2008 1 commit
  32. 24 Aug, 2008 1 commit
  33. 17 Aug, 2008 1 commit
  34. 08 Aug, 2008 1 commit