From: Justin Forbes <jforbes@xxxxxxxxxxxxxxxxx>
This reverts merge request !537
---
redhat/Makefile | 15 ++++++++----
redhat/configs/build_configs.sh | 9 +------
.../arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER | 3 +--
redhat/configs/generate_all_configs.sh | 2 +-
redhat/configs/process_configs.sh | 24 +------------------
5 files changed, 15 insertions(+), 38 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index d29e5646e746..61dcc522fbc6 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -20,6 +20,13 @@ else
endif
endif
+
+ifeq ("$(IS_FEDORA)", "1")
+ DIST_TARGET=fedora
+else
+ DIST_TARGET=rhel
+endif
+
ifeq ("$(NO_CONFIGCHECKS)","1")
PROCESS_CONFIGS_OPTS=
PROCESS_CONFIGS_CHECK_OPTS=
@@ -131,20 +138,20 @@ dist-configs-commit: dist-configs-prep
./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR)
dist-configs: dist-configs-prep
- @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
+ @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
-fedora-configs: FLAVOR = fedora
+fedora-configs: DIST_TARGET=fedora
fedora-configs: dist-configs
-rh-configs: FLAVOR = rhel
+rh-configs: DIST_TARGET=rhel
rh-configs: dist-configs
dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
dist-configs-prep: dist-clean-configs
- cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)" "$(ARCH_MACH)" "$(FLAVOR)"
+ cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh
index 90f2be85f49d..18610e1fc097 100755
--- a/redhat/configs/build_configs.sh
+++ b/redhat/configs/build_configs.sh
@@ -10,12 +10,6 @@ SCRIPT="$(readlink -f $0)"
OUTPUT_DIR="$PWD"
SCRIPT_DIR="$(dirname $SCRIPT)"
-if [ -z "$3" ]; then
- cat flavors > .flavors
-else
- echo "$3" > .flavors
-fi
-
LANG=en_US.UTF-8
# to handle this script being a symlink
@@ -27,7 +21,6 @@ set nounset
cleanup()
{
rm -f config-*
- rm -f .flavors
}
die()
@@ -149,6 +142,6 @@ function build_flavor()
while read line
do
build_flavor $line
-done < .flavors
+done < flavors
cleanup
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
index 03d2ae718172..b730690db048 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
@@ -1,5 +1,4 @@
# We technically want this to be 13 for Fedora with 4K pages but that's only
# an option with an out of tree patch. Keep this 11 for compatibility until
-# we figure out what we want here.
-# process_configs_known_broken
+# we figure out what we want here
CONFIG_FORCE_MAX_ZONEORDER=13
diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh
index 15a39a8fccc8..14f0f3a24de5 100755
--- a/redhat/configs/generate_all_configs.sh
+++ b/redhat/configs/generate_all_configs.sh
@@ -25,7 +25,7 @@ for i in kernel-*-$PRIMARY.config; do
mv $i $NEW
done
-rm -f kernel-*-$SECONDARY.config
+rm kernel-*-$SECONDARY.config
if [ $DEBUGBUILDSENABLED -eq 0 ]; then
for i in kernel-*debug*.config; do
diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
index 92cc79701c4e..14773fef2410 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -15,11 +15,6 @@ usage()
echo " -t: test run, do not overwrite original config"
echo " -w: error on misconfigured config options"
echo " -z: commit new configs to pending directory"
- echo ""
- echo " A special CONFIG file tag, process_configs_known_broken can be added as a"
- echo " comment to any CONFIG file. This tag indicates that there is no way to "
- echo " fix a CONFIG's entry. This tag should only be used in extreme cases"
- echo " and is not to be used as a workaround to solve CONFIG problems."
exit 1
}
@@ -72,23 +67,8 @@ checkoptions()
}
' $1 $2 > .mismatches
- checkoptions_error=false
if test -s .mismatches
then
- while read LINE
- do
- if find ./ -name $(echo $LINE | awk -F "=" ' { print $1 } ' | awk ' { print $2 }') | xargs grep ^ | grep -q "process_configs_known_broken"; then
- # This is a known broken config.
- # See script help warning.
- checkoptions_error=false
- else
- checkoptions_error=true
- break
- fi
- done < .mismatches
-
- ! $checkoptions_error && return
-
echo "Error: Mismatches found in configuration files"
cat .mismatches
RETURNCODE=1
@@ -187,7 +167,6 @@ function commit_new_configs()
if [ "$arch" = "EMPTY" ]
then
# This arch is intentionally left blank
- rm -f "${cfg}.orig"
continue
fi
echo -n "Checking for new configs in $cfg ... "
@@ -222,7 +201,6 @@ function process_configs()
if [ "$arch" = "EMPTY" ]
then
# This arch is intentionally left blank
- rm -f "${cfg}.orig"
continue
fi
echo -n "Processing $cfg ... "
@@ -266,7 +244,7 @@ function process_configs()
else
mv ${cfgtmp} ${cfg}
fi
- rm -f ${cfgorig}
+ rm ${cfgorig}
echo "done"
done
rm "$SCRIPT_DIR"/*.config*.old
--
GitLab
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
