Skip to content

Commit

Permalink
kbuild: deb-pkg: split debian/rules
Browse files Browse the repository at this point in the history
debian/rules is generated by shell, but the escape sequence (\$) is
unreadable.

debian/rules embeds only two variables (ARCH and KERNELRELEASE).

Split them out to debian/rules.vars, and check-in the rest of Makefile
code to scripts/package/debian/rules.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
  • Loading branch information
Masahiro Yamada committed Aug 7, 2023
1 parent 4b970e4 commit d9287ea
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 29 deletions.
28 changes: 28 additions & 0 deletions scripts/package/debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/make -f
# SPDX-License-Identifier: GPL-2.0-only

include debian/rules.vars

srctree ?= .

.PHONY: binary binary-indep binary-arch
binary: binary-arch binary-indep
binary-indep: build-indep
binary-arch: build-arch
$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
KERNELRELEASE=$(KERNELRELEASE) \
run-command KBUILD_RUN_COMMAND=+$(srctree)/scripts/package/builddeb

.PHONY: build build-indep build-arch
build: build-arch build-indep
build-indep:
build-arch:
$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
KERNELRELEASE=$(KERNELRELEASE) \
$(shell $(srctree)/scripts/package/deb-build-option) \
olddefconfig all

.PHONY: clean
clean:
rm -rf debian/files debian/linux-*
$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) clean
34 changes: 5 additions & 29 deletions scripts/package/mkdebian
Original file line number Diff line number Diff line change
Expand Up @@ -263,35 +263,11 @@ Description: Linux kernel debugging symbols for $version
EOF
fi

cat <<EOF > debian/rules
#!/usr/bin/make -f
srctree ?= .
KERNELRELEASE = ${KERNELRELEASE}
.PHONY: clean build build-arch build-indep binary binary-arch binary-indep
build-indep:
build-arch:
\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
KERNELRELEASE=\$(KERNELRELEASE) \
\$(shell \$(srctree)/scripts/package/deb-build-option) \
olddefconfig all
build: build-arch
binary-indep:
binary-arch: build-arch
\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
KERNELRELEASE=\$(KERNELRELEASE) \
run-command KBUILD_RUN_COMMAND=+\$(srctree)/scripts/package/builddeb
clean:
rm -rf debian/files debian/linux-*
\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean
binary: binary-arch
cat <<EOF > debian/rules.vars
ARCH := ${ARCH}
KERNELRELEASE := ${KERNELRELEASE}
EOF
chmod +x debian/rules

cp "${srctree}/scripts/package/debian/rules" debian/

exit 0

0 comments on commit d9287ea

Please sign in to comment.