Skip to content

Commit 066834c

Browse files
committed
Revert "BACKPORT: UPSTREAM: kbuild: move init/build-version to scripts/"
deepin inclusion category: bugfix This reverts commit 1195f54. Our release scripts echo version to init/build-version. This change should be reverted after we modified the script. Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 9388e0e commit 066834c

4 files changed

Lines changed: 3 additions & 3 deletions

File tree

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 $(srctree)/$(src)/scripts/build-version)
55+
include/generated/utsversion.h: build-version-auto = $(shell $(srctree)/$(src)/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)

scripts/package/mkdebian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ version=$KERNELRELEASE
156156
if [ "${KDEB_PKGVERSION:+set}" ]; then
157157
packageversion=$KDEB_PKGVERSION
158158
else
159-
packageversion=$($srctree/scripts/build-version)
159+
packageversion=$($srctree/init/build-version)
160160
fi
161161
sourcename=${KDEB_SOURCENAME:-linux-upstream}
162162

scripts/package/mkspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818
cat<<EOF
1919
%define ARCH ${ARCH}
2020
%define KERNELRELEASE ${KERNELRELEASE}
21-
%define pkg_release $("${srctree}/scripts/build-version")
21+
%define pkg_release $("${srctree}/init/build-version")
2222
EOF
2323

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

0 commit comments

Comments
 (0)