Skip to content

Commit

Permalink
build: define upstream-repos in modules-file
Browse files Browse the repository at this point in the history
Switch from defining the upstream-repos and relating commit in config.mk
and feeds.conf to define all in the modules-file.
The modules-files is the real file used by the build-system to setup the
working checkout. It originates from the Gluon-buildsystemand some
documentation is avail at https://gluon.readthedocs.io/en/latest/dev/build.html

This also relates to
* PR freifunk-berlin#781
* Issue freifunk-berlin#780
* Issue freifunk-berlin#772
  • Loading branch information
SvenRoederer committed May 15, 2020
1 parent afed23a commit 47583e8
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
2 changes: 0 additions & 2 deletions config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
SHELL:=$(shell which bash)
TARGET=ath79-generic
PACKAGES_LIST_DEFAULT=notunnel tunnel-berlin-tunneldigger manual
OPENWRT_SRC=https://git.openwrt.org/openwrt/openwrt.git
OPENWRT_COMMIT=ae06a650d68026530beec4196869706866c2e4b1
SET_BUILDBOT=env
MAKE_ARGS=V=s
13 changes: 0 additions & 13 deletions feeds.conf

This file was deleted.

23 changes: 23 additions & 0 deletions modules
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
OPENWRT_COMMIT=ae06a650d68026530beec4196869706866c2e4b1

PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_COMMIT=a8b212e9332d8c8953dc1b612cc489858e8687ae

PACKAGES_LUCI_REPO=https://github.com/openwrt/luci.git
PACKAGES_LUCI_COMMIT=bdc86c8464139494b67faaa68ac3dae64359c8e8

PACKAGES_FREIFUNK_REPO=https://github.com/freifunk/openwrt-packages.git
PACKAGES_FREIFUNK_COMMIT=f6f61274e0ad2455792858994a79aaa0d3e13b4b

PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
PACKAGES_ROUTING_COMMIT=512240f48028bca1832fc79e38f3b40ba9f3b3af

PACKAGES_PACKAGES_BERLIN_REPO=https://github.com/freifunk-berlin/firmware-packages.git
PACKAGES_PACKAGES_BERLIN_COMMIT=fd19100f5fa56635889cb78109dbc4a555f79d99

PACKAGES_PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c

GLUON_FEEDS='packages luci freifunk routing packages_berlin packages_gluon'

0 comments on commit 47583e8

Please sign in to comment.