From: Čestmír Kalina
[redhat] kabi: rename legacy terminology
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1953486
Upstream Status: RHEL only
As part of Red Hat’s commitment to remove problematic language from
our code, documentation, websites, and open source projects that we
are involved with, this patch renames kABI whitelist to stablelist.
Signed-off-by: Čestmír Kalina
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -66,7 +66,7 @@ dist-kabi: dist-python-check
for i in {0..$(RHEL_MINOR)}; do \
mkdir -p $(REDHAT)/kabi/kabi-rhel$(RHEL_MAJOR)$$i/;\
$(REDHAT)/kabi/show-kabi -k $(REDHAT)/kabi/kabi-module/
-s -a $$KABIARCH \
- -r $(RHEL_MAJOR).$$i >
$(REDHAT)/kabi/kabi-rhel$(RHEL_MAJOR)$$i/kabi_whitelist_$$KABIARCH;\
+ -r $(RHEL_MAJOR).$$i >
$(REDHAT)/kabi/kabi-rhel$(RHEL_MAJOR)$$i/kabi_stablelist_$$KABIARCH;\
done;\
done;
@(cd $(REDHAT)/kabi/ && ln -Tsf kabi-rhel$(RHEL_MAJOR)$(RHEL_MINOR)
kabi-current)
@@ -101,7 +101,7 @@ dist-kabi-dw-base: dist-kabi
@echo "Generating baseline dataset for KABI DWARF-based comparison..."
@echo " GENERATING DWARF-based kABI baseline dataset "
@$(KABIDW)/run_kabi-dw.sh generate \
- $(REDHAT)/kabi/kabi-current/kabi_whitelist_$(CURARCH) \
+ $(REDHAT)/kabi/kabi-current/kabi_stablelist_$(CURARCH) \
$(_OUTPUT) $(KABIDW)/base/$(CURARCH)/
dist-kabi-dw-check: dist-kabi
@@ -113,7 +113,7 @@ dist-kabi-dw-check: dist-kabi
fi
@echo " GENERATING DWARF-based kABI dataset "
@$(KABIDW)/run_kabi-dw.sh generate \
- $(REDHAT)/kabi/kabi-current/kabi_whitelist_$(CURARCH) \
+ $(REDHAT)/kabi/kabi-current/kabi_stablelist_$(CURARCH) \
$(_OUTPUT) $(KABIDW)/base/$(CURARCH).tmp/
@echo " KABI DWARF-based comparison report "
@$(KABIDW)/run_kabi-dw.sh compare \
@@ -525,15 +525,15 @@ dist-full-help:
@echo ''
@echo 'kABI targets:'
- @echo ' dist-kabi - Create kABI whitelist files in
redhat/kabi/kabi-rhel*/'
+ @echo ' dist-kabi - Create kABI stablelist files in
redhat/kabi/kabi-rhel*/'
@echo 'and merge kABI checksums into
redhat/kabi/Module.kabi_*.'
@echo ' dist-kabi-dup - Merge kABI checksums for Driver Update
Program (DUP)'
@echo 'into redhat/kabi/Module.kabi_dup_*.'
- @echo ' dist-check-kabi - Check for changes in kABI whitelisted
symbols.'
+ @echo ' dist-check-kabi - Check for changes in kABI stablelisted
symbols.'
@echo 'Requires a pre-compiled tree: run `make
dist-configs`,'
@echo 'copy the relevant config file from
redhat/configs/ to'
@echo ' .config, and run `make`.'
- @echo ' dist-check-kabi-dup - Like dist-check-kabi but uses a DUP
kABI whitelist.'
+ @echo ' dist-check-kabi-dup - Like dist-check-kabi but uses a DUP
kABI stablelist.'
@echo ' dist-kabi-dw-base - Generate the base dataset for kABI
DWARF-based check.'
@echo ' dist-kabi-dw-check - Run DWARF-based kABI comparison of
current binaries'
@echo 'with the base dataset.'
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index blahblah..blahblah 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -140,7 +140,7 @@ endif
TARFILE:=linux-$(TARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
-KABI_TARFILE:=kernel-abi-whitelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABI_TARFILE:=kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
KABI_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABI_TARFILE)
KABIDW_TARFILE:=kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE)
diff --git a/redhat/kabi-dwarf/run_kabi-dw.sh b/redhat/kabi-dwarf/run_kabi-dw.sh
index blahblah..blahblah 100644
--- a/redhat/kabi-dwarf/run_kabi-dw.sh
+++ b/redhat/kabi-dwarf/run_kabi-dw.sh
@@ -19,7 +19,7 @@
# same options from both the Makefile and kernel.spec file.
#
# Usage:
-# ./run_kabi-dw.sh generate whitelist module_dir kabi_dir
+# ./run_kabi-dw.sh generate stablelist module_dir kabi_dir
# ./run_kabi-dw.sh compare kabi_dir1 kabi_dir2
# shellcheck disable=SC2164
@@ -31,7 +31,7 @@ KABIDW=kabi-dw
usage() {
echo "Usage:"
- echo " $PROG generate whitelist module_dir kabi_dir"
+ echo " $PROG generate stablelist module_dir kabi_dir"
echo " $PROG compare kabi_dir1 kabi_dir2"
exit 1
}
diff --git a/redhat/kabi/make-kabi
