Skip to content

Commit ae4c4ce

Browse files
committed
kbuild: move init/build-version to scripts/
At first, I thought this script would be needed only in init/Makefile. However, commit 5db8fac ("kbuild: Restore .version auto-increment behaviour for Debian packages") and commit 1789fc9 ("kbuild: rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkg") revealed that it was actually needed for scripts/package/mk* as well. After all, scripts/ is a better place for it. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]>
1 parent 9b11452 commit ae4c4ce

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

init/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CFLAGS_version.o := -include $(obj)/utsversion-tmp.h
5252
# Build version-timestamp.c with final UTS_VERSION
5353
#
5454

55-
include/generated/utsversion.h: build-version-auto = $(shell $(src)/build-version)
55+
include/generated/utsversion.h: build-version-auto = $(shell $(srctree)/scripts/build-version)
5656
include/generated/utsversion.h: build-timestamp-auto = $(shell LC_ALL=C date)
5757
include/generated/utsversion.h: FORCE
5858
$(call filechk,uts_version)
File renamed without changes.

scripts/package/mkdebian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ version=$KERNELRELEASE
150150
if [ -n "$KDEB_PKGVERSION" ]; then
151151
packageversion=$KDEB_PKGVERSION
152152
else
153-
packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/init/build-version)
153+
packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/scripts/build-version)
154154
fi
155155
sourcename=${KDEB_SOURCENAME:-linux-upstream}
156156

scripts/package/mkspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
cat<<EOF
2525
%define ARCH ${ARCH}
2626
%define KERNELRELEASE ${KERNELRELEASE}
27-
%define pkg_release $("${srctree}/init/build-version")
27+
%define pkg_release $("${srctree}/scripts/build-version")
2828
EOF
2929

3030
cat "${srctree}/scripts/package/kernel.spec"

0 commit comments

Comments
 (0)