[OS-BUILD PATCHv3 0/8] process_configs.sh: Add parallel processing of
configs
in dist-configs
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1635
The dist-configs target takes an annoying long time.
Add parallel processing of configs in dist-configs.
Testing Info
------------
make dist-configs time 1m22.909s
make -j20 dist-configs time 11.801s
Removed redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
to test unset error.
>Found unset config items in x86_64-debug, please set them to an appropriate
value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
>Found unset config items in x86_64-kgcov, please set them to an appropriate
value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
>Found unset config items in x86_64, please set them to an appropriate value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
Changed redhat/configs/common/generic/s390x/CONFIG_HID from 'is not set'
to '=n' to test mismatch error.
>Error: Mismatches found in configuration files for s390x
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-kgcov
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-debug
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-zfcpdump
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-debug
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-kgcov
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-zfcpdump
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
Changed redhat/configs/common/generic/CONFIG_PREEMPT to '=y' to test
misconfigured error.
>Found misconfigured config items in aarch64-debug, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-aarch64-debug.config.orig:4245:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in aarch64-kgcov, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-aarch64-kgcov.config.orig:4224:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in ppc64le-kgcov, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le-
kgcov.config.orig:4028:warning: override: PREEMPT changes choice state
>Found misconfigured config items in ppc64le, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-ppc64le.config.orig:4026:warning: override:
PREEMPT changes choice state
>Found misconfigured config items in x86_64-debug, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-x86_64-debug.config.orig:4212:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in x86_64-kgcov, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-x86_64-kgcov.config.orig:4192:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in x86_64, please set them to an appropriate
value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-x86_64.config.orig:4190:warning: override:
PREEMPT changes choice state
>Found misconfigured config items in aarch64, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-aarch64.config.orig:4222:warning: override:
PREEMPT changes choice state
>Found misconfigured config items in ppc64le-debug, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le-
debug.config.orig:4045:warning: override: PREEMPT changes choice state
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/configs/build_configs.sh | 32 +++++-
redhat/configs/process_configs.sh | 158 +++++++++++++++++++++++--------------
redhat/Makefile | 10 +-
3 files changed, 127 insertions(+), 73 deletions(-)
2 years, 1 month
[OS-BUILD PATCH] redhat/self-test: Delete release test 3
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/self-test: Delete release test 3
This test is no longer valid and should be deleted.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/self-test/2001-dist-release.bats b/redhat/self-test/2001-dist-release.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/2001-dist-release.bats
+++ b/redhat/self-test/2001-dist-release.bats
@@ -41,21 +41,6 @@
[ "$status" = 0 ]
}
-@test "dist-release test 3" {
- # Test whether the version in the commit message matches
- # the version in the change log.
- cd $BATS_TMPDIR/distrelease
- # Extract just the version part (the part between [ ]) on the first line of
- # the change log:
- changelogversion=$(head -1 ./redhat/kernel.changelog-8.99 | sed -e 's/.*\[\(.*\)\].*/\1/')
- commit="$(git log --oneline -n 1)"
- # Extract just the commit message part AFTER "[redhat] ":
- title=${commit##*\[redhat\] }
- # This time, strip off "kernel-" also:
- title=${title/kernel-/}
- [ "$changelogversion" = "$title" ]
-}
-
@test "dist-release epilogue" {
git worktree remove --force $BATS_TMPDIR/distrelease
git branch -D distrelease
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1636
2 years, 1 month
[OS-BUILD PATCHv2] redhat/configs: Disable CONFIG_MACINTOSH_DRIVERS
in RHEL.
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/configs: Disable CONFIG_MACINTOSH_DRIVERS in RHEL.
Disable CONFIG_MACINTOSH_DRIVERS in RHEL.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_MACINTOSH_DRIVERS b/redhat/configs/ark/generic/powerpc/CONFIG_MACINTOSH_DRIVERS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/powerpc/CONFIG_MACINTOSH_DRIVERS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MACINTOSH_DRIVERS=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_MACINTOSH_DRIVERS b/redhat/configs/ark/generic/x86/x86_64/CONFIG_MACINTOSH_DRIVERS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_MACINTOSH_DRIVERS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MACINTOSH_DRIVERS=y
diff --git a/redhat/configs/fedora/generic/powerpc/CONFIG_MACINTOSH_DRIVERS b/redhat/configs/common/generic/CONFIG_MACINTOSH_DRIVERS
rename from redhat/configs/fedora/generic/powerpc/CONFIG_MACINTOSH_DRIVERS
rename to redhat/configs/common/generic/CONFIG_MACINTOSH_DRIVERS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/powerpc/CONFIG_MACINTOSH_DRIVERS
+++ b/redhat/configs/common/generic/CONFIG_MACINTOSH_DRIVERS
diff --git a/redhat/configs/common/generic/CONFIG_MAC_EMUMOUSEBTN b/redhat/configs/fedora/generic/CONFIG_MAC_EMUMOUSEBTN
rename from redhat/configs/common/generic/CONFIG_MAC_EMUMOUSEBTN
rename to redhat/configs/fedora/generic/CONFIG_MAC_EMUMOUSEBTN
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_MAC_EMUMOUSEBTN
+++ b/redhat/configs/fedora/generic/CONFIG_MAC_EMUMOUSEBTN
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1612
2 years, 1 month
[OS-BUILD PATCHv2 0/8] process_configs.sh: Add parallel processing of
configs
in dist-configs
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1635
The dist-configs target takes an annoying long time.
Add parallel processing of configs in dist-configs.
Testing Info
------------
make dist-configs time 1m22.909s
make -j20 dist-configs time 11.801s
Removed redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
to test unset error.
>Found unset config items in x86_64-debug, please set them to an appropriate
value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
>Found unset config items in x86_64-kgcov, please set them to an appropriate
value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
>Found unset config items in x86_64, please set them to an appropriate value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
Changed redhat/configs/common/generic/s390x/CONFIG_HID from 'is not set'
to '=n' to test mismatch error.
>Error: Mismatches found in configuration files for s390x
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-kgcov
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-debug
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-zfcpdump
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-debug
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-kgcov
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x-zfcpdump
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
>Error: Mismatches found in configuration files for s390x
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source
tree
Changed redhat/configs/common/generic/CONFIG_PREEMPT to '=y' to test
misconfigured error.
>Found misconfigured config items in aarch64-debug, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-aarch64-debug.config.orig:4245:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in aarch64-kgcov, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-aarch64-kgcov.config.orig:4224:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in ppc64le-kgcov, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le-
kgcov.config.orig:4028:warning: override: PREEMPT changes choice state
>Found misconfigured config items in ppc64le, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-ppc64le.config.orig:4026:warning: override:
PREEMPT changes choice state
>Found misconfigured config items in x86_64-debug, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-x86_64-debug.config.orig:4212:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in x86_64-kgcov, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-x86_64-kgcov.config.orig:4192:warning:
override: PREEMPT changes choice state
>Found misconfigured config items in x86_64, please set them to an appropriate
value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-x86_64.config.orig:4190:warning: override:
PREEMPT changes choice state
>Found misconfigured config items in aarch64, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-
ark/redhat/configs/kernel-5.17.0-aarch64.config.orig:4222:warning: override:
PREEMPT changes choice state
>Found misconfigured config items in ppc64le-debug, please set them to an
appropriate value
>/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le-
debug.config.orig:4045:warning: override: PREEMPT changes choice state
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/configs/build_configs.sh | 32 +++++-
redhat/configs/process_configs.sh | 159 +++++++++++++++++++++++--------------
redhat/Makefile | 10 +-
3 files changed, 128 insertions(+), 73 deletions(-)
2 years, 1 month
[OS-BUILD PATCH] process_configs.sh: Add parallel processing of
configs in
dist-configs
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
process_configs.sh: Add parallel processing of configs in dist-configs
The dist-configs target takes an annoying long time.
Add parallel processing of configs in dist-configs.
Testing Info
------------
make dist-configs time 1m22.909s
make -j20 dist-configs time 11.801s
Removed redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
to test unset error.
>Found unset config items in x86_64-debug, please set them to an appropriate value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
>Found unset config items in x86_64-kgcov, please set them to an appropriate value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
>Found unset config items in x86_64, please set them to an appropriate value
>CONFIG_ACPI_HOTPLUG_MEMORY=n
Changed redhat/configs/common/generic/s390x/CONFIG_HID from 'is not set'
to '=n' to test mismatch error.
>Error: Mismatches found in configuration files for s390x
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x-kgcov
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x-debug
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x-zfcpdump
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x-debug
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x-kgcov
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x-zfcpdump
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
>Error: Mismatches found in configuration files for s390x
>Found # CONFIG_HID is not set, after generation, had CONFIG_HID n in Source tree
Changed redhat/configs/common/generic/CONFIG_PREEMPT to '=y' to test
misconfigured error.
Found misconfigured config items in aarch64-debug, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-aarch64-debug.config.orig:4245:warning: override: PREEMPT changes choice state
Found misconfigured config items in aarch64-kgcov, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-aarch64-kgcov.config.orig:4224:warning: override: PREEMPT changes choice state
Found misconfigured config items in ppc64le-kgcov, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le-kgcov.config.orig:4028:warning: override: PREEMPT changes choice state
Found misconfigured config items in ppc64le, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le.config.orig:4026:warning: override: PREEMPT changes choice state
Found misconfigured config items in x86_64-debug, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-x86_64-debug.config.orig:4212:warning: override: PREEMPT changes choice state
Found misconfigured config items in x86_64-kgcov, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-x86_64-kgcov.config.orig:4192:warning: override: PREEMPT changes choice state
Found misconfigured config items in x86_64, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-x86_64.config.orig:4190:warning: override: PREEMPT changes choice state
Found misconfigured config items in aarch64, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-aarch64.config.orig:4222:warning: override: PREEMPT changes choice state
Found misconfigured config items in ppc64le-debug, please set them to an appropriate value
/home/prarit/git-kernel/kernel-ark/redhat/configs/kernel-5.17.0-ppc64le-debug.config.orig:4045:warning: override: PREEMPT changes choice state
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -121,12 +121,12 @@ dist-kabi-dw-check: dist-kabi
@rm -rf $(KABIDW)/base/$(CURARCH).tmp
dist-configs-commit: dist-configs-prep
- @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
- ./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR)
+ +@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
+ ./process_configs.sh -z "$(PACKAGE_NAME)" "$(KVERSION)" "" $(FLAVOR)
dist-configs: dist-configs-prep
- @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
- ./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
+ +@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
+ ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(PACKAGE_NAME)" "$(KVERSION)"
dist-fedora-configs: FLAVOR = fedora
dist-fedora-configs: dist-configs
@@ -137,11 +137,11 @@ dist-rhel-configs: dist-configs
rh-configs: dist-rhel-configs
dist-configs-check: dist-configs-prep
- cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
+ +cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
dist-configs-prep: dist-clean-configs dist-buildreq-check
- cd $(REDHAT)/configs; ./build_configs.sh "partial" "$(ARCH_MACH)" "snip"
- cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)" "$(ARCH_MACH)" "$(FLAVOR)"
+ +cd $(REDHAT)/configs; ./build_configs.sh "partial" "$(ARCH_MACH)" "snip"
+ +cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)" "$(ARCH_MACH)" "$(FLAVOR)"
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 blahblah..blahblah 100755
--- a/redhat/configs/build_configs.sh
+++ b/redhat/configs/build_configs.sh
@@ -53,15 +53,25 @@ function combine_config_layer()
function merge_configs()
{
+ local archvar
+ local arch
+ local configs
+ local order
+ local flavor
+ local count
+ local name
+ local skip_if_missing
+
archvar=$1
arch=$(echo "$archvar" | cut -f1 -d"-")
configs=$2
order=$3
flavor=$4
+ count=$5
name=$OUTPUT_DIR/$PACKAGE_NAME-$archvar-$flavor.config
- echo -n "Building $name ... "
- touch config-merging config-merged
+ echo "Building $name ... "
+ touch config-merging.$count config-merged.$count
# apply based on order
skip_if_missing=""
@@ -73,10 +83,10 @@ function merge_configs()
test -n "$skip_if_missing" && test ! -e "$cfile" && continue
- if ! perl merge.pl "$cfile" config-merging > config-merged; then
+ if ! perl merge.pl "$cfile" config-merging.$count > config-merged.$count; then
die "Failed to merge $cfile"
fi
- mv config-merged config-merging
+ mv config-merged.$count config-merging.$count
done
# first configs in $order is baseline, all files should be
@@ -96,9 +106,9 @@ function merge_configs()
else
echo "# $arch" > "$name"
fi
- sort config-merging >> "$name"
- rm -f config-merged config-merging
- echo "done"
+ sort config-merging.$count >> "$name"
+ rm -f config-merged.$count config-merging.$count
+ echo "Building $name complete"
}
function build_flavor()
@@ -141,9 +151,15 @@ function build_flavor()
esac
fi
- merge_configs "$arch" "$configs" "$order" "$flavor"
+ merge_configs "$arch" "$configs" "$order" "$flavor" "$count" &
+ waitpids[$count]=$!
+ ((count++))
fi
done < "$control_file"
+
+ for pid in ${waitpids[*]}; do
+ wait $pid
+ done
}
while read -r line
diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -60,6 +60,9 @@ switch_to_toplevel()
checkoptions()
{
+ count=$3
+ variant=$4
+
/usr/bin/awk '
/is not set/ {
@@ -82,10 +85,10 @@ checkoptions()
print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
}
}
- ' "$1" "$2" > .mismatches
+ ' "$1" "$2" > .mismatches${count}
checkoptions_error=false
- if test -s .mismatches
+ if test -s .mismatches${count}
then
while read -r LINE
do
@@ -97,14 +100,15 @@ checkoptions()
checkoptions_error=true
break
fi
- done < .mismatches
+ done < .mismatches${count}
! $checkoptions_error && return
- echo "Error: Mismatches found in configuration files"
- cat .mismatches
- RETURNCODE=1
+ sed -i "1s/^/Error: Mismatches found in configuration files for ${variant}\n/" .mismatches${count}
+ cat .mismatches${count}
[ "$CONTINUEONERROR" ] || exit 1
+ else
+ rm -f .mismatches${count}
fi
}
@@ -218,73 +222,105 @@ function commit_new_configs()
git commit -m "[redhat] AUTOMATIC: New configs"
}
-function process_configs()
+function process_config()
{
- # assume we are in $source_tree/configs, need to get to top level
- pushd "$(switch_to_toplevel)" &>/dev/null
+ local cfg
+ local arch
+ local cfgtmp
+ local cfgorig
+ local count
+ local variant
+
+ cfg=$1
+ count=$2
+ arch=$(head -1 "$cfg" | cut -b 3-)
+ variant=$(basename "$cfg" | cut -d"-" -f3- | cut -d"." -f1)
+
+ if [ "$arch" = "EMPTY" ]
+ then
+ # This arch is intentionally left blank
+ return
+ fi
- for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
- do
- arch=$(head -1 "$cfg" | cut -b 3-)
+ cfgtmp="${cfg}.tmp"
+ cfgorig="${cfg}.orig"
+ cat "$cfg" > "$cfgorig"
- if [ "$arch" = "EMPTY" ]
- then
- # This arch is intentionally left blank
- continue
- fi
+ echo "Processing $cfg ... "
- cfgtmp="${cfg}.tmp"
- cfgorig="${cfg}.orig"
- cat "$cfg" > "$cfgorig"
+ make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig${count}
+ grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count}
+ if test -n "$NEWOPTIONS" && test -s .newoptions${count}
+ then
+ echo "Found unset config items in ${variant}, please set them to an appropriate value" >> .errors${count}
+ cat .newoptions${count} >> .errors${count}
+ rm .newoptions${count}
+ [ "$CONTINUEONERROR" ] || exit 1
+ fi
+ rm .newoptions${count}
- echo -n "Processing $cfg ... "
+ grep -E 'config.*warning' .listnewconfig${count} > .warnings${count}
+ if test -n "$CHECKWARNINGS" && test -s .warnings${count}
+ then
+ echo "Found misconfigured config items in ${variant}, please set them to an appropriate value" >> .errors${count}
+ cat .warnings${count} >> .errors${count}
+ rm .warnings${count}
+ [ "$CONTINUEONERROR" ] || exit 1
+ fi
+ rm .warnings${count}
- make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
- grep -E 'CONFIG_' .listnewconfig > .newoptions
- if test -n "$NEWOPTIONS" && test -s .newoptions
- then
- echo "Found unset config items, please set them to an appropriate value"
- cat .newoptions
- rm .newoptions
- RETURNCODE=1
- [ "$CONTINUEONERROR" ] || exit 1
- fi
- rm .newoptions
+ rm .listnewconfig${count}
- grep -E 'config.*warning' .listnewconfig > .warnings
- if test -n "$CHECKWARNINGS" && test -s .warnings
- then
- echo "Found misconfigured config items, please set them to an appropriate value"
- cat .warnings
- rm .warnings
- RETURNCODE=1
- [ "$CONTINUEONERROR" ] || exit 1
- fi
- rm .warnings
+ make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
+ echo "# $arch" > "$cfgtmp"
+ cat "$cfgorig" >> "$cfgtmp"
+ if test -n "$CHECKOPTIONS"
+ then
+ checkoptions "$cfg" "$cfgtmp" "$count" "$variant"
+ fi
+ # if test run, don't overwrite original
+ if test -n "$TESTRUN"
+ then
+ rm -f "$cfgtmp"
+ else
+ mv "$cfgtmp" "$cfg"
+ fi
+ rm -f "$cfgorig"
+ echo "Processing $cfg complete"
+}
- rm .listnewconfig
+function process_configs()
+{
+ # assume we are in $source_tree/configs, need to get to top level
+ pushd "$(switch_to_toplevel)" &>/dev/null
- make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
- echo "# $arch" > "$cfgtmp"
- cat "$cfgorig" >> "$cfgtmp"
- if test -n "$CHECKOPTIONS"
- then
- checkoptions "$cfg" "$cfgtmp"
- fi
- # if test run, don't overwrite original
- if test -n "$TESTRUN"
- then
- rm -f "$cfgtmp"
- else
- mv "$cfgtmp" "$cfg"
- fi
- rm -f "$cfgorig"
- echo "done"
+ count=0
+ for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
+ do
+ process_config "$cfg" "${count}" &
+ waitpids[${count}]=$!
+ ((count++))
+ done
+
+ for pid in ${waitpids[*]}; do
+ wait ${pid}
done
+
rm "$SCRIPT_DIR"/*.config*.old
+ if ls .errors* 1> /dev/null 2>&1; then
+ RETURNCODE=1
+ cat .errors*
+ rm .errors* -f
+ fi
+ if ls .mismatches* 1> /dev/null 2>&1; then
+ RETURNCODE=1
+ cat .mismatches*
+ rm .mismatches* -f
+ fi
+
popd > /dev/null
- echo "Processed config files are in $SCRIPT_DIR"
+ [ $RETURNCODE -eq 0 ] && echo "Processed config files are in $SCRIPT_DIR"
}
CHECKOPTIONS=""
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1635
2 years, 1 month
[OS-BUILD PATCH] redhat/Makefile.common: Fix BUILD_SCRATCH_TARGET
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile.common: Fix BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET is only used by the dist-brew and distg-brew targets,
and should be set to an appropriate brew target.
Set BUILD_SCRATCH_TARGET to the latest RHEL brew target.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index blahblah..blahblah 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -158,11 +158,7 @@ else
RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
endif
-ifeq ("$(DISTRO)", "fedora")
- BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
-else ifeq ("$(DISTRO)", "centos")
+BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR)-scratch
+ifeq ("$(DISTRO)", "centos")
BUILD_PROFILE ?= -p stream
- BUILD_SCRATCH_TARGET ?= c$(RHEL_MAJOR)s-candidate
-else
- BUILD_SCRATCH_TARGET ?= rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1628
2 years, 1 month
[OS-BUILD PATCHv3] redhat/Makefile: Fix dist-dump-variables target
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Fix dist-dump-variables target
The existing dist-dump-variables didn't output all the variables. Fix the
target so that it outputs all the Makefile variables.
v2: dzickus pointed out that the self-tests use the dist-dump-variables
target. Added additional code to fix the self-tests.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -162,10 +162,7 @@ dist-clean-rpmdirs:
rm -rf $$i; \
done;
-dist-clean-scripts:
- @rm -f dist-dump-variables.sh
-
-dist-clean: dist-clean-sources dist-clean-configs dist-clean-rpmdirs dist-clean-scripts
+dist-clean: dist-clean-sources dist-clean-configs dist-clean-rpmdirs
dist-stub-key:
@echo "Copying pre-generated keys";
@@ -437,12 +434,8 @@ dist-get-latest:
dist-os-version:
@echo "OSVERSION: $(RHEL_MAJOR).$(RHEL_MINOR)"
-.EXPORT_ALL_VARIABLES:
-.PHONY: dist-dump-variables
dist-dump-variables:
- grep -h "^[ ]*[a-zA-Z_][a-zA-Z_0-9]*[ ]*[:?]*=" $(REDHAT)/Makefile.common $(REDHAT)/Makefile $(TOPDIR)/Makefile.rhelver | sed -e 's/[ ]*\([a-zA-Z_][a-zA-Z_0-9]*\).*/echo "\1=$$\1"/' | sort | uniq > dist-dump-variables.sh
- chmod +x $(REDHAT)/dist-dump-variables.sh
- @$(REDHAT)/dist-dump-variables.sh
+ @$(foreach V,$(sort $(.VARIABLES)), $(if $(filter-out environment% default automatic, $(origin $V)),$(info $V=$($V) )))
dist-self-test:
@if test -x /usr/bin/bats; then \
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index blahblah..blahblah 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -23,6 +23,7 @@ ifneq ($(RPMKEXTRAVERSION),)
PREBUILD:=0$(KEXTRAVERSION).
UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
else
+ KEXTRAVERSION:=
ifeq ($(RPMKSUBLEVEL),0)
MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)
UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)
diff --git a/redhat/self-test/1005-dist-dump-variables.bats b/redhat/self-test/1005-dist-dump-variables.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/1005-dist-dump-variables.bats
+++ b/redhat/self-test/1005-dist-dump-variables.bats
@@ -5,25 +5,27 @@ function prologue()
tag=$1
ofile=$BATS_TMPDIR/$tag.out
# Have to unset environment variables that may be inherited from supra-make:
- grep "^[ ]*[a-zA-Z_][a-zA-Z_0-9]*[ ]*[:?]*=" \
- $BATS_TEST_DIRNAME/../Makefile.common | \
- sed -e 's/[ ]*\([a-zA-Z_][a-zA-Z_0-9]*\).*/unset \1/' | \
- sort | uniq > $BATS_TMPDIR/unset-vars.sh
- source $BATS_TMPDIR/unset-vars.sh
+ make dist-dump-variables | grep "=" | cut -d"=" -f1 | while read VAR; do unset "$VAR"; done
GIT=$BATS_TEST_DIRNAME/egit.sh HEAD=$tag EGIT_OVERRIDE_DESCRIBE=$tag DIST=.fc33 make dist-dump-variables > $ofile
}
function checkversion()
{
- status=1
- if grep -x "_TAG=$1" $ofile && \
- grep -x "RPMKVERSION=$2" $ofile && grep -x "RPMKPATCHLEVEL=$3" $ofile && \
- grep -x "RPMKSUBLEVEL=$4" $ofile && grep -x "RPMKEXTRAVERSION=$5" $ofile && \
- grep -x "KEXTRAVERSION=$6" $ofile && \
- grep -x "SNAPSHOT=$7" $ofile
- then
- status=$?
- fi
+ echo "verifying _TAG=$1"
+ grep -E "^_TAG=$1" $ofile
+ echo "verifying RPMKVERSION=$2"
+ grep -E "^RPMKVERSION=$2" $ofile
+ echo "verifying RPMPATCHLEVEL=$3"
+ grep -E "^RPMKPATCHLEVEL=$3" $ofile
+ echo "verifying RPMSUBLEVEL=$4"
+ grep -E "^RPMKSUBLEVEL=$4" $ofile
+ echo "verifying RPMEXTRAVERSION=$5"
+ grep -E "^RPMKEXTRAVERSION=$5" $ofile
+ echo "verifying KEXTRAVERSION=$6"
+ grep -E "^KEXTRAVERSION=$6" $ofile
+ echo "verifying SNAPSHOT=$6"
+ grep -E "^SNAPSHOT=$7" $ofile
+ status=0
}
@test "dist-dump-variables v5.8" {
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1625
2 years, 1 month
[OS-BUILD PATCHv2] redhat: configs: change aarch64 default dma domain
to lazy
by Jerry Snitselaar (via Email Bridge)
From: Jerry Snitselaar <jsnitsel(a)redhat.com>
redhat: configs: change aarch64 default dma domain to lazy
Change aarch64 to default to lazy dma domain as is currently
done with Intel and AMD iommus.
Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_LAZY b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_LAZY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_LAZY
@@ -0,0 +1,13 @@
+# Symbol: IOMMU_DEFAULT_DMA_LAZY [=n]
+# Type : bool
+# Defined at drivers/iommu/Kconfig:108
+# Prompt: Translated - Lazy
+# Depends on: <choice>
+# Location:
+# -> Device Drivers
+# -> IOMMU Hardware Support (IOMMU_SUPPORT [=y])
+# -> IOMMU default domain type (<choice> [=y])
+#
+#
+#
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_STRICT b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_STRICT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_STRICT
@@ -0,0 +1 @@
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1632
2 years, 1 month
[OS-BUILD PATCH] redhat: configs: change aarch64 default dma domain
to lazy
by Jerry Snitselaar (via Email Bridge)
From: Jerry Snitselaar <jsnitsel(a)redhat.com>
redhat: configs: change aarch64 default dma domain to lazy
Change aarch64 to default to lazy dma domain as is currently
done with Intel and AMD iommus.
Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_LAZY b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_LAZY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_LAZY
@@ -0,0 +1 @@
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_STRICT b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_STRICT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_IOMMU_DEFAULT_DMA_STRICT
@@ -0,0 +1 @@
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1632
2 years, 1 month
[OS-BUILD PATCHv2] redhat: configs: enable CONFIG_INTEL_PCH_THERMAL
for RHEL
x86
by David Arcari (via Email Bridge)
From: David Arcari <darcari(a)redhat.com>
redhat: configs: enable CONFIG_INTEL_PCH_THERMAL for RHEL x86
The current configuration is cleary wrong as it is only
valid for x86 platforms. Update the config files so that
it is enabled for both RHEL and Fedora x86 platforms.
Signed-off-by: David Arcari <darcari(a)redhat.com>
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_INTEL_PCH_THERMAL b/redhat/configs/ark/generic/x86/x86_64/CONFIG_INTEL_PCH_THERMAL
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_INTEL_PCH_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_PCH_THERMAL is not set
diff --git a/redhat/configs/ark/generic/CONFIG_INTEL_PCH_THERMAL b/redhat/configs/common/generic/x86/CONFIG_INTEL_PCH_THERMAL
rename from redhat/configs/ark/generic/CONFIG_INTEL_PCH_THERMAL
rename to redhat/configs/common/generic/x86/CONFIG_INTEL_PCH_THERMAL
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_INTEL_PCH_THERMAL
+++ b/redhat/configs/common/generic/x86/CONFIG_INTEL_PCH_THERMAL
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_INTEL_PCH_THERMAL b/redhat/configs/fedora/generic/x86/CONFIG_INTEL_PCH_THERMAL
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/x86/CONFIG_INTEL_PCH_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_PCH_THERMAL=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1629
2 years, 1 month