From 47583e871443e7b86b5951b8f9a3a092662fb8ab Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Fri, 10 Apr 2020 00:46:47 +0200 Subject: [PATCH] build: define upstream-repos in modules-file 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 https://github.com/freifunk-berlin/firmware/pull/781 * Issue https://github.com/freifunk-berlin/firmware/issues/780 * Issue https://github.com/freifunk-berlin/firmware/issues/772 --- config.mk | 2 -- feeds.conf | 13 ------------- modules | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 feeds.conf create mode 100644 modules diff --git a/config.mk b/config.mk index ce89362cf7..06d1bc3bbe 100644 --- a/config.mk +++ b/config.mk @@ -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 diff --git a/feeds.conf b/feeds.conf deleted file mode 100644 index fabf056351..0000000000 --- a/feeds.conf +++ /dev/null @@ -1,13 +0,0 @@ -src-git packages https://github.com/openwrt/packages.git^a8b212e9332d8c8953dc1b612cc489858e8687ae -src-git luci https://github.com/openwrt/luci.git^bdc86c8464139494b67faaa68ac3dae64359c8e8 -src-git freifunk https://github.com/freifunk/openwrt-packages.git^f6f61274e0ad2455792858994a79aaa0d3e13b4b -src-git routing https://github.com/openwrt-routing/packages.git^512240f48028bca1832fc79e38f3b40ba9f3b3af -src-git packages_berlin https://github.com/freifunk-berlin/firmware-packages.git^fd19100f5fa56635889cb78109dbc4a555f79d99 -src-git gluon https://github.com/freifunk-gluon/packages.git^12e41d0ff07ec54bbd67a31ab50d12ca04f2238c - -## -# just for reference (syntax of different feed-sources) -# see https://wiki.openwrt.org/doc/devel/feeds for more info -## -#src-git packages_berlin https://github.com/freifunk-berlin/firmware-packages.git;master -#src-link packages_berlin ../../../firmware-packages diff --git a/modules b/modules new file mode 100644 index 0000000000..64e70b3dbf --- /dev/null +++ b/modules @@ -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' +