Commit 1e1b0098 authored by Ben Hutchings's avatar Ben Hutchings

Merge branch 'sid'

* Drop redundant changes to libbpf patches
parents 17cba79f a8c3d89c
......@@ -253,3 +253,26 @@ Several build profiles are understood and supported:
with nopython as the build-dependencies will be unsatisfiable otherwise.
- nopython: Disable Python bindings. This currently disables building the
linux-perf-<version> package, as the perf program embeds Python.
Build rules
===========
The Debian build rules are split across multiple makefiles:
- debian/rules: Standard top-level makefile for Debian package build.
- debian/rules.gen: Intermediate makefile between debian/rules and
debian/rules.real. This is generated by gencontrol.py based on
the configuration under debian/config.
- debian/rules.real: Makefile for building a single kernel flavour
or other group of binary packages.
- debian/rules.d: Makefiles for building userland code from specific
source directories. The directory structure mirrors the kernel
source directories. debian/rules.real uses the "make-tools" to
invoke these makefiles.
All builds *must* be done out-of-tree in a subdirectory of
debian/build, so that the output files do not end up in the
linux-source-<version> binary package. Currently kernel builds use
debian/build/build_<arch>_<featureset>_<flavour>, userland code uses
debian/build/build-tools/<source-dir> and documentation uses
debian/build/build-doc.
......@@ -117,6 +117,17 @@ linux (4.20-1~exp1) experimental; urgency=medium
-- Ben Hutchings <ben@decadent.org.uk> Mon, 24 Dec 2018 04:26:47 +0000
linux (4.19.37-4) UNRELEASED; urgency=medium
* libbpf: Fix various build bugs:
- Drop unnecessary changes from "libbpf: add SONAME to shared object"
- libbpf: Use only 2 components in soversion, matching package name
(Closes: #929187)
- libbpf: Build out-of-tree
* README.source: Document the various makefiles and use of out-of-tree builds
-- Ben Hutchings <ben@decadent.org.uk> Sun, 19 May 2019 00:04:16 +0100
linux (4.19.37-3) unstable; urgency=medium
* [powerpc*] 64s: Include cpu header (fixes FTBFS)
......
......@@ -8,7 +8,7 @@ CFLAGS += -Werror=implicit-function-declaration
# Don't let the kernel version override libbpf's version
undefine VERSION
MAKE_BPF := +$(MAKE) -C $(top_srcdir)/$(OUTDIR)
MAKE_BPF := +$(MAKE) -C $(top_srcdir)/$(OUTDIR) O=$(CURDIR)
MAKE_BPF += prefix=/usr
MAKE_BPF += libdir_relative=lib/$(DEB_HOST_MULTIARCH)
MAKE_BPF += V=$(KBUILD_VERBOSE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment