Skip to content
Snippets Groups Projects
Select Git revision
  • master default
  • routeur
  • pico
3 results
Search by author
  • Any Author
  • Charlie Jacomme Charlie Jacomme jacomme
  • Gabriel Detraz Gabriel Detraz detraz
  • ds-ac ds-ac ds-ac
  • shirenn shirenn shirenn
  • vanille vanille vanille
5 authors
  1. Mar 29, 2015
  3. Mar 16, 2015
  5. Mar 15, 2015
  7. Feb 14, 2015
    • blogic's avatar
      scripts: fix getver git dir check · fc4ca299
      blogic authored 
      
Git internals are referenced by .git which isn't necessarily a
directory. It may also be a file that references the actual .git
directory using the gitdir directive.

If .git is assumed to be a directory the build will not be able to get
the correct version when openwrt is included as a git submodule because
when used as a submodule .git will actually be a file referencing to a
subdirectory in the parent's git dir.

When the correct version is not detected some image generation tools
will fail because the OpenWrt string will be 'OpenWrtunknown' which is
too long for some header formats.

Signed-off-by: default avatarFelix Kaechele <heffer@fedoraproject.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44452 3c298f89-4303-0410-b956-a3cf2f4a3e73
      fc4ca299
  9. Feb 10, 2015
  11. Feb 09, 2015
    • blogic's avatar
      build: propagate override information to .config file · c95db6c3
      blogic authored 
      
With this change, override information is now parsed from the metadata
and put in the %packages hash. A new hash - %overrides - is created and
exported, to be used during the .config-package.in generation.

If an override is detected, a new option CONFIG_OVERRIDE_PKGS will be
created in the .config, and will contain a space-separated list of all
the overridden packages.

Signed-off-by: default avatarMathieu Olivari <mathieu@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44336 3c298f89-4303-0410-b956-a3cf2f4a3e73
      c95db6c3
    • blogic's avatar
      build: allow openwrt.git packages to be replaced by feeds · 80710b0f
      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@44334 3c298f89-4303-0410-b956-a3cf2f4a3e73
      80710b0f
  13. Jan 29, 2015
  15. Jan 23, 2015
  17. Jan 22, 2015
    • 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
  19. Jan 08, 2015
  21. Dec 13, 2014
  23. Dec 12, 2014
  25. Dec 10, 2014
  27. Dec 07, 2014
  29. Nov 28, 2014
  31. Nov 24, 2014
  33. Nov 14, 2014
  35. Oct 26, 2014
  37. Oct 14, 2014
  39. Oct 13, 2014
    • 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
  41. Oct 08, 2014
  43. Oct 05, 2014
  45. Sep 23, 2014