Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

kbuild: deb-pkg: switch over to source format 3.0 (quilt)

Browse Source 
Change the source format from "1.0" to "3.0 (quilt)" because it works
more cleanly.

All files except .config and debian/ go into the orig tarball.
Add a single patch, debian/patches/config, and delete the ugly
extend-diff-ignore patterns.

The debian tarball will be compressed into *.debian.tar.xz by default.
If you like to use a different compression mode, you can pass the
command line option, DPKG_FLAGS=-Zgzip, for example.

The orig tarball only supports gzip for now. The combination of
gzip and xz is somewhat clumsy, but it is not a practical problem.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
This commit is contained in:
Masahiro Yamada 2023-02-15 10:20:29 +09:00
parent b44aa8c96e
commit e785399559
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/Makefile.package
View File

@ -105,7 +105,7 @@ debian-orig: linux.tar.gz debian
PHONY += deb-pkg
deb-pkg: debian-orig
+dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
--build=source,binary --source-option=-sP -nc -us -uc
--build=source,binary -nc -us -uc
PHONY += bindeb-pkg
bindeb-pkg: debian

37
scripts/package/mkdebian
View File

@ -135,29 +135,24 @@ else
fi
mkdir -p debian/source/
echo "1.0" > debian/source/format
echo "3.0 (quilt)" > debian/source/format
# Ugly: ignore anything except .config or debian/
cat<<'EOF' > debian/source/local-options
diff-ignore
{
echo "diff-ignore"
echo "extend-diff-ignore = .*"
} > debian/source/local-options
extend-diff-ignore = ^[^.d]
extend-diff-ignore = ^\.[^c]
extend-diff-ignore = ^\.c($|[^o])
extend-diff-ignore = ^\.co($|[^n])
extend-diff-ignore = ^\.con($|[^f])
extend-diff-ignore = ^\.conf($|[^i])
extend-diff-ignore = ^\.confi($|[^g])
extend-diff-ignore = ^\.config.
extend-diff-ignore = ^d($|[^e])
extend-diff-ignore = ^de($|[^b])
extend-diff-ignore = ^deb($|[^i])
extend-diff-ignore = ^debi($|[^a])
extend-diff-ignore = ^debia($|[^n])
extend-diff-ignore = ^debian[^/]
EOF
# Add .config as a patch
mkdir -p debian/patches
{
echo "Subject: Add .config"
echo "Author: ${maintainer}"
echo
echo "--- /dev/null"
echo "+++ linux/.config"
diff -u /dev/null "${KCONFIG_CONFIG}" | tail -n +3
} > debian/patches/config
echo config > debian/patches/series
echo $debarch > debian/arch
extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)"