Skip to content

Commit

Permalink
kbuild: deb-pkg: switch over to source format 3.0 (quilt)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
masahir0y committed Feb 26, 2023
1 parent b44aa8c commit e785399
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 24 deletions.
2 changes: 1 addition & 1 deletion scripts/Makefile.package
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
41 changes: 18 additions & 23 deletions scripts/package/mkdebian
Original file line number Diff line number Diff line change
Expand Up @@ -135,29 +135,24 @@ else
fi

mkdir -p debian/source/
echo "1.0" > debian/source/format

# Ugly: ignore anything except .config or debian/
cat<<'EOF' > debian/source/local-options
diff-ignore
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
echo "3.0 (quilt)" > debian/source/format

{
echo "diff-ignore"
echo "extend-diff-ignore = .*"
} > debian/source/local-options

# 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)"
Expand Down

0 comments on commit e785399

Please sign in to comment.