Skip to content

Commit ce3fbdd

Browse files
committed
fixup: simpler localversion handling
1 parent f2431f5 commit ce3fbdd

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

scripts/build-linux-deb.sh

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,36 +84,13 @@ configure_kernel() {
8484
fi
8585
}
8686

87-
set_kernel_version() {
88-
# the default upstream algorithm for KERNELRELEASE from
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
93-
94-
# produce a version based on latest tag name, number of commits on top, and
95-
# sha of latest commit, for instance: v6.16, v6.17-rc3-289-gfe3ad7,
96-
# v6.17-rc4
97-
#localversion="$(GIT_DIR="${WORK_DIR}/.git" git describe --tags --abbrev=1)"
98-
99-
# remove leading "v" and prepend flavor
100-
#localversion="${FLAVOR}-${localversion#v}"
101-
102-
#log_i "Local version is $localversion"
103-
104-
# create or update tag
105-
#GIT_DIR="${WORK_DIR}/.git" git tag --force "$localversion"
106-
GIT_DIR="${WORK_DIR}/.git" git tag --force "${FLAVOR}"
107-
108-
# create localversion file for linux/scripts/setlocalversion
109-
echo "-${FLAVOR}" >"${WORK_DIR}/localversion"
110-
}
111-
11287
build_kernel() {
113-
echo "-${FLAVOR}" >localversion
11488
make -C "${WORK_DIR}" "-j$(nproc)" \
115-
ARCH=arm64 DEB_HOST_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- \
89+
ARCH=arm64
90+
CROSS_COMPILE=aarch64-linux-gnu- \
91+
DEB_HOST_ARCH=arm64 \
11692
KDEB_SOURCENAME="linux-${FLAVOR}" \
93+
LOCALVERSION="-${FLAVOR}" \
11794
deb-pkg
11895
}
11996

0 commit comments

Comments
 (0)