commit | b5b98af51a63096c4f60790865d4361d18d1cdd9 | [log] [tgz] |
---|---|---|
author | Carlos Llamas <cmllamas@google.com> | Fri Jan 27 00:48:29 2023 +0000 |
committer | Carlos Llamas <cmllamas@google.com> | Fri Jan 27 15:33:00 2023 +0000 |
tree | 5b692dfc28f76b5ba362d8b68a2bd3bd98a25952 | |
parent | 78ac610866216e7d2dc4211443615d1e46c78c26 [diff] |
ANDROID: kbuild: fix build for DEBUG_INFO_BTF_MODULES Upstream commit f73edc8951b2 ("kbuild: unify two modpost invocations") adds 'vmlinux' as a Makefile rule dependency for the target 'modules'. This rule is conditional on DEBUG_INFO_BTF_MODULES like so: ifdef CONFIG_DEBUG_INFO_BTF_MODULES modules: vmlinux endif However, setting this option breaks android's mixed builds as an out-of-tree patch skips the definition of the 'vmlinux' rule whenever KBUILD_MIXED_TREE is set. For details on this approach see commit ee1b16e80d45 ("ANDROID: Kbuild: Add support for KBUILD_MIXED_TREE"). Since kbuild is unable to find the 'vmlinux' binary or a rule to generate it in this case, we hit the following build error: $ ./scripts/config -e DEBUG_INFO_BTF $ make olddefconfig $ KBUILD_MIXED_TREE=${path} make modules make[1]: *** No rule to make target 'vmlinux', needed by 'modules'. Stop. make[1]: *** Waiting for unfinished jobs.... In order to fix this issue, lets pass the appropiate path to vmlinux by prepending mixed-build-prefix. If KBUILD_MIXED_TREE is set, kbuild will find the previously built 'vmlinux' and won't require a rule for it. Bug: 266874587 Change-Id: I2290502b557f454187313a563e5477b05d37f3c4 Signed-off-by: Carlos Llamas <cmllamas@google.com>
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
EXPORT_SYMBOL_GPL()
require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
scripts/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry picked from commit ...)
lineimportant patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry picked from commit ...)
lineBACKPORT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [joe: Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch) Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBug:
tag with the Android bug (required for patches not accepted into a maintainer tree)BACKPORT: FROMLIST:
FROMLIST: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/ Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: fix android-specific bug in foobar.c This is the detailed description of the important fix Fixes: 1234abcd2468 ("foobar: add cool feature") Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)