Skip to content

Commit 381760b

Browse files
committed
fixup: no version in localversion
Signed-off-by: Loïc Minier <[email protected]>
1 parent 57f69b0 commit 381760b

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

scripts/build-linux-deb.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,25 +86,27 @@ configure_kernel() {
8686

8787
set_kernel_version() {
8888
# the default upstream algorithm for KERNELRELEASE from
89-
# linux/scripts/setlocalversion would be fine, but prepend flavor name for
90-
# the package names to be like linux-image-flavor-kernelrelease instead of
91-
# linux-image-kernelrelease
89+
# linux/scripts/setlocalversion would be fine, albeit it doesn't allow
90+
# omitting or prefixing the version in linux-image-KERNELRELEASE package
91+
# names; instead, append flavor name for the package names to be like
92+
# linux-image-kerneversion-flavor instead of linux-image-kernelversion
9293

9394
# produce a version based on latest tag name, number of commits on top, and
9495
# sha of latest commit, for instance: v6.16, v6.17-rc3-289-gfe3ad7,
9596
# v6.17-rc4
96-
localversion="$(GIT_DIR="${WORK_DIR}/.git" git describe --tags --abbrev=1)"
97+
#localversion="$(GIT_DIR="${WORK_DIR}/.git" git describe --tags --abbrev=1)"
9798

9899
# remove leading "v" and prepend flavor
99-
localversion="${FLAVOR}-${localversion#v}"
100+
#localversion="${FLAVOR}-${localversion#v}"
100101

101-
log_i "Local version is $localversion"
102+
#log_i "Local version is $localversion"
102103

103104
# create or update tag
104-
GIT_DIR="${WORK_DIR}/.git" git tag --force "$localversion"
105+
#GIT_DIR="${WORK_DIR}/.git" git tag --force "$localversion"
106+
GIT_DIR="${WORK_DIR}/.git" git tag --force "${FLAVOR}"
105107

106108
# create localversion file for linux/scripts/setlocalversion
107-
echo "$localversion" >"${WORK_DIR}/localversion"
109+
echo "-${FLAVOR}" >"${WORK_DIR}/localversion"
108110
}
109111

110112
build_kernel() {

0 commit comments

Comments
 (0)