aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Wang <xwang1498@gmx.com>2020-02-08 23:04:11 +0000
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-27 12:14:09 +0100
commit2299808c68cbaf2bbdde31073c5e887cd62874dc (patch)
tree2a4601fdf35e6e47205b3ac1d0f8a7fae08af678
parent35890514bb191de3ab96dcd684714850a9142efc (diff)
downloadupstream-2299808c68cbaf2bbdde31073c5e887cd62874dc.tar.gz
upstream-2299808c68cbaf2bbdde31073c5e887cd62874dc.tar.bz2
upstream-2299808c68cbaf2bbdde31073c5e887cd62874dc.zip
base-files: add all buildinfo with INCLUDE_CONFIG
CONFIG_INCLUDE_CONFIG option is helpful for being able to rebuild the exact same firmware as you see on a live OpenWRT instance, but it's crucially missing feeds information, so we can't rebuild the exact same package versions. This commit fixes this by adding the remaining feeds (and version) buildinfo files to the image. Signed-off-by: Xu Wang <xwang1498@gmx.com>
-rw-r--r--config/Config-build.in2
-rw-r--r--package/base-files/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/config/Config-build.in b/config/Config-build.in
index 59dfaea8bb..6a6fb2882c 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -100,7 +100,7 @@ menu "Global build settings"
bool "Include build configuration in firmware" if DEVEL
default n
help
- If enabled, config.buildinfo will be stored in /etc/build.config of firmware.
+ If enabled, buildinfo files will be stored in /etc/build.* of firmware.
config COLLECT_KERNEL_DEBUG
bool
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 18325564dc..4f4e93361f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -198,7 +198,9 @@ define Package/base-files/install
$(if $(CONFIG_INCLUDE_CONFIG), \
echo -e "# Build configuration for board $(BOARD)/$(SUBTARGET)/$(PROFILE)\n" >$(1)/etc/build.config; \
- cat $(BIN_DIR)/config.buildinfo >>$(1)/etc/build.config)
+ cat $(BIN_DIR)/config.buildinfo >>$(1)/etc/build.config; \
+ cat $(BIN_DIR)/feeds.buildinfo >>$(1)/etc/build.feeds; \
+ cat $(BIN_DIR)/version.buildinfo >>$(1)/etc/build.version)
$(if $(CONFIG_CLEAN_IPKG),, \
mkdir -p $(1)/etc/opkg; \