[riot-commits] [RIOT-OS/RIOT] 1e2498: makefiles/docker.inc.mk: handle building in git wo...

Gaëtan Harter hartergaetan at gmail.com
Fri Nov 2 12:02:44 CET 2018


  Branch: refs/heads/2018.10-branch
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: 1e2498bbe41f3d55e04a31fc68b2ade3aabde1ee
      https://github.com/RIOT-OS/RIOT/commit/1e2498bbe41f3d55e04a31fc68b2ade3aabde1ee
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2018-10-31 (Wed, 31 Oct 2018)

  Changed paths:
    M makefiles/docker.inc.mk

  Log Message:
  -----------
  makefiles/docker.inc.mk: handle building in git worktree

When building from a worktree, the common git directory was not mounted
in docker.

This lead to the version not being set and issues with git-cache in
ubuntu bionic that could not execute the 'git hash-object' command.

(cherry picked from commit 61a3e5d68555ac48723f4039ea19bf6bd1c2666c)


  Commit: f8023c875e5b1ffbfa9139f65f79dd5f4a86c0d8
      https://github.com/RIOT-OS/RIOT/commit/f8023c875e5b1ffbfa9139f65f79dd5f4a86c0d8
  Author: José Alamos <jialamos at uc.cl>
  Date:   2018-11-02 (Fri, 02 Nov 2018)

  Changed paths:
    M cpu/stm32_common/periph/i2c_1.c
    M drivers/at/at.c
    M examples/nanocoap_server/coap_handler.c

  Log Message:
  -----------
  Merge branch '2018.10-branch' into backport/2018.10/pr/make/docker/handle_worktree


  Commit: 488771f84a1daeae0553d49ac3c9b9bfd5f98733
      https://github.com/RIOT-OS/RIOT/commit/488771f84a1daeae0553d49ac3c9b9bfd5f98733
  Author: Gaëtan Harter <hartergaetan at gmail.com>
  Date:   2018-11-02 (Fri, 02 Nov 2018)

  Changed paths:
    M makefiles/docker.inc.mk

  Log Message:
  -----------
  Merge pull request #10307 from cladmi/backport/2018.10/pr/make/docker/handle_worktree

makefiles/docker.inc.mk: handle building in git worktree [backport 2018.10]


Compare: https://github.com/RIOT-OS/RIOT/compare/82be92aa6e77...488771f84a1d
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the commits mailing list