Now that we have arch and flavor information via the --config option,
we can do things like automatically expand the kABI references.
This patch uses that information to expand the references into the build
directory. Missing kABI references are not considered a fatal error.
Signed-off-by: Jeff Mahoney
---
scripts/sequence-patch.sh | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
--- a/scripts/sequence-patch.sh
+++ b/scripts/sequence-patch.sh
@@ -37,7 +37,7 @@ sles9* | sles10* | sle10* | 9.* | 10.* |
esac
usage() {
- echo "SYNOPSIS: $0 [-qv] [--symbol=...] [--dir=...] [--combine] [--fast] [last-patch-name] [--vanilla] [--fuzz=NUM] [--build-dir=PATH] [--config=ARCH-FLAVOR]"
+ echo "SYNOPSIS: $0 [-qv] [--symbol=...] [--dir=...] [--combine] [--fast] [last-patch-name] [--vanilla] [--fuzz=NUM] [--build-dir=PATH] [--config=ARCH-FLAVOR [--kabi]]"
exit 1
}
@@ -49,7 +49,7 @@ if $have_arch_patches; then
else
arch_opt=""
fi
-options=`getopt -o qvd:F: --long quilt,no-quilt,$arch_opt,symbol:,dir:,combine,fast,vanilla,fuzz,build-dir:,config: -- "$@"`
+options=`getopt -o qvd:F: --long quilt,no-quilt,$arch_opt,symbol:,dir:,combine,fast,vanilla,fuzz,build-dir:,config:,kabi -- "$@"`
if [ $? -ne 0 ]
then
@@ -68,6 +68,7 @@ SP_BUILD_DIR=
CONFIG=
CONFIG_ARCH=
CONFIG_FLAVOR=
+KABI=
while true; do
case "$1" in
@@ -117,6 +118,9 @@ while true; do
CONFIG="$2"
shift
;;
+ --kabi)
+ KABI=yes
+ ;;
--)
shift
break ;;
@@ -480,6 +484,14 @@ if test -n "$CONFIG"; then
else
echo "[ Config $CONFIG does not exist. ]"
fi
+
+ if test -n "$KABI"; then
+ echo "[ Expanding kABI references for $CONFIG ]"
+ rpm/modversions --unpack "$SP_BUILD_DIR" < \
+ "kabi/$CONFIG_ARCH/symtypes-$CONFIG_FLAVOR"
+ else
+ echo "[ No kABI references for $CONFIG ]"
+ fi
fi
[ $# -gt 0 ] && exit $status
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-kernel+help@opensuse.org
