This reverts commit 85b468262e "Remove unused liblockdep packaging"
and 87d08943da "liblockdep: Stop trying to build packages, as it
failed to build again", but doesn't restore the patches. All our
patches, and further build fixes, were applied upstream as of
v4.13-rc1.
It has finally been removed after all docs were converted to ReST format.
As there is no longer a way to build manpages, remove the linux-manual
package.
dh_install used to treat each given filename/pattern as space-separated
(bug #198507), and we accidentally depended on that. This was recently
fixed, leading to FTBFS.
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlkI0/kACgkQ57/I7JWG
EQkutQ/9EsYdnQXf4HaC1YTqQW0Nu5+swZzyosOcdtMfJrj+PWXQMgmY4WWav8I/
DipRGhfXXMnqlBg1vOR5cEdqPznRm/cwcuPqZpw7H0fA7LvyCibg/7yERJYv7i1U
BIy8s29NCpVVRhDhY9Nl5t0WLGQT4Rg9JW6iKNRDq2y91etahSxzOBxB2B3k04Ys
9vFPpuKq5QAskCBGEucinYYKTy7/ciIXsaSij2m/G7/ly/Qaqt0pIgjqi4QhuJs3
yWidIm1aBvE4MHXH8WQkg1aF20vfdGXz3CZNT6BWFn/6hNesS+tEQpF/nYLBqnfS
2GghqeWO1+xzxlXWNZU/SD0JhkB6gAeZ+4MP7eYz8BAtpUz7H/zZfZNsOBWb6YJY
Pc8AjqG6mBd/1B2O8yXUda/j/xazEtg0c7uxQjyOEqh2nPeHn9FVLuJsSP74wxdx
zjGmOjJzKUmhBGxLdJZAFL5N7YbLR+qNQfV2UGz4+zVIJge9R7HwWwR9+Um8AHq0
qrnjRf6iAla1phYlgHnPx4r6A9kactDuFsNMfUN8nsUrV+KX15k+dt02CpFSWw0B
lXGPf2MNXTEp+CsuAVBAWFP55JCOwD6yYoLfEfErXvchc7qqIKHgmIrLSyexro7O
F1+HBfu6t1M4tRz0xNu8sGL4uzsjockMW8RL1HFgboUluMgTFPQ=
=k/sj
-----END PGP SIGNATURE-----
Merge tag 'debian/4.9.25-1'
Drop the added patches, which are already in 4.11.
CONFIG_NFP_NETVF is replaced by CONFIG_NFP in 4.11.
dak currently allows a binary upload to include debug symbol packages
that don't appear in the overrides file or the Binary field of the
changes file, so long as they have the appropriate
'Auto-Built-Package' field and their name matches another binary
package in the upload plus the '-dbgsym' suffix.
For architectures with code signing enabled, our binary uploads never
match this condition as the corresponding binary package has the
'-unsigned' suffix and the debug symbols package does not. Since we
do list the debug symbol packages in the Binary field, they do get
added to the overrides file when accepted through the NEW queue, but
they are automatically pruned from there some time later. Later
uploads then have to go through NEW even though they are not
introducing new binary packages. This would be a big problem for
stable security updates.
For now, move debug symbols back to the main archive with the old
'-dbg' suffix. Keep them enabled for all architectures.
This is necessary to avoid creating files in source directory, which
makes the linux-source package unclean (and unreproducible).
Firstly, Python creates bytecode files alongside the module sources.
We can and do exclude those, though.
Secondly, starting with 4.10, Documentation/media/Makefile converts
from dot to SVG and from SVG to PDF in the source directory. These
can't easily be excluded, as SVG is also used as a source format.
Some files are moving around under Documentation and being replaced
with symlinks.
gzip -r doesn't even check for symlinks, and fails when they're broken
(which happens if the destination was found first). So use find and
xargs instead, and deal with the symlinks separately.
REPORTING-BUGS moved to Documentation/admin-guide/reporting-bugs.rst
and doesn't need to be listed separately.
Many of the ReST files in Documentation used to be plain-text and
users may want to continue reading them as such, so don't prune
*.rst.
Listing usr/sbin in linux-cpupower.install caused FTBFS on !x86 as
cpupower itself doesn't install anything there. Do the architecture
filtering in the debhelper lists instead of complicating
debian/rules.real further.
This reverts commit 99d37f9b16, which
caused most binary uploads to be rejected. dak's allows upload of
debug symbol packages not listed in the Binary field only if there is
a corresponding binary package without the -dbgsym suffix, which is
not the case on architectures where we use a -unsigned suffix.
Any packages listed in debian/control that are not installed in the
main archive will always be seen as NEW. This might be fixable by
archive configuration changes, but for now we'll generate them in a
similar way to debhelper.
Since jessie's diff returns 2 when it finds a binary (#737180) we need
to do this to avoid FTBFS in jessie-backports. Besides which, those
aren't part of the source.
(cherry picked from commit 62cce57936757e7492b082b2845e04be00cda5d2)
Include headers for all architectures that we build a kernel for.
This allows co-installation of per-flavour header packages for
multiple Debian architectures, and fixes the problem of arm64 headers
depending on arm headers that we did not include.
Fixes FTBFS on sparc64:
dpkg-shlibdeps: error: no dependency information found for /usr/lib32/libc.so.6 (used by debian/linux-perf-4.9/usr/lib/perf_4.9-core/perf-read-vdso32)
Hint: check if the library actually comes from a package.
dh_shlibdeps: dpkg-shlibdeps -Tdebian/linux-perf-4.9.substvars debian/linux-perf-4.9/usr/bin/perf_4.9 debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_xen.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_hrtimer.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_jbd2.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_function.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_mac80211.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_sched_switch.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_kvm.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_cfg80211.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_scsi.so debian/linux-perf-4.9/usr/lib/traceevent_4.9/plugins/plugin_kmem.so debian/linux-perf-4.9/usr/lib/perf_4.9-core/perf-read-vdso32 returned exit code 2
I can't see when or why this changed, but the HTML (and related) files
are now being generated in Documentation/output and not an html
subdirectory of that.
Currently on powerpc, powerpcspe and ppc64 we get an automatic dbgsym
package with symbols for the bootwrapper tools (addnote, hack-coff,
mktree). We should either put them in linux-image-*-dbgsym or
nowhere. For now, opt for nowhere.
Move the dh_strip invocation from the install-base rule to the
install-image_... rule. None of the other packages using install-base
should contain any executables.
For userland we already got this through dpkg-buildflags, but it uses
the current directory rather than the source package's top directory
as the default 'old' path. Set DEB_BUILD_PATH to fix this.
- Add python-sphinx and python-sphinx-rtd-theme to Build-Depends-Indep
- Install files from both HTML output directories into the package
- Exclude RST sources from the package
usbip has its own version number which we combine with the source
package version, which is assigned to VERSION for the install-usbip
target (only). We find the version number by processing the config.h
file created by autoconf. The file always exists before the
install-usbip rule is invoked, but the target-specific definition of
VERSION is still evaluated whenever debian/rules.real is used,
resulting in confusing (though harmless) error messages about a
missing file.
We could change VERSION to be a recursively-expanded variable, but
then it would still be evaulated multiple times. Instead, move the
definition of VERSION into the target's commands.
Pass $(CROSS_COMPILE) or host GNU type through to upstream build rules.
debian/rules.real: Filter tools packages by host arch, not build arch
debian/rules.d/Makefile: Build the tools needed for headers_install in
a separate subdirectory
Currently we build-depend on the native python (via asciidoc), and on
the host python (via python-dev). As these are not coinstallable it
is impossible to perform a complete cross-build. Until that's resolved,
this will allow cross-building of most of the package with the
combination of the 'cross' and 'nopython' profiles.
(This also sidesteps the issue of perf wanting a multilib compiler.)
These packages will be taken over by src:linux-signed. Still do
everything but building the packages so we find configuration
errors before building linux-signed.
Where we include the 'version' in paths, it needs to be what
debian/rules.real calls UPSTREAMVERSION (no -rcN, no Debian revision).
(We should really make the naming of version variables consistent
across all our makefiles.)
Our signing certificate isn't included in the source tarball and would
be pointless to include in custom kernels. Custom kernels also won't
have a separate signing stage. So remove our settings for
CONFIG_MODULE_SIG_ALL, CONFIG_MODULE_SIG_KEY and
CONFIG_SYSTEM_TRUSTED_KEYS. This should cause custom kernels based on
the included configs to follow the upstream default for signing, which
is to use a new key pair for each build.
* Rename the make macro from submake to make-tools
* Rename debian/stamps/build to debian/stamps/build-tools
* Build them all under debian/build/build-tools/
* Drop redundant gitignore.patch from linux-tools
* Rename linux-tools' debian/templates/control.main.in to
debian/templates/control.tools.in
* Combine changelogs, putting all entries for each upstream release
cycle in chronological order
* Combine rules and gencontrol.py code
Also add a helper executable that implements the check for Hyper-V
(like ConditionVirtualization=microsoft in the systemd units).
(cherry picked from commit 50747480c882dae7d3c8f7b4d0df5cf3276c4ee5)
By passing both -C and -f options to make, we can separate makefiles
from the output directory without adding prefixes to all targets.
We can also reduce the 'clean' commands to little more than 'rm -rf'.
The linux-grsec source package needs a way to explicitly disable these
binary packages which are already built by the linux source package.
We already do that when there are no actual kernels for the target
architecture. Rename the FOREIGN_KERNEL make variable and combine the
two conditions.
Based on work by Yves-Alexis Perez.
A parallel 'debian/rules build' will now invoke 'debian/rules.real
build' twice in parallel, which is disastrous.
- Add and use proper build-arch and build-indep targets in
debian/rules.gen and debian/rules.real
- Assign a separate temporary directory to each target in
debian/rules.real. Add the directories to .gitignore and
the clean rule.
- Pull installation of the lockdep wrapper (which is indep)
up into debian/rules.real so that we don't end up building
liblockdep twice in parallel.
use source package name in templates so it's easier for derivatives like
src:linux-grsec to not conflict with binaries from src:linux.
Original patch by Ben Hutchings.
Upstream sets LC_ALL=C when building most things, and we do that in
one place to ensure consistent ordering. However the encoding of HTML
docs still differs. Choose 'C.UTF-8' instead of 'C' because it makes
the HTML docs slightly smaller.
liblockdep is in fairly bad shape - one patch needed to make it build
at all, another to make it build in a separate directory successfully,
and a third to fix the soname. And the install rule doesn't install
its public headers. But maybe it will be useful.
When we introduced the find | sort | xargs tar pipeline to make the
tarball reproducible, I was concerned that there could be so many
arguments that xargs would call tar more than once. I therefore
changed the tar -c option to -r so that it would append rather
than overwriting in this case.
However, the -a option seems to have no effect when -r is used, so
the tarball is no longer compressed.
Instead of using xargs, use tar's -T option and change the -r
back to -c.
Ben Hutchings
Mattia Dongili
Yves-Alexis Perez
Ben Hutchings
Bastian Blank