moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: modpost: update nits from late review

Browse Source 
Updates the documentation and comments for the MODULE_SCMVERSION feature.

Bug: 180027765
Fixes: 4b9c11a373 ("ANDROID: modules: introduce the MODULE_SCMVERSION config")
Change-Id: I648b31c4810c777ec3d2cb141b61f5924559c76f
Signed-off-by: Will McVicker <willmcvicker@google.com>
This commit is contained in:
Will McVicker
2021-02-22 09:44:24 -08:00
committed by Matthias Maennich
parent 4d1e11edcc
commit 600066b974
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/ABI/stable/sysfs-module
View File

@@ -35,7 +35,7 @@ Description:
What: /sys/module/MODULENAME/scmversion What: /sys/module/MODULENAME/scmversion
Date: November 2020 Date: November 2020
KernelVersion: 5.12 KernelVersion: Android Common Kernel -- android12-5.10+
Contact: Will McVicker <willmcvicker@google.com> Contact: Will McVicker <willmcvicker@google.com>
Description: This read-only file will appear if modpost was supplied with an Description: This read-only file will appear if modpost was supplied with an
SCM version for the module. It can be enabled with the config SCM version for the module. It can be enabled with the config

4
scripts/Makefile.modpost
View File

@@ -98,10 +98,8 @@ endif
endif endif
ifeq ($(CONFIG_MODULE_SCMVERSION),y) ifeq ($(CONFIG_MODULE_SCMVERSION),y)
# Get the SCM version of the module. Sed verifies setlocalversion returns # Get the SCM version of the module. `sed` verifies setlocalversion returns
# a proper revision based on the SCM type, e.g. git, mercurial, or svn. # a proper revision based on the SCM type, e.g. git, mercurial, or svn.
# Note: relative M= paths are not supported when building the kernel out of the
# srctree since setlocalversion won't be able to find the module srctree.
module_scmversion := $(shell $(srctree)/scripts/setlocalversion $(module_srcpath) | \ module_scmversion := $(shell $(srctree)/scripts/setlocalversion $(module_srcpath) | \
sed -n 's/.*-\(\(g\|hg\)[a-fA-F0-9]\+\(-dirty\)\?\|svn[0-9]\+\).*/\1/p') sed -n 's/.*-\(\(g\|hg\)[a-fA-F0-9]\+\(-dirty\)\?\|svn[0-9]\+\).*/\1/p')
ifneq ($(module_scmversion),) ifneq ($(module_scmversion),)