shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: Makefile: append BUILD_NUMBER to version string when defined"

Browse Source 
This reverts commit fc31d47a63.

This change was broken because UTS_RELEASE is used at runtime to find
files which are installed using KERNELRELEASE, so they need to match.

Bug: 137521202
Bug: 159842160
Bug: 194209519
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I668128a394919a59dd142a612ca2edbad51391d3
This commit is contained in:
Alistair Delva
2021-07-20 12:02:28 -07:00
parent d073dcb998
commit 90b4fe58dd
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -1353,17 +1353,12 @@ endif
# needs to be updated, so this check is forced on all builds
uts_len := 64
ifneq (,$(BUILD_NUMBER))
UTS_RELEASE=$(KERNELRELEASE)-ab$(BUILD_NUMBER)
else
UTS_RELEASE=$(KERNELRELEASE)
endif
define filechk_utsrelease.h
if [ `echo -n "$(UTS_RELEASE)" | wc -c ` -gt $(uts_len) ]; then \
echo '"$(UTS_RELEASE)" exceeds $(uts_len) characters' >&2; \
exit 1; \
fi; \
echo \#define UTS_RELEASE \"$(UTS_RELEASE)\"
if [ `echo -n "$(KERNELRELEASE)" | wc -c ` -gt $(uts_len) ]; then \
echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \
exit 1; \
fi; \
echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"
endef
define filechk_version.h