Message ID | 20210320222835.3951325-3-aduskett@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | mender updates | expand |
On Sat, 20 Mar 2021 15:28:33 -0700 aduskett@gmail.com wrote: > From: Adam Duskett <Aduskett@rivian.com> > > The current linker flag "-X main.Version=$(MENDER_VERSION)" no longer points > to the correct location, which results in "version: unknown" when runnning > "mender -version." Update the linker flag to point to the correct location. > > Signed-off-by: Adam Duskett <Aduskett@rivian.com> > --- > package/mender/mender.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas
>>>>> "aduskett" == aduskett <aduskett@gmail.com> writes: > From: Adam Duskett <Aduskett@rivian.com> > The current linker flag "-X main.Version=$(MENDER_VERSION)" no longer points > to the correct location, which results in "version: unknown" when runnning > "mender -version." Update the linker flag to point to the correct location. > Signed-off-by: Adam Duskett <Aduskett@rivian.com> Committed to 2020.11.x and 2021.02.x, thanks.
diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 3e82f556fb..16d7178a6b 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -37,7 +37,7 @@ MENDER_LICENSE_FILES = \ MENDER_DEPENDENCIES = openssl xz -MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) +MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION) MENDER_UPDATE_MODULES_FILES = \ directory \