Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93698e50 authored by Quentin Perret's avatar Quentin Perret
Browse files

BACKPORT: FROMLIST: kbuild: split adjust_autoksyms.sh in two parts 



In order to prepare the ground for a build-time optimization, split
adjust_autoksyms.sh into two scripts: one that generates autoksyms.h
based on all currently available information (whitelist, and .mod
files), and the other to inspect the diff between two versions of
autoksyms.h and trigger appropriate rebuilds.

[ BACKPORT: 60ae1b194b45 not present, sed 3rd line of modules.order ]

Bug: 148277666
Acked-by: default avatarNicolas Pitre <nico@fluxnic.net>
Tested-by: default avatarMatthias Maennich <maennich@google.com>
Reviewed-by: default avatarMatthias Maennich <maennich@google.com>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Link: https://lore.kernel.org/lkml/20200218094139.78835-3-qperret@google.com
Change-Id: I7ed4f8f72c0ef9ac98419877efb5ef828d10b0d7
parent 3d0431a8

scripts/adjust_autoksyms.sh

+4 −32
Original line number Diff line number Diff line 
#!/bin/sh



# Script to create/update include/generated/autoksyms.h and dependency files

# Script to update include/generated/autoksyms.h and dependency files

#

# Copyright:	(C) 2016  Linaro Limited

# Created by:	Nicolas Pitre, January 2016
@@ -9,8 +9,7 @@ 
# it under the terms of the GNU General Public License version 2 as

# published by the Free Software Foundation.



# Create/update the include/generated/autoksyms.h file from the list

# of all module's needed symbols as recorded on the third line of *.mod files.

# Update the include/generated/autoksyms.h file.

#

# For each symbol being added or removed, the corresponding dependency

# file's timestamp is updated to force a rebuild of the affected source
@@ -40,35 +39,8 @@ esac 
# We need access to CONFIG_ symbols

. include/config/auto.conf



ksym_wl=/dev/null

if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST" ]; then

	# Use 'eval' to expand the whitelist path and check if it is relative

	eval ksym_wl="$CONFIG_UNUSED_KSYMS_WHITELIST"

	[ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl"

	if [ ! -f "$ksym_wl" ]; then

		echo "ERROR: '$ksym_wl' whitelist file not found" >&2

		exit 1

	fi

fi



# Generate a new ksym list file with symbols needed by the current

# set of modules.

cat > "$new_ksyms_file" << EOT

/*

 * Automatically generated file; DO NOT EDIT.

 */



EOT

sed 's/ko$/mod/' modules.order |

xargs -n1 sed -n -e '3{s/ /\n/g;/^$/!p;}' -- |

cat - "$ksym_wl" |

sort -u |

sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$new_ksyms_file"



# Special case for modversions (see modpost.c)

if [ -n "$CONFIG_MODVERSIONS" ]; then

	echo "#define __KSYM_module_layout 1" >> "$new_ksyms_file"

fi

# Generate a new symbol list file

$CONFIG_SHELL $srctree/scripts/gen_autoksyms.sh "$new_ksyms_file"



# Extract changes between old and new list and touch corresponding

# dependency files.

scripts/gen_autoksyms.sh

0 → 100755
+51 −0
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0-only



# Create an autoksyms.h header file from the list of all module's needed symbols

# as recorded on the third line of *.mod files and the user-provided symbol

# whitelist.



set -e



output_file="$1"



# Use "make V=1" to debug this script.

case "$KBUILD_VERBOSE" in

*1*)

	set -x

	;;

esac



# We need access to CONFIG_ symbols

. include/config/auto.conf



ksym_wl=/dev/null

if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST" ]; then

	# Use 'eval' to expand the whitelist path and check if it is relative

	eval ksym_wl="$CONFIG_UNUSED_KSYMS_WHITELIST"

	[ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl"

	if [ ! -f "$ksym_wl" ]; then

		echo "ERROR: '$ksym_wl' whitelist file not found" >&2

		exit 1

	fi

fi



# Generate a new ksym list file with symbols needed by the current

# set of modules.

cat > "$output_file" << EOT

/*

 * Automatically generated file; DO NOT EDIT.

 */



EOT



sed 's/ko$/mod/' modules.order |

xargs -n1 sed -n -e '3{s/ /\n/g;/^$/!p;}' -- |

cat - "$ksym_wl" |

sort -u |

sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file"



# Special case for modversions (see modpost.c)

if [ -n "$CONFIG_MODVERSIONS" ]; then

	echo "#define __KSYM_module_layout 1" >> "$output_file"

fi