[OS-BUILD PATCH] RHMAINTAINERS: Update for Apr 26 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Apr 26 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -80,6 +80,19 @@ F: Makefile.rhelver F: redhat/ X: redhat/configs/ +CentOS Stream 10 Kernel Maintainer +M: Jan Stancek +M: Patrick Talbert +S: Supported +F: Makefile.rhelver +T: git https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git + +CentOS Stream 10 Real Time Kernel Maintainer +M: Chris White +M: John B. Wyatt IV +S: Supported +F: Makefile.rhelver + CentOS Stream 9 Kernel Maintainer M: Lucas Zampieri S: Supported @@ -402,6 +415,11 @@ S: Supported F: arch/arm64/include/asm/arch_timer.h F: drivers/clocksource/arm_arch_timer.c +ARM CORESIGHT HARDWARE TRACING +M: Mark Salter +S: Provided +F: drivers/hwtracing/coresight/ + ARM INTERRUPT CONTROLLERS (GIC) M: Mark Salter M: Jeremy Linton @@ -871,10 +889,13 @@ M:Mike Snitzer S: Supported F: Documentation/device-mapper/ F: drivers/md/dm* +F: drivers/md/dm-vdo/ F: drivers/md/persistent-data/ F: include/linux/device-mapper.h F: include/linux/dm-*.h F: include/uapi/linux/dm-*.h +X: drivers/md/dm-vdo/Kconfig +X: drivers/md/dm-vdo/Makefile DEVLINK M: Petr Oros @@ -913,6 +934,8 @@ M: Nigel Croxon S: Supported F: drivers/md/Kconfig F: drivers/md/Makefile +F: drivers/md/dm-vdo/Kconfig +F: drivers/md/dm-vdo/Makefile DMA BUFFER SHARING FRAMEWORK M: Lyude Paul @@ -1215,6 +1238,7 @@ M:Doug Ledford M: Prarit Bhargava S: Provided F: drivers/hwtracing/ +X: drivers/hwtracing/coresight/ HIBERNATION (aka Software Suspend, aka swsusp) M: Lenny Szubowicz @@ -1857,6 +1881,7 @@ F:include/linux/vmpressure.h F: include/linux/vmstat.h F: include/linux/zbud.h F: mm/ +F: tools/testing/selftests/mm/ X: include/linux/memstick.h MFD DRIVERS (Multi Function Devices) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3081 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] arch/x86: Fix XSAVE check for x86_64-v2 check
From: Prarit Bhargava
arch/x86: Fix XSAVE check for x86_64-v2 check
The flag check should be XSAVE, not OSXSAVE.
Signed-off-by: Prarit Bhargava
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index blahblah..blahblah 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -733,7 +733,7 @@ static void rh_check_supported(void)
!boot_cpu_has(X86_FEATURE_FMA) ||
/* LZCNT is not explicitly listed, but appears to be paired
with BMI2 */
!boot_cpu_has(X86_FEATURE_MOVBE) ||
- !boot_cpu_has(X86_FEATURE_OSXSAVE)) {
+ !boot_cpu_has(X86_FEATURE_XSAVE)) {
mark_hardware_deprecated("x86_64-v2", "%s:%s",
boot_cpu_data.x86_vendor_id,
boot_cpu_data.x86_model_id);
}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3052
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] redhat/configs: Enable CONFIG_AMDTEE for x86
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3049#note_1834736262 NACKED. I don't have an AMD t-shirt and I don't think anyone else should either. (joking of course) approved. -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] redhat/kernel.spec.template: update license
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3040#note_1829167195 I have verified that both BSD-2-Clause and Apache-2.0 are listed in https://docs.fedoraproject.org/en-US/legal/allowed-licenses/. -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Mar 18 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Mar 18 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -169,7 +169,7 @@ F: Makefile.rhelver RHEL 8.8 Real Time Kernel Maintainer M: Tyonnchie Berry -S: Supported +S: Unsupported F: Makefile.rhelver RHEL 8.7 Kernel Maintainer @@ -218,7 +218,7 @@ S: Supported F: Makefile RHEL 7.9 Real Time Kernel Maintainer -M: Crystal Wood +M: Crystal Wood S: Supported F: Makefile @@ -679,10 +679,11 @@ F:drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM -M: Benjamin Coddington -M: Jeffrey Layton -M: Steve Dickson -M: Scott Mayhew +M: Paulo Alcantara +R: Benjamin Coddington +R: Jeffrey Layton +R: Steve Dickson +R: Scott Mayhew S: Supported F: fs/cifs/ F: fs/smb/client/ @@ -1212,7 +1213,7 @@ S:Supported F: drivers/hwmon/ HWPOISON MEMORY FAILURE HANDLING -M: Dean Nelson +M: Aristeu Rozanski S: Supported F: mm/memory-failure.c F: mm/hwpoison-inject.c @@ -1896,6 +1897,7 @@ F:drivers/net/ethernet/myricom/myri10ge/ NAMESPACES M: Alex Gladkov +M: Joel Savitz R: Christoph von Recklinghausen S: Supported F: Documentation/admin-guide/namespaces/ @@ -1912,10 +1914,11 @@ F: tools/testing/selftests/pid_namespace/ F: tools/testing/selftests/rlimits/ NATIVE LANGUAGE SUPPORT -M: Benjamin Coddington -M: Jeffrey Layton -M: Steve Dickson -M: Scott Mayhew +M: Paulo Alcantara +R: Benjamin Coddington +R: Jeffrey Layton +R: Steve Dickson +R: Scott Mayhew S: Supported F: include/linux/nls.h F: fs/nls/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3022 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] spec: suppress "set +x" output
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2971#note_1801481359 You do not want to know how much time I spend trying to make that work. I should have just asked LOL -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv4] redhat/kernel.spec.template: Add log_msg macro
From: Prarit Bhargava
redhat/kernel.spec.template: Add log_msg macro
After last week's debugging session I was reminded why I hate debugging
the kernel.spec. It's not that it's long, or that the code is difficult
to understand -- it's that it can be difficult to map precisely where the
fault in the spec file is. This isn't due to poor design and is due to
the size of the kernel.spec and how rpmbuild creates bash scripts.
In the %prep and %build we often end up with an error that looks like
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
error: Bad exit status from /var/tmp/rpm-tmp.W1qm1T (%build)
In this example, the /var/tmp/rpm-tmp.W1qm1T script is created by
rpmbuild, and represents the %build stage of the spec file. It is left to
the user to decipher the script and map that into the kernel.spec file to
find the exact command(s) that failed; sometimes that is easy to do, and
other times it is the most infuriating thing ever. It's made me question
my choices in life and sent me into an existential crisis from which I'm
likely never to recover.
This changeset adds a log_msg macro. The hope is that this will be much
more useful than digging through the resulting prep, build, and install
scripts and trying to map the result to the spec file.
Add log_msg() to the %prep and %build stages, and prepopulate
the spec file with some log_msg's to indicate progress.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1711,11 +1711,20 @@ Prebuilt 64k unified kernel image for virtual machines.
%kernel_ipaclones_package
%endif
+%define log_msg() set +x \
+ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec |
grep log_msg | cut -d":" -f1) \
+ echo "kernel.spec:${_log_msglineno}: %{*}" \
+ set -x
+
%prep
+%{log_msg "Start of prep stage"}
+
+%{log_msg "Sanity checks"}
+
# do a few sanity-checks for --with *only builds
%if %{with_baseonly}
%if !%{with_up}
-echo "Cannot build --with baseonly, up build is disabled"
+%{log_msg "Cannot build --with baseonly, up build is disabled"}
exit 1
%endif
%endif
@@ -1724,7 +1733,7 @@ exit 1
if [ "%{patches}" != "%%{patches}" ] ; then
for patch in %{patches} ; do
if [ ! -f $patch ] ; then
- echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing"
+ %{log_msg "ERROR: Patch ${patch##/*/} listed in specfile but is
missing"}
exit 1
fi
done
@@ -1740,7 +1749,7 @@ ApplyPatch()
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
- echo "ERROR: Patch $patch not listed as a source patch in specfile"
+ %{log_msg "ERROR: Patch $patch not listed as a source patch in
specfile"}
exit 1
fi
fi 2>/dev/null
@@ -1757,6 +1766,7 @@ ApplyOptionalPatch()
{
local patch=$1
shift
+ %{log_msg "ApplyOptionalPatch: $1"}
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1
fi
@@ -1766,12 +1776,14 @@ ApplyOptionalPatch()
fi
}
+%{log_msg "Untar kernel tarball"}
%setup -q -n kernel-%{tarfile_release} -c
mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
+%{log_msg "Start of patch applications"}
%if !%{nopatches}
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
@@ -1779,10 +1791,11 @@ ApplyOptionalPatch patch-%{patchversion}-redhat.patch
ApplyOptionalPatch linux-kernel-test.patch
+%{log_msg "End of patch applications"}
# END OF PATCH APPLICATIONS
# Any further pre-build tree manipulations happen here.
-
+%{log_msg "Pre-build tree manipulations"}
chmod +x scripts/checkpatch.pl
mv COPYING COPYING-%{specrpmversion}-%{release}
@@ -1797,7 +1810,7 @@ rm -f localversion-next
# This fixes errors such as
# *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python.
Change it to python3 (or python2) explicitly.
# We patch all sources below for which we got a report/error.
-echo "Fixing Python shebangs..."
+%{log_msg "Fixing Python shebangs..."}
%py3_shebang_fix \
tools/kvm/kvm_stat/kvm_stat \
scripts/show_delta \
@@ -1817,6 +1830,7 @@ fi
mkdir configs
cd configs
+%{log_msg "Copy additional source files into buildroot"}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/%{name}-*.config .
cp %{SOURCE80} .
@@ -1828,6 +1842,7 @@ cp %{SOURCE3001} partial-kernel-local-debug-snip.config
FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion}
SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
# Collect custom defined config options
+%{log_msg "Collect custom defined config options"}
PARTIAL_CONFIGS=""
%if %{with_gcov}
[OS-BUILD PATCHv3] redhat/kernel.spec.template: Add log_msg macro
From: Prarit Bhargava
redhat/kernel.spec.template: Add log_msg macro
After last week's debugging session I was reminded why I hate debugging
the kernel.spec. It's not that it's long, or that the code is difficult
to understand -- it's that it can be difficult to map precisely where the
fault in the spec file is. This isn't due to poor design and is due to
the size of the kernel.spec and how rpmbuild creates bash scripts.
In the %prep and %build we often end up with an error that looks like
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
error: Bad exit status from /var/tmp/rpm-tmp.W1qm1T (%build)
In this example, the /var/tmp/rpm-tmp.W1qm1T script is created by
rpmbuild, and represents the %build stage of the spec file. It is left to
the user to decipher the script and map that into the kernel.spec file to
find the exact command(s) that failed; sometimes that is easy to do, and
other times it is the most infuriating thing ever. It's made me question
my choices in life and sent me into an existential crisis from which I'm
likely never to recover.
This changeset adds a log_msg macro. The hope is that this will be much
more useful than digging through the resulting prep, build, and install
scripts and trying to map the result to the spec file.
Add log_msg() to the %prep and %build stages, and prepopulate
the spec file with some log_msg's to indicate progress.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1711,11 +1711,20 @@ Prebuilt 64k unified kernel image for virtual machines.
%kernel_ipaclones_package
%endif
+%define log_msg() set +x \
+ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec |
grep log_msg | cut -d":" -f1) \
+ echo "kernel.spec:${_log_msglineno}: %{*}" \
+ set -x
+
%prep
+%{log_msg "Start of prep stage"}
+
+%{log_msg "Sanity checks"}
+
# do a few sanity-checks for --with *only builds
%if %{with_baseonly}
%if !%{with_up}
-echo "Cannot build --with baseonly, up build is disabled"
+%{log_msg "Cannot build --with baseonly, up build is disabled"}
exit 1
%endif
%endif
@@ -1724,7 +1733,7 @@ exit 1
if [ "%{patches}" != "%%{patches}" ] ; then
for patch in %{patches} ; do
if [ ! -f $patch ] ; then
- echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing"
+ %{log_msg "ERROR: Patch ${patch##/*/} listed in specfile but is
missing"}
exit 1
fi
done
@@ -1740,7 +1749,7 @@ ApplyPatch()
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
- echo "ERROR: Patch $patch not listed as a source patch in specfile"
+ %{log_msg "ERROR: Patch $patch not listed as a source patch in
specfile"}
exit 1
fi
fi 2>/dev/null
@@ -1757,6 +1766,7 @@ ApplyOptionalPatch()
{
local patch=$1
shift
+ %{log_msg "ApplyOptionalPatch: $1"}
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1
fi
@@ -1766,12 +1776,14 @@ ApplyOptionalPatch()
fi
}
+%{log_msg "Untar kernel tarball"}
%setup -q -n kernel-%{tarfile_release} -c
mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
+%{log_msg "Start of patch applications"}
%if !%{nopatches}
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
@@ -1779,10 +1791,11 @@ ApplyOptionalPatch patch-%{patchversion}-redhat.patch
ApplyOptionalPatch linux-kernel-test.patch
+%{log_msg "End of patch applications"}
# END OF PATCH APPLICATIONS
# Any further pre-build tree manipulations happen here.
-
+%{log_msg "Pre-build tree manipulations"}
chmod +x scripts/checkpatch.pl
mv COPYING COPYING-%{specrpmversion}-%{release}
@@ -1797,7 +1810,7 @@ rm -f localversion-next
# This fixes errors such as
# *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python.
Change it to python3 (or python2) explicitly.
# We patch all sources below for which we got a report/error.
-echo "Fixing Python shebangs..."
+%{log_msg "Fixing Python shebangs..."}
%py3_shebang_fix \
tools/kvm/kvm_stat/kvm_stat \
scripts/show_delta \
@@ -1817,6 +1830,7 @@ fi
mkdir configs
cd configs
+%{log_msg "Copy additional source files into buildroot"}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/%{name}-*.config .
cp %{SOURCE80} .
@@ -1828,6 +1842,7 @@ cp %{SOURCE3001} partial-kernel-local-debug-snip.config
FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion}
SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
# Collect custom defined config options
+%{log_msg "Collect custom defined config options"}
PARTIAL_CONFIGS=""
%if %{with_gcov}
[OS-BUILD PATCHv2] redhat/kernel.spec.template: Add log_msg macro
From: Prarit Bhargava
redhat/kernel.spec.template: Add log_msg macro
After last week's debugging session I was reminded why I hate debugging
the kernel.spec. It's not that it's long, or that the code is difficult
to understand -- it's that it can be difficult to map precisely where the
fault in the spec file is. This isn't due to poor design and is due to
the size of the kernel.spec and how rpmbuild creates bash scripts.
In the %prep, %build, and %install stages, we often end up with an error
that looks like
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
error: Bad exit status from /var/tmp/rpm-tmp.W1qm1T (%build)
In this example, the /var/tmp/rpm-tmp.W1qm1T script is created by
rpmbuild, and represents the %build stage of the spec file. It is left to
the user to decipher the script and map that into the kernel.spec file to
find the exact command(s) that failed; sometimes that is easy to do, and
other times it is the most infuriating thing ever. It's made me question
my choices in life and sent me into an existential crisis from which I'm
likely never to recover.
This changeset adds a log_msg macro. The hope is that this will be much
more useful than digging through the resulting prep, build, and install
scripts and trying to map the result to the spec file.
Add log_msg() to the %prep, %build, and %install stages, and prepopulate
the spec file with some log_msg's to indicate progress.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1711,11 +1711,20 @@ Prebuilt 64k unified kernel image for virtual machines.
%kernel_ipaclones_package
%endif
+%define log_msg() set +x \
+ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec |
grep log_msg | cut -d":" -f1) \
+ echo "kernel.spec:${_log_msglineno}: %{*}" \
+ set -x
+
%prep
+%{log_msg "Start of prep stage"}
+
+%{log_msg "Sanity checks"}
+
# do a few sanity-checks for --with *only builds
%if %{with_baseonly}
%if !%{with_up}
-echo "Cannot build --with baseonly, up build is disabled"
+%{log_msg "Cannot build --with baseonly, up build is disabled"}
exit 1
%endif
%endif
@@ -1724,7 +1733,7 @@ exit 1
if [ "%{patches}" != "%%{patches}" ] ; then
for patch in %{patches} ; do
if [ ! -f $patch ] ; then
- echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing"
+ %{log_msg "ERROR: Patch ${patch##/*/} listed in specfile but is
missing"}
exit 1
fi
done
@@ -1740,7 +1749,7 @@ ApplyPatch()
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
- echo "ERROR: Patch $patch not listed as a source patch in specfile"
+ %{log_msg "ERROR: Patch $patch not listed as a source patch in
specfile"}
exit 1
fi
fi 2>/dev/null
@@ -1757,6 +1766,7 @@ ApplyOptionalPatch()
{
local patch=$1
shift
+ %{log_msg "ApplyOptionalPatch: $1"}
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1
fi
@@ -1766,12 +1776,14 @@ ApplyOptionalPatch()
fi
}
+%{log_msg "Untar kernel tarball"}
%setup -q -n kernel-%{tarfile_release} -c
mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
+%{log_msg "Start of patch applications"}
%if !%{nopatches}
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
@@ -1779,10 +1791,11 @@ ApplyOptionalPatch patch-%{patchversion}-redhat.patch
ApplyOptionalPatch linux-kernel-test.patch
+%{log_msg "End of patch applications"}
# END OF PATCH APPLICATIONS
# Any further pre-build tree manipulations happen here.
-
+%{log_msg "Pre-build tree manipulations"}
chmod +x scripts/checkpatch.pl
mv COPYING COPYING-%{specrpmversion}-%{release}
@@ -1797,7 +1810,7 @@ rm -f localversion-next
# This fixes errors such as
# *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python.
Change it to python3 (or python2) explicitly.
# We patch all sources below for which we got a report/error.
-echo "Fixing Python shebangs..."
+%{log_msg "Fixing Python shebangs..."}
%py3_shebang_fix \
tools/kvm/kvm_stat/kvm_stat \
scripts/show_delta \
@@ -1817,6 +1830,7 @@ fi
mkdir configs
cd configs
+%{log_msg "Copy additional source files into buildroot"}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/%{name}-*.config .
cp %{SOURCE80} .
@@ -1828,6 +1842,7 @@ cp %{SOURCE3001} partial-kernel-local-debug-snip.config
FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion}
SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
# Collect custom defined config options
+%{log_msg "Collect custom defined config options"}
PARTIAL_CONFIGS=""
[OS-BUILD PATCH] redhat/kernel.spec.template: Add log_msg macro
From: Prarit Bhargava
redhat/kernel.spec.template: Add log_msg macro
After last week's debugging session I was reminded why I hate debugging
the kernel.spec. It's not that it's long, or that the code is difficult
to understand -- it's that it can be difficult to map precisely where the
fault in the spec file is. This isn't due to poor design and is due to
the size of the kernel.spec and how rpmbuild creates bash scripts.
In the %prep, %build, and %install stages, we often end up with an error
that looks like
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
cc1: error: unrecognized command-line option '-mbranch-protection=standard'
error: Bad exit status from /var/tmp/rpm-tmp.W1qm1T (%build)
In this example, the /var/tmp/rpm-tmp.W1qm1T script is created by
rpmbuild, and represents the %build stage of the spec file. It is left to
the user to decipher the script and map that into the kernel.spec file to
find the exact command(s) that failed; sometimes that is easy to do, and
other times it is the most infuriating thing ever. It's made me question
my choices in life and sent me into an existential crisis from which I'm
likely never to recover.
This changeset adds a log_msg macro. The hope is that this will be much
more useful than digging through the resulting prep, build, and install
scripts and trying to map the result to the spec file.
Add log_msg() to the %prep, %build, and %install stages, and prepopulate
the spec file with some log_msg's to indicate progress.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1711,11 +1711,20 @@ Prebuilt 64k unified kernel image for virtual machines.
%kernel_ipaclones_package
%endif
+%define log_msg() set +x \
+ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec |
grep log_msg | cut -d":" -f1) \
+ echo "kernel.spec:${_log_msglineno}: %{*}" \
+ set -x
+
%prep
+%{log_msg "Start of prep stage"}
+
+%{log_msg "Sanity checks"}
+
# do a few sanity-checks for --with *only builds
%if %{with_baseonly}
%if !%{with_up}
-echo "Cannot build --with baseonly, up build is disabled"
+%{log_msg "Cannot build --with baseonly, up build is disabled"}
exit 1
%endif
%endif
@@ -1724,7 +1733,7 @@ exit 1
if [ "%{patches}" != "%%{patches}" ] ; then
for patch in %{patches} ; do
if [ ! -f $patch ] ; then
- echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing"
+ %{log_msg "ERROR: Patch ${patch##/*/} listed in specfile but is
missing"}
exit 1
fi
done
@@ -1740,7 +1749,7 @@ ApplyPatch()
fi
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ;
then
if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then
- echo "ERROR: Patch $patch not listed as a source patch in specfile"
+ %{log_msg "ERROR: Patch $patch not listed as a source patch in
specfile"}
exit 1
fi
fi 2>/dev/null
@@ -1757,6 +1766,7 @@ ApplyOptionalPatch()
{
local patch=$1
shift
+ %{log_msg "ApplyOptionalPatch: $1"}
if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
exit 1
fi
@@ -1766,12 +1776,14 @@ ApplyOptionalPatch()
fi
}
+%{log_msg "Untar kernel tarball"}
%setup -q -n kernel-%{tarfile_release} -c
mv linux-%{tarfile_release} linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
+%{log_msg "Start of patch applications"}
%if !%{nopatches}
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
@@ -1779,10 +1791,11 @@ ApplyOptionalPatch patch-%{patchversion}-redhat.patch
ApplyOptionalPatch linux-kernel-test.patch
+%{log_msg "End of patch applications"}
# END OF PATCH APPLICATIONS
# Any further pre-build tree manipulations happen here.
-
+%{log_msg "Pre-build tree manipulations"}
chmod +x scripts/checkpatch.pl
mv COPYING COPYING-%{specrpmversion}-%{release}
@@ -1797,7 +1810,7 @@ rm -f localversion-next
# This fixes errors such as
# *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python.
Change it to python3 (or python2) explicitly.
# We patch all sources below for which we got a report/error.
-echo "Fixing Python shebangs..."
+%{log_msg "Fixing Python shebangs..."}
%py3_shebang_fix \
tools/kvm/kvm_stat/kvm_stat \
scripts/show_delta \
@@ -1817,6 +1830,7 @@ fi
mkdir configs
cd configs
+%{log_msg "Copy additional source files into buildroot"}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/%{name}-*.config .
cp %{SOURCE80} .
@@ -1828,6 +1842,7 @@ cp %{SOURCE3001} partial-kernel-local-debug-snip.config
FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion}
SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
# Collect custom defined config options
+%{log_msg "Collect custom defined config options"}
PARTIAL_CONFIGS=""
[OS-BUILD PATCHv2 2/2] redhat/self-test: Update CROSS_DISABLED_PACKAGES
From: Prarit Bhargava redhat/self-test: Update CROSS_DISABLED_PACKAGES CROSS_DISABLED_PACKAGES was changed in the previous commit and is exposed in the self-test data. Update the CROSS_DISABLED_PACKAGES entries in the self-test data. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -12,7 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -12,7 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -12,7 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -12,7 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -12,7 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools
[OS-BUILD PATCHv2 1/2] redhat: Do not build libperf with cross builds
From: Prarit Bhargava redhat: Do not build libperf with cross builds When executing one of the cross build targets, for example, dist-cross-aarch64-build, the compile fails with cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' These errors are from building libperf which, similar to perf, is base architecture specific. Do not build libperf in cross builds. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,6 +1,6 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2949 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2 0/2] redhat: Do not build libperf with cross builds
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2949 JIRA: https://issues.redhat.com/browse/RHELMISC-2923 When executing one of the cross build targets, for example, dist-cross-aarch64-build, the compile fails with cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' These errors are from building libperf which, similar to perf, is base architecture specific. Do not build libperf in cross builds. Signed-off-by: Prarit Bhargava --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 2 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 2 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 2 +- redhat/self-test/data/rhel-2585cf9dfaad.el7| 2 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/rhel-78e36f3b0dae.el7| 2 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/rhel-df0cc57e057f.el7| 2 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/rhel-fce15c45d3fb.el7| 2 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 2 +- redhat/Makefile.cross | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat: Do not build libperf with cross builds
From: Prarit Bhargava redhat: Do not build libperf with cross builds When executing one of the cross build targets, for example, dist-cross-aarch64-build, the compile fails with cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' These errors are from building libperf which, similar to perf, is base architecture specific. Do not build libperf in cross builds. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,6 +1,6 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2949 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat: Do not build libperf with cross builds
From: Prarit Bhargava redhat: Do not build libperf with cross builds When executing one of the cross build targets, for example, dist-cross-aarch64-build, the compile fails with cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' These errors are from building libperf which, similar to perf, is base architecture specific. Do not build libperf in cross builds. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,6 +1,6 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2949 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv3 0/4] redhat/Makefile: fix and clean up some of the logic (v2)
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2913#note_1781333867 create-data.sh now calls the setup_source make target, which calls dist-clean- sources. The dist-clean-sources skips the cleanup due to being wrapped with ifndef RHSELFTESTDATA. One thing that bothers me, is the description above the ifndef line: ```# skip dist-clean-sources when generating test data to prevent race condition``` which implies there is something wrong with the test data creation. That is not accurate -- the test data script explicitly does NOT need the cleanup and _setup_source was added specifically not do the cleanup. I think that comment should be changed to ```# Do not cleanup when creating self-test data``` Other than that, it looks good. -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Feb 16 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Feb 16 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -514,6 +514,9 @@ F: drivers/block/ BLUETOOTH SUBSYSTEM M: David Marlin +R: Bastien Nocera +R: Desnes Nunes +R: José Ignacio Tornos Martínez S: Supported F: drivers/bluetooth/ F: include/net/bluetooth/ @@ -1163,7 +1166,6 @@ M:Adam Jackson M: Lyude Paul R: Michel Dänzer R: Karol Herbst -R: Ben Skeggs R: Jocelyn Falempe R: Mika Penttilä S: Supported @@ -1465,6 +1467,16 @@ F: include/linux/dma-iommu.h F: include/linux/of_iommu.h F: include/uapi/linux/iommu.h +io_uring +M: Jeff Moyer +R: Brian Foster +R: Ming Lei +S: Maintained +F: include/uapi/linux/io_uring.h +F: include/linux/io_uring.h +F: include/linux/io_uring_types.h +F: io_uring/ + IPMI SUBSYSTEM M: Tony Camuso S: Supported @@ -2093,6 +2105,7 @@ F:lib/nlattr.c F: tools/testing/selftests/net/ F: tools/testing/selftests/wireguard/ X: Documentation/networking/arcnet* +X: Documentation/networking/caif/ X: Documentation/networking/can.rst X: Documentation/networking/can_ucan_protocol.rst X: Documentation/networking/device_drivers/ @@ -2910,6 +2923,8 @@ F:include/linux/thermal.h THUNDERBOLT SUBSYSTEM M: Desnes Nunes R: Jarod Wilson +R: David Marlin +R: José Ignacio Tornos Martínez S: Supported F: drivers/net/thunderbolt.c F: drivers/net/thunderbolt/ @@ -2993,11 +3008,14 @@ F: include/ufs/ USB network drivers M: José Ignacio Tornos Martínez +R: Desnes Nunes S: Supported F: drivers/net/usb/ USB SUBSYSTEM M: Desnes Nunes +R: José Ignacio Tornos Martínez +R: Bastien Nocera S: Supported F: drivers/usb/ F: drivers/media/usb/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2944 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated
From: Prarit Bhargava
arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated
Upstream Status: RHEL only
The x86 industry has defined microarchitecture levels x86_64-v1 and
x86_64-v2 as defined here:
https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
RHEL9 has a minimum of the x86_64-v2 microarchitecture and RHEL10 has a
minimum of the x86_64-v3 microarchitecture.
Mark x86_64-v1 and x86_64-v2 processors as deprecated.
Signed-off-by: Prarit Bhargava
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index blahblah..blahblah 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -708,6 +708,36 @@ static void rh_check_supported(void)
*/
if (acpi_disabled && !guest)
pr_crit("ACPI has been disabled or is not available on this
hardware. This may result in a single cpu boot, incorrect PCI IRQ routing, or
boot failure.\n");
+
+ /*
+* x86_64 microarchitecture levels:
+* https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
+*
+* RHEL9 has a minimum of the x86_64-v2 microarchitecture
+* RHEL10 has a minimum of the x86_64-v3 microarchitecture
+*/
+
+ if (!boot_cpu_has(X86_FEATURE_CX16) || /* CMPXCHG16B */
+ !boot_cpu_has(X86_FEATURE_LAHF_LM) || /* LAHF-SAHF */
+ !boot_cpu_has(X86_FEATURE_POPCNT) ||
+ !boot_cpu_has(X86_FEATURE_XMM3) || /* SSE-3 */
+ !boot_cpu_has(X86_FEATURE_XMM4_1) || /* SSE4_1 */
+ !boot_cpu_has(X86_FEATURE_XMM4_2) || /* SSE4_2 */
+ !boot_cpu_has(X86_FEATURE_SSSE3)) {
+ mark_hardware_deprecated("x86_64-v1", "%s:%s",
+boot_cpu_data.x86_vendor_id,
boot_cpu_data.x86_model_id);
+ } else if (!boot_cpu_has(X86_FEATURE_AVX) ||
+ !boot_cpu_has(X86_FEATURE_AVX2) ||
+ !boot_cpu_has(X86_FEATURE_BMI1) ||
+ !boot_cpu_has(X86_FEATURE_BMI2) ||
+ !boot_cpu_has(X86_FEATURE_F16C) ||
+ !boot_cpu_has(X86_FEATURE_FMA) ||
+ /* LZCNT is not explicitly listed, but appears to be paired
with BMI2 */
+ !boot_cpu_has(X86_FEATURE_MOVBE) ||
+ !boot_cpu_has(X86_FEATURE_OSXSAVE)) {
+ mark_hardware_deprecated("x86_64-v2", "%s:%s",
+boot_cpu_data.x86_vendor_id,
boot_cpu_data.x86_model_id);
+ }
}
#else
#define rh_check_supported()
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index blahblah..blahblah 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -446,11 +446,13 @@ struct module;
#ifdef CONFIG_RHEL_DIFFERENCES
void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...);
+void mark_hardware_deprecated(const char *driver_name, char *fmt, ...);
void mark_tech_preview(const char *msg, struct module *mod);
void mark_partner_supported(const char *msg, struct module *mod);
void init_rh_check_status(char *fn_name);
#else
static inline void mark_hardware_unmaintained(const char *driver_name, char
*fmt, ...) { }
+static inline void mark_hardware_deprecated(const char *driver_name, char
*fmt, ...) { }
static inline void mark_tech_preview(const char *msg, struct module *mod) { }
static inline void mark_partner_supported(const char *msg, struct module *mod)
{ }
#endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2912
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2] RHMAINTAINERS: Update for Feb 2 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Feb 2 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -724,7 +724,7 @@ F: Documentation/ABI/testing/sysfs-bus-cxl F: Documentation/driver-api/cxl/memory-devices.rst CONFIGFS -M: Bob Peterson +M: Alexander Aring S: Supported F: fs/configfs/ F: include/linux/configfs.h @@ -851,6 +851,7 @@ F: Documentation/networking/devlink/ F: net/core/devlink.c F: net/devlink/ F: include/net/devlink.h +F: include/trace/events/devlink.h F: include/uapi/linux/devlink.h DIRECT IO @@ -866,7 +867,6 @@ F: drivers/scsi/hpsa* DISTRIBUTED LOCK MANAGER (DLM) M: Alexander Aring R: David Teigland -R: Bob Peterson R: Andreas Gruenbacher S: Supported F: fs/dlm/ @@ -957,6 +957,7 @@ S: Supported F: Documentation/networking/bridge.rst F: net/bridge/ F: include/linux/if_bridge.h +F: include/trace/events/bridge.h F: include/uapi/linux/if_bridge.h F: include/uapi/linux/mrp_bridge.h @@ -1124,7 +1125,6 @@ F:drivers/phy/ F: include/linux/phy/ GFS2 FILE SYSTEM -M: Bob Peterson M: Andreas Gruenbacher R: Abhi Das R: Andrew Price @@ -1205,7 +1205,7 @@ F:drivers/hte/ F: include/linux/hte.h HWMON SUBSYSTEM -M: Dean Nelson +M: David Arcari S: Supported F: drivers/hwmon/ @@ -2026,6 +2026,17 @@ F: include/linux/sock* F: include/linux/tcp.h F: include/linux/tfrc.h F: include/linux/udp.h +F: include/trace/events/fib.h +F: include/trace/events/fib6.h +F: include/trace/events/net_probe_common.h +F: include/trace/events/mptcp.h +F: include/trace/events/napi.h +F: include/trace/events/neigh.h +F: include/trace/events/netlink.h +F: include/trace/events/skb.h +F: include/trace/events/sock.h +F: include/trace/events/tcp.h +F: include/trace/events/udp.h F: include/uapi/asm-generic/socket.h F: include/uapi/linux/*diag.h F: include/uapi/linux/dcbnl.h @@ -2689,6 +2700,7 @@ F:Documentation/networking/sctp.* F: net/sctp/ F: include/linux/sctp.h F: include/net/sctp/ +F: include/trace/events/sctp.h F: include/uapi/linux/sctp.h SECURITY SUBSYSTEM @@ -3211,7 +3223,7 @@ F:Documentation/networking/device_drivers/wwan/ X86 ARCHITECTURE M: David Arcari M: Prarit Bhargava -M: Dean Nelson +R: Steve Best R: Lenny Szubowicz S: Supported F: arch/x86/ @@ -3240,7 +3252,7 @@ X:arch/x86/net/ X86 CPU POWER MANAGEMENT M: Prarit Bhargava M: David Arcari -R: Dean Nelson +R: Steve Best S: Supported F: arch/x86/kernel/cpu/cpufreq/ F: drivers/cpufreq/intel_pstate.c @@ -3249,7 +3261,7 @@ F:drivers/idle/intel_idle.c F: drivers/idle/Kconfig X86 FPU SUBSYSTEM -M: Dean Nelson +M: Steve Best R: David Arcari R: Prarit Bhargava S: Supported @@ -3268,6 +3280,8 @@ F:include/net/netns/xdp.h F: include/net/page_pool.h F: include/net/*xdp* F: include/net/*xsk* +F: include/trace/events/page_pool.h +F: include/trace/events/xdp.h F: include/uapi/linux/*xdp* F: net/core/page_pool.c F: net/core/sock_map.c -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2920 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Feb 2 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Feb 2 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -724,7 +724,7 @@ F: Documentation/ABI/testing/sysfs-bus-cxl F: Documentation/driver-api/cxl/memory-devices.rst CONFIGFS -M: Bob Peterson +M: Alexander Aring S: Supported F: fs/configfs/ F: include/linux/configfs.h @@ -851,6 +851,7 @@ F: Documentation/networking/devlink/ F: net/core/devlink.c F: net/devlink/ F: include/net/devlink.h +F: include/trace/events/devlink.h F: include/uapi/linux/devlink.h DIRECT IO @@ -866,7 +867,6 @@ F: drivers/scsi/hpsa* DISTRIBUTED LOCK MANAGER (DLM) M: Alexander Aring R: David Teigland -R: Bob Peterson R: Andreas Gruenbacher S: Supported F: fs/dlm/ @@ -957,6 +957,7 @@ S: Supported F: Documentation/networking/bridge.rst F: net/bridge/ F: include/linux/if_bridge.h +F: include/trace/events/bridge.h F: include/uapi/linux/if_bridge.h F: include/uapi/linux/mrp_bridge.h @@ -1124,7 +1125,6 @@ F:drivers/phy/ F: include/linux/phy/ GFS2 FILE SYSTEM -M: Bob Peterson M: Andreas Gruenbacher R: Abhi Das R: Andrew Price @@ -1205,7 +1205,7 @@ F:drivers/hte/ F: include/linux/hte.h HWMON SUBSYSTEM -M: Dean Nelson +M: David Arcari S: Supported F: drivers/hwmon/ @@ -2026,6 +2026,17 @@ F: include/linux/sock* F: include/linux/tcp.h F: include/linux/tfrc.h F: include/linux/udp.h +F: include/trace/events/fib.h +F: include/trace/events/fib6.h +F: include/trace/events/net_probe_common.h +F: include/trace/events/mptcp.h +F: include/trace/events/napi.h +F: include/trace/events/neigh.h +F: include/trace/events/netlink.h +F: include/trace/events/skb.h +F: include/trace/events/sock.h +F: include/trace/events/tcp.h +F: include/trace/events/udp.h F: include/uapi/asm-generic/socket.h F: include/uapi/linux/*diag.h F: include/uapi/linux/dcbnl.h @@ -2689,6 +2700,7 @@ F:Documentation/networking/sctp.* F: net/sctp/ F: include/linux/sctp.h F: include/net/sctp/ +F: include/trace/events/sctp.h F: include/uapi/linux/sctp.h SECURITY SUBSYSTEM @@ -3211,7 +3223,7 @@ F:Documentation/networking/device_drivers/wwan/ X86 ARCHITECTURE M: David Arcari M: Prarit Bhargava -M: Dean Nelson +R: Steve Best R: Lenny Szubowicz S: Supported F: arch/x86/ @@ -3240,7 +3252,7 @@ X:arch/x86/net/ X86 CPU POWER MANAGEMENT M: Prarit Bhargava M: David Arcari -R: Dean Nelson +R: Steve Best S: Supported F: arch/x86/kernel/cpu/cpufreq/ F: drivers/cpufreq/intel_pstate.c @@ -3249,7 +3261,7 @@ F:drivers/idle/intel_idle.c F: drivers/idle/Kconfig X86 FPU SUBSYSTEM -M: Dean Nelson +M: Steve Best R: David Arcari R: Prarit Bhargava S: Supported @@ -3268,6 +3280,8 @@ F:include/net/netns/xdp.h F: include/net/page_pool.h F: include/net/*xdp* F: include/net/*xsk* +F: include/trace/events/page_pool.h +F: include/trace/events/xdp.h F: include/uapi/linux/*xdp* F: net/core/page_pool.c F: net/core/sock_map.c -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2920 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] configs: make CONFIG_EDAC_GHES a module
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2914#note_1752140671 That's what we all say when we break the build :) (joking). -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv8 0/3] redhat/Makefile: fix and clean up some of the logic
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892#note_1740140262 In case it isn't obvious :) well done @omos :) -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv8 0/3] redhat/Makefile: fix and clean up some of the logic
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892#note_1738436678 I approve of the cleanup but I'm not sure I like the idea of moving the KABI tarballs from SOURCES to /redhat. Was there a compelling reason to move them? -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat/configs: Remove HOTPLUG_CPU0 configs
From: Prarit Bhargava
redhat/configs: Remove HOTPLUG_CPU0 configs
linux commit e59e74dc48a3 ("x86/topology: Remove CPU0 hotplug option")
removed the code that implements these CONFIGs. These files can be safely
removed.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/configs/fedora/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
b/redhat/configs/fedora/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_HOTPLUG_CPU0
b/redhat/configs/fedora/generic/CONFIG_DEBUG_HOTPLUG_CPU0
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_DEBUG_HOTPLUG_CPU0
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
b/redhat/configs/rhel/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
diff --git a/redhat/configs/rhel/generic/x86/CONFIG_BOOTPARAM_HOTPLUG_CPU0
b/redhat/configs/rhel/generic/x86/CONFIG_BOOTPARAM_HOTPLUG_CPU0
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/x86/CONFIG_BOOTPARAM_HOTPLUG_CPU0
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BOOTPARAM_HOTPLUG_CPU0=y
diff --git a/redhat/configs/rhel/generic/x86/CONFIG_DEBUG_HOTPLUG_CPU0
b/redhat/configs/rhel/generic/x86/CONFIG_DEBUG_HOTPLUG_CPU0
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/x86/CONFIG_DEBUG_HOTPLUG_CPU0
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2891
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Jan 5 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Jan 5 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -1020,6 +1020,7 @@ M:Justin Forbes S: Supported F: redhat/configs/fedora/ F: redhat/fedora_files/ +F: redhat/scripts/fedora/ FILESYSTEM (GENERAL) M: Brian Foster -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2850 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat/self-test: Remove --all from git query
From: Prarit Bhargava
redhat/self-test: Remove --all from git query
It was reported that executing this test on an older tag failed. This
occurs because the git query to find the most recent "[redhat] kernel"
commit looks at the entire git history instead of the branch's history.
Removing the '--all' from the "[redhat] kernel" lookup resolves this
problem.
Testing:
There are 3 cases that I considered which all succeed with this change:
1. running on os-build or ark-latest
git co origin/os-build
RHEL_MAJOR=9 RHEL_MINOR=99 bats redhat/self-test/2001-dist-release.bats
2. a new branch based on os-build/ark-latest
git co origin/ark-latest
git checkout -b junk
/# make some changes
RHEL_MAJOR=9 RHEL_MINOR=99 bats redhat/self-test/2001-dist-release.bats
3. an older branch based on a tag
git co kernel-6.6.0-0.rc7.56567a20b22b.59
RHEL_MAJOR=9 RHEL_MINOR=99 bats redhat/self-test/2001-dist-release.bats
Signed-off-by: Prarit Bhargava
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
@@ -60,15 +60,20 @@ _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:
changelog=$(head -1
./redhat/kernel.changelog-${RHEL_MAJOR}.${RHEL_MINOR} | sed -e
's/.*\[\(.*\)\].*/\1/')
- commit="$(git log --oneline --all --grep "\[redhat\] kernel" -n 1
--pretty="format:%s")"
+
+ # Extract the tag in the latest [redhat] kernel commit message
+ commit="$(git log --oneline --grep "\[redhat\] kernel" -n 1
--pretty="format:%s")"
# Extract just the commit message part AFTER "[redhat] ":
gitlog=${commit##*\[redhat\] }
# This time, strip off "kernel-" also:
gitlog=${gitlog/kernel-/}
+
echo "The kernel version in the changelog-${RHEL_MAJOR}.${RHEL_MINOR}
("${changelog}") differs from the version in the git log ($gitlog)"
+
run _dist-release_test_3
check_status
}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2837
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Dec 8 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Dec 8 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -739,6 +739,7 @@ Continuous Integration (CKI) M: Tales da Aparecida M: Michael Hofmann M: Serhii Turivnyi +M: Bohdan Khomutskyi S: Supported F: .gitlab-ci.yml I: INTERNAL -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2833 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Dec 8 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Dec 8 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -739,6 +739,7 @@ Continuous Integration (CKI) M: Tales da Aparecida M: Michael Hofmann M: Serhii Turivnyi +M: Bohdan Khomutskyi S: Supported F: .gitlab-ci.yml I: INTERNAL -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2833 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH 0/0] redhat: scripts: An automation script for disabling unused driver for x86
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2832#note_1683927918 So I'll ask again: Why aren't you using the custom-overrides for this functionality, and tracking the contents of that file locally? It seems a better approach would be to apply changes there which can be per-build or per- system (depending on what you're doing)? -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH 0/0] redhat: scripts: An automation script for disabling unused driver for x86
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2832#note_1682131422 Then, like @jstancek , I don't understand the problem being solved here. -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH 0/0] redhat: scripts: An automation script for disabling unused driver for x86
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2832#note_1682032702 Not to pile on but if you want to use the 'standard' config we've laid out and then disable or enable configs, then why aren't you using the custom-overrides functionality as described in redhat/configs/README ? -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] aarch64: enable uki
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2818#note_1668421817 Approving but I think others should take a look as well. @jstancek @jmflinuxtx @ptalbert? -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Nov 27 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Nov 27 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -420,7 +420,6 @@ F: drivers/iommu/arm/ F: drivers/iommu/io-pgtable-arm.c ARM/QUALCOMM SUPPORT -M: Adrien Thierry M: Andrew Halaney M: Brian Masney M: Eric Chanudet @@ -486,7 +485,6 @@ F: kernel/audit* AUTOMOTIVE M: Jarod Wilson M: Julio Faracco -R: Adrien Thierry R: Alessandro Carminati R: Andrew Halaney R: Brian Masney @@ -1195,7 +1193,6 @@ F:include/linux/hid* F: include/uapi/linux/hid* HTE SUBSYSTEM (HARDWARE TIMESTAMP ENGINE) -M: Adrien Thierry M: Andrew Halaney M: Brian Masney M: Eric Chanudet @@ -1727,7 +1724,6 @@ S:Supported F: arch/x86/kernel/cpu/mcheck/ MAILBOX DRIVERS -M: Adrien Thierry M: Andrew Halaney M: Brian Masney M: Eric Chanudet @@ -1901,6 +1897,15 @@ F: kernel/user_namespace.c F: tools/testing/selftests/pid_namespace/ F: tools/testing/selftests/rlimits/ +NATIVE LANGUAGE SUPPORT +M: Benjamin Coddington +M: Jeffrey Layton +M: Steve Dickson +M: Scott Mayhew +S: Supported +F: include/linux/nls.h +F: fs/nls/ + NETFILTER M: Florian Westphal S: Supported @@ -2191,7 +2196,9 @@ M:Jeffrey Layton M: Steve Dickson M: Scott Mayhew S: Supported +F: Documentation/filesystems/nfs/ F: fs/nfs/ +F: include/linux/nfs*.h NFS SERVER (nfsd) M: Benjamin Coddington @@ -2200,6 +2207,7 @@ M:Steve Dickson M: Scott Mayhew S: Supported F: fs/nfsd/ +F: include/uapi/linux/nfsd/* NITRO ENCLAVES (NE) M: Cathy Avery @@ -2590,6 +2598,11 @@ F: include/linux/rtc/ F: include/uapi/linux/rtc.h F: tools/testing/selftests/rtc/ +REAL TIME SUBSYSTEM +M: Clark Williams +S: Supported +F: kernel/Kconfig.preempt + REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM M: Doug Ledford M: Prarit Bhargava @@ -2799,7 +2812,6 @@ S:Provided F: drivers/soundwire/ SPI DRIVERS (Serial Peripheral Interface) -M: Adrien Thierry M: Andrew Halaney M: Brian Masney M: Eric Chanudet @@ -2825,6 +2837,9 @@ M:Steve Dickson M: Scott Mayhew S: Supported F: net/sunrpc/ +F: include/linux/sunrpc/* +F: include/uapi/linux/sunrpc/* +F: include/trace/events/sunrpc.h SUSPEND/RESUME M: Lenny Szubowicz @@ -2955,7 +2970,6 @@ F:arch/x86/kernel/efi* F: include/linux/efi.h UNIVERSAL FLASH STORAGE HOST CONTROLLER -M: Adrien Thierry M: Andrew Halaney M: Brian Masney M: Eric Chanudet @@ -3035,6 +3049,16 @@ F: drivers/vhost/vsock.c F: drivers/vhost/vsock.h X: net/vmw_vsock/hyperv* +VIRTIO BALLOON DRIVER +M: "Michael S. Tsirkin" +M: David Hildenbrand +L: rhvirt-patc...@redhat.com +S: Supported +F: drivers/virtio/virtio_balloon.c +F: include/linux/balloon_compaction.h +F: include/uapi/linux/virtio_balloon.h +F: mm/balloon_compaction.c + VIRTIO CONSOLE DRIVER M: "Michael S. Tsirkin" M: Jason Wang @@ -3059,7 +3083,6 @@ F:include/linux/virtio*.h F: include/linux/vdpa.h F: include/uapi/linux/virtio_*.h F: drivers/crypto/virtio/ -F: mm/balloon_compaction.c VIRTIO CRYPTO DRIVER M: "Michael S. Tsirkin" @@ -3098,6 +3121,13 @@ S: Supported F: drivers/virtio/virtio_input.c F: include/uapi/linux/virtio_input.h +VIRTIO MEM DRIVER +M: David Hildenbrand +L: rhvirt-patc...@redhat.com +S: Supported +F: drivers/virtio/virtio_mem.c +F: include/uapi/linux/virtio_mem.h + VIRTUALIZATION SUPPORT DRIVERS M: Vitaly Kuznetsov M: Cathy Avery -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2827 -- ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] kernel/rh_messages.c: Mark functions as possibly unused
From: Prarit Bhargava
kernel/rh_messages.c: Mark functions as possibly unused
Upstream Status: RHEL Only
These functions may or may not be used in different architectures.
Mark them all as __maybe_unused.
Signed-off-by: Prarit Bhargava
diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c
index blahblah..blahblah 100644
--- a/kernel/rh_messages.c
+++ b/kernel/rh_messages.c
@@ -39,7 +39,7 @@
*
* Reserved for Internal Red Hat use only.
*/
-void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...)
+void __maybe_unused mark_hardware_unmaintained(const char *driver_name, char
*fmt, ...)
{
char device_description[DEV_DESC_LEN];
va_list args;
@@ -69,7 +69,7 @@ EXPORT_SYMBOL(mark_hardware_unmaintained);
*
* Reserved for Internal Red Hat use only.
*/
-void mark_hardware_deprecated(const char *driver_name, char *fmt, ...)
+void __maybe_unused mark_hardware_deprecated(const char *driver_name, char
*fmt, ...)
{
char device_description[DEV_DESC_LEN];
va_list args;
@@ -98,7 +98,7 @@ void mark_hardware_deprecated(const char *driver_name, char
*fmt, ...)
*
* Reserved for Internal Red Hat use only.
*/
-static void mark_hardware_disabled(const char *driver_name, char *fmt, ...)
+static void __maybe_unused mark_hardware_disabled(const char *driver_name,
char *fmt, ...)
{
char device_description[DEV_DESC_LEN];
va_list args;
@@ -119,7 +119,7 @@ static void mark_hardware_disabled(const char *driver_name,
char *fmt, ...)
*
* Reserved for Internal Red Hat use only.
*/
-static void pci_hw_deprecated(struct pci_dev *dev)
+static void __maybe_unused pci_hw_deprecated(struct pci_dev *dev)
{
const struct pci_device_id *ret =
pci_match_id(rh_deprecated_pci_devices, dev);
@@ -157,7 +157,7 @@ static void pci_hw_unmaintained(struct pci_dev *dev)
*
* Reserved for Internal Red Hat use only.
*/
-static bool pci_hw_disabled(struct pci_dev *dev)
+static bool __maybe_unused pci_hw_disabled(struct pci_dev *dev)
{
const struct pci_device_id *ret = pci_match_id(rh_disabled_pci_devices,
dev);
@@ -186,7 +186,7 @@ static bool pci_hw_disabled(struct pci_dev *dev)
*
* Reserved for Internal Red Hat use only.
*/
-static void driver_unmaintained(const char* module_name)
+static void __maybe_unused driver_unmaintained(const char* module_name)
{
int i = 0;
@@ -215,7 +215,7 @@ static void driver_unmaintained(const char* module_name)
*
* Reserved for Internal Red Hat use only.
*/
-static void driver_deprecated(const char* module_name)
+static void __maybe_unused driver_deprecated(const char* module_name)
{
int i = 0;
@@ -247,7 +247,7 @@ static void driver_deprecated(const char* module_name)
* Reserved for Internal Red Hat use only.
*/
-static void init_fn_unmaintained(char* fn_name)
+static void __maybe_unused init_fn_unmaintained(char* fn_name)
{
int i = 0;
@@ -276,7 +276,7 @@ static void init_fn_unmaintained(char* fn_name)
*
* Reserved for Internal Red Hat use only.
*/
-static void init_fn_deprecated(char* fn_name)
+static void __maybe_unused init_fn_deprecated(char* fn_name)
{
int i = 0;
@@ -302,7 +302,7 @@ static void init_fn_deprecated(char* fn_name)
*
* Reserved for Internal Red Hat use only.
*/
-void mark_tech_preview(const char *msg, struct module *mod)
+void __maybe_unused mark_tech_preview(const char *msg, struct module *mod)
{
const char *str = NULL;
@@ -332,7 +332,7 @@ EXPORT_SYMBOL(mark_tech_preview);
*
* Reserved for Internal Red Hat use only.
*/
-void mark_partner_supported(const char *msg, struct module *mod)
+void __maybe_unused mark_partner_supported(const char *msg, struct module *mod)
{
const char *str = NULL;
@@ -370,7 +370,7 @@ EXPORT_SYMBOL(mark_partner_supported);
*
* Reserved for Internal Red Hat use only.
*/
-bool pci_rh_check_status(struct pci_dev *pci_dev)
+bool __maybe_unused pci_rh_check_status(struct pci_dev *pci_dev)
{
if (pci_dev->driver->driver.owner != NULL) {
if (!test_bit(TAINT_OOT_MODULE,
_dev->driver->driver.owner->taints)) {
@@ -391,7 +391,7 @@ bool pci_rh_check_status(struct pci_dev *pci_dev)
*
* Reserved for Internal Red Hat use only.
*/
-void module_rh_check_status(const char * module_name)
+void __maybe_unused module_rh_check_status(const char * module_name)
{
driver_unmaintained(module_name);
driver_deprecated(module_name);
@@ -407,7 +407,7 @@ void module_rh_check_status(const char * module_name)
*
* Reserved for Internal Red Hat use only.
*/
-void init_rh_check_status(char *fn_name)
+void __maybe_unused init_rh_check_status(char *fn_name)
{
init_fn_deprecated(fn_name);
init_fn_unmaintained(fn_name);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2813
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to
[OS-BUILD PATCH] redhat: Really remove cpupower files
From: Prarit Bhargava
redhat: Really remove cpupower files
a13e49d0dd0f ("redhat: Remove cpupower files") removed the need for these
files but they were left in place.
Really remove these dead files.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/kernel-tools/cpupower.config
b/redhat/scripts/kernel-tools/cpupower.config
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/scripts/kernel-tools/cpupower.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# See 'cpupower help' and cpupower(1) for more info
-CPUPOWER_START_OPTS="frequency-set -g performance"
-CPUPOWER_STOP_OPTS="frequency-set -g ondemand"
diff --git a/redhat/scripts/kernel-tools/cpupower.service
b/redhat/scripts/kernel-tools/cpupower.service
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/scripts/kernel-tools/cpupower.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Configure CPU power related settings
-After=syslog.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/sysconfig/cpupower
-ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS
-ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS
-
-[Install]
-WantedBy=multi-user.target
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2770
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat: remove update_scripts.sh
From: Prarit Bhargava
redhat: remove update_scripts.sh
Remove update_scripts.sh and incorporate it as a function in the Makefile.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -691,7 +691,6 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source
dist-configs-check
configs/$(SPECPACKAGE_NAME)-*.config \
configs/partial*.config \
scripts/gating/gating.yaml \
- scripts/update_scripts.sh \
scripts/mod/mod-denylist.sh \
scripts/mod/mod-internal.list \
scripts/mod/mod-partner.list \
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -919,8 +919,6 @@ Source77: partial-clang_lto-aarch64-debug-snip.config
Source80: generate_all_configs.sh
Source81: process_configs.sh
-Source82: update_scripts.sh
-
Source84: mod-internal.list
Source85: mod-partner.list
@@ -1859,20 +1857,27 @@ done
%endif
RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS
%{specrpmversion}
-cp %{SOURCE82} .
-RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
-
# We may want to override files from the primary target in case of building
# against a flavour of it (eg. centos not rhel), thus override it here if
# necessary
+update_scripts() {
+ TARGET="$1"
+
+ for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
+ NEW=${i%."$TARGET"}
+ cp "$i" "$(basename "$NEW")"
+ done
+}
+
+update_target=%{primary_target}
if [ "%{primary_target}" == "rhel" ]; then
+: # no-op to avoid empty if-fi error
%if 0%{?centos}
echo "Updating scripts/sources to centos version"
- RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos
-%else
- echo "Not updating scripts/sources to centos version"
+ update_target=centos
%endif
fi
+update_scripts $update_target
# end of kernel config
%endif
diff --git a/redhat/scripts/update_scripts.sh b/redhat/scripts/update_scripts.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/scripts/update_scripts.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
- exit 1
-fi
-
-TARGET="$1"
-
-for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
- NEW=${i%."$TARGET"}
- cp "$i" "$(basename "$NEW")"
-done
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2769
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv6 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1626463715 With the current version of tar AFAICT, the "J" isn't necessary. Yeah, that surprised me too. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv6 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv6 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv6 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv6 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 27 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 27 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -832,6 +832,7 @@ S: Supported F: drivers/dax/ DEVICE MAPPER SUPPORT +M: Benjamin Marzinski M: Mike Snitzer S: Supported F: Documentation/device-mapper/ @@ -872,6 +873,7 @@ S: Supported F: fs/dlm/ DM and MD build and config files +M: Benjamin Marzinski M: Mike Snitzer M: Nigel Croxon S: Supported @@ -1629,6 +1631,7 @@ F:include/uapi/linux/kexec.h F: fs/proc/vmcore.c F: kernel/crash_*.c F: kernel/kexec* +F: kernel/Kconfig.kexec F: arch/x86/kernel/machine_kexec_*.c F: arch/x86/kernel/crash*.c F: arch/x86/kernel/kexec-bzimage64.c -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2765 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv3 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1618227797 Thanks. Both fixed. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv5 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv5 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv5 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv5 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv4 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv4 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv4 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv4 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABIDW_TARBALL) kabi-rhel9* kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel9* kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/scripts/rh-dist-git.sh | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 27 files changed, 63 insertions(+), 63 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3 2/3] redhat/scripts: Switch KABI tarballs to xz
From: Prarit Bhargava
redhat/scripts: Switch KABI tarballs to xz
Switch the KABI tarballs to xz.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/rh-dist-git.sh
+++ b/redhat/scripts/rh-dist-git.sh
@@ -41,8 +41,8 @@ echo "Unpacking from SRPM"
# upload tarballs
sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-abi-stablelists.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
-sed -i "/kernel-kabi-dw-.*.tar.bz2/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-abi-stablelists.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
+sed -i "/kernel-kabi-dw-.*.tar.xz/d"
"$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore};
upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL"
echo "Uploading new tarballs: $upload_list"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABIDW_TARBALL) kabi-rhel9* kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel9* kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
Re: [OS-BUILD PATCHv2 0/2] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760#note_1618114473 Oh, interesting. I've removed this commit and pushed a new version without it. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2 2/2] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCHv2 1/2] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABIDW_TARBALL) kabi-rhel9* kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel9* kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2 0/2] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 14 +++--- 26 files changed, 61 insertions(+), 61 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH 2/3] redhat/kernel.spec.template: Remove explicit xz as requirement
From: Prarit Bhargava redhat/kernel.spec.template: Remove explicit xz as requirement Remove the explicit xz as a requirement. This will be picked up by the %compression variable at the end of the line. Signed-off-by: Prarit Bhargava diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -657,7 +657,7 @@ Provides: installonlypkg(kernel) # List the packages used during the kernel build # BuildRequires: kmod, bash, coreutils, tar, git-core, which -BuildRequires: bzip2, xz, findutils, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk, %compression +BuildRequires: bzip2, findutils, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk, %compression BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH 1/3] redhat/kernel.spec.template: Switch KABI compression to xz
From: Prarit Bhargava
redhat/kernel.spec.template: Switch KABI compression to xz
Switch KABI compression to xz. There's no reason it has to be bz2.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -332,9 +332,9 @@ endif
TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz
TARBALL:=$(REDHAT)/$(TARFILE)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.xz
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.xz
# Taken from tools/lib/bpf/Makefile
SPECBPFTOOLVERSION:=$(shell \
@@ -603,14 +603,14 @@ $(TARBALL):
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABIDW_TARBALL) kabi-rhel9* kabi-current)
.PHONY: $(KABIDW_TARBALL)
$(KABIDW_TARBALL):
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version
2.13
@@ -716,11 +716,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp
setup-source dist-configs-check
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \
done
- @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)*
kabi-current)
+ @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel9* kabi-current)
@if [ ! -d $(KABIDW)/base ]; then \
mkdir -p $(KABIDW)/base; \
fi
- @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh)
+ @(cd kabi-dwarf && tar -cJf $(KABIDW_TARBALL) base run_kabi-dw.sh)
dist-sources: dist-kabi dist-kabi-dup sources-rh
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -943,8 +943,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
-Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+Source300: kernel-abi-stablelists-%{kabiversion}.tar.xz
+Source301: kernel-kabi-dw-%{kabiversion}.tar.xz
# RT specific virt module
Source400: mod-kvm.list
@@ -2172,10 +2172,10 @@ BuildKernel() {
# Don't build kabi base for debug kernels
if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI baseline dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2191,10 +2191,10 @@ BuildKernel() {
%if %{with_kabidwchk}
if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
-tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
+tar -xvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d
"$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists
-tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
+tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists
echo " GENERATING DWARF-based kABI dataset "
chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh
@@ -2939,7 +2939,7 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/
mkdir -p $INSTALL_KABI_PATH
# install kabi releases directories
-tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
+tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH
# with_kernel_abi_stablelists
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH 3/3] redhat/self-test: Update data for KABI xz change
From: Prarit Bhargava redhat/self-test: Update data for KABI xz change The extension on the KABI files has changed from bz2 to xz. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.xz LANG=C LOCVERFILE=../localversion MACH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -36,12 +36,12 @@ INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 INCLUDE_RT_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.xz KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu- /usr/bin/s390x-linux-gnu- KABI_CROSS_COMPILE_PREFIX=/usr/bin/ KABI_CROSS_COMPILE_SUFFIX=-linux-gnu- KABI_SUPPORTED_ARCHS=aarch64 ppc64le s390x x86_64
[OS-BUILD PATCH 0/3] redhat: Switch KABI file compression to xz
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2760 Switch the KABI compression from bz2 to xz to match other compression targets. Signed-off-by: Prarit Bhargava --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7| 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7| 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7| 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7| 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile| 12 ++-- redhat/kernel.spec.template| 16 26 files changed, 62 insertions(+), 62 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 17 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 17 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -152,6 +152,16 @@ M: Eder Zulian S: Supported F: Makefile.rhelver +RHEL 8.9 Kernel Maintainer +M: Patrick Talbert +S: Supported +F: Makefile.rhelver + +RHEL 8.9 Real Time Kernel Maintainer +M: John B. Wyatt IV +S: Supported +F: Makefile.rhelver + RHEL 8.8 Kernel Maintainer M: Lucas Zampieri S: Supported @@ -668,13 +678,15 @@ F:drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM -M: Ronnie Sahlberg -R: Benjamin Coddington -R: Jeffrey Layton -R: Steve Dickson -R: Scott Mayhew +M: Benjamin Coddington +M: Jeffrey Layton +M: Steve Dickson +M: Scott Mayhew S: Supported F: fs/cifs/ +F: fs/smb/client/ +F: fs/smb/common/ +F: include/uapi/linux/cifs/ CISCO FCOE HBA (fnic) M: Chris Leech @@ -727,7 +739,6 @@ F: drivers/connector/ Continuous Integration (CKI) M: Tales da Aparecida -M: Tino Calancha M: Michael Hofmann M: Serhii Turivnyi S: Supported @@ -821,6 +832,7 @@ S: Supported F: drivers/dax/ DEVICE MAPPER SUPPORT +M: Benjamin Marzinski M: Mike Snitzer S: Supported F: Documentation/device-mapper/ @@ -861,6 +873,7 @@ S: Supported F: fs/dlm/ DM and MD build and config files +M: Benjamin Marzinski M: Mike Snitzer M: Nigel Croxon S: Supported @@ -877,7 +890,6 @@ F: include/linux/dma-buf* DMA DRIVERS M: Jerry Snitselaar -M: David Arcari S: Supported F: drivers/dma/ @@ -1036,6 +1048,7 @@ X:fs/nfsd/ X: fs/overlayfs/ X: fs/proc/vmcore.c X: fs/pstore/ +X: fs/smb/ X: fs/squashfs/ X: fs/xfs/ X: fs/proc/namespaces.c @@ -1763,6 +1776,7 @@ R:Nico Pache R: Waiman Long R: Ricardo Robaina R: Audra Mitchell +R: David Hildenbrand S: Supported F: arch/arm64/mm/ F: arch/powerpc/mm/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2755 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 17 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 17 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -152,6 +152,16 @@ M: Eder Zulian S: Supported F: Makefile.rhelver +RHEL 8.9 Kernel Maintainer +M: Patrick Talbert +S: Supported +F: Makefile.rhelver + +RHEL 8.9 Real Time Kernel Maintainer +M: John B. Wyatt IV +S: Supported +F: Makefile.rhelver + RHEL 8.8 Kernel Maintainer M: Lucas Zampieri S: Supported @@ -668,13 +678,15 @@ F:drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM -M: Ronnie Sahlberg -R: Benjamin Coddington -R: Jeffrey Layton -R: Steve Dickson -R: Scott Mayhew +M: Benjamin Coddington +M: Jeffrey Layton +M: Steve Dickson +M: Scott Mayhew S: Supported F: fs/cifs/ +F: fs/smb/client/ +F: fs/smb/common/ +F: include/uapi/linux/cifs/ CISCO FCOE HBA (fnic) M: Chris Leech @@ -727,7 +739,6 @@ F: drivers/connector/ Continuous Integration (CKI) M: Tales da Aparecida -M: Tino Calancha M: Michael Hofmann M: Serhii Turivnyi S: Supported @@ -821,6 +832,7 @@ S: Supported F: drivers/dax/ DEVICE MAPPER SUPPORT +M: Benjamin Marzinski M: Mike Snitzer S: Supported F: Documentation/device-mapper/ @@ -861,6 +873,7 @@ S: Supported F: fs/dlm/ DM and MD build and config files +M: Benjamin Marzinski M: Mike Snitzer M: Nigel Croxon S: Supported @@ -877,7 +890,6 @@ F: include/linux/dma-buf* DMA DRIVERS M: Jerry Snitselaar -M: David Arcari S: Supported F: drivers/dma/ @@ -1036,6 +1048,7 @@ X:fs/nfsd/ X: fs/overlayfs/ X: fs/proc/vmcore.c X: fs/pstore/ +X: fs/smb/ X: fs/squashfs/ X: fs/xfs/ X: fs/proc/namespaces.c @@ -1763,6 +1776,7 @@ R:Nico Pache R: Waiman Long R: Ricardo Robaina R: Audra Mitchell +R: David Hildenbrand S: Supported F: arch/arm64/mm/ F: arch/powerpc/mm/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2755 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 16 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 16 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -152,6 +152,16 @@ M: Eder Zulian S: Supported F: Makefile.rhelver +RHEL 8.9 Kernel Maintainer +M: Patrick Talbert +S: Supported +F: Makefile.rhelver + +RHEL 8.9 Real Time Kernel Maintainer +M: John B. Wyatt IV +S: Supported +F: Makefile.rhelver + RHEL 8.8 Kernel Maintainer M: Lucas Zampieri S: Supported @@ -668,13 +678,15 @@ F:drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM -M: Ronnie Sahlberg -R: Benjamin Coddington -R: Jeffrey Layton -R: Steve Dickson -R: Scott Mayhew +M: Benjamin Coddington +M: Jeffrey Layton +M: Steve Dickson +M: Scott Mayhew S: Supported F: fs/cifs/ +F: fs/smb/client/ +F: fs/smb/common/ +F: include/uapi/linux/cifs/ CISCO FCOE HBA (fnic) M: Chris Leech @@ -727,7 +739,6 @@ F: drivers/connector/ Continuous Integration (CKI) M: Tales da Aparecida -M: Tino Calancha M: Michael Hofmann M: Serhii Turivnyi S: Supported @@ -877,7 +888,6 @@ F: include/linux/dma-buf* DMA DRIVERS M: Jerry Snitselaar -M: David Arcari S: Supported F: drivers/dma/ @@ -1036,6 +1046,7 @@ X:fs/nfsd/ X: fs/overlayfs/ X: fs/proc/vmcore.c X: fs/pstore/ +X: fs/smb/ X: fs/squashfs/ X: fs/xfs/ X: fs/proc/namespaces.c @@ -1763,6 +1774,7 @@ R:Nico Pache R: Waiman Long R: Ricardo Robaina R: Audra Mitchell +R: David Hildenbrand S: Supported F: arch/arm64/mm/ F: arch/powerpc/mm/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2752 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 16 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 16 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -152,6 +152,16 @@ M: Eder Zulian S: Supported F: Makefile.rhelver +RHEL 8.9 Kernel Maintainer +M: Patrick Talbert +S: Supported +F: Makefile.rhelver + +RHEL 8.9 Real Time Kernel Maintainer +M: John B. Wyatt IV +S: Supported +F: Makefile.rhelver + RHEL 8.8 Kernel Maintainer M: Lucas Zampieri S: Supported @@ -668,13 +678,15 @@ F:drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM -M: Ronnie Sahlberg -R: Benjamin Coddington -R: Jeffrey Layton -R: Steve Dickson -R: Scott Mayhew +M: Benjamin Coddington +M: Jeffrey Layton +M: Steve Dickson +M: Scott Mayhew S: Supported F: fs/cifs/ +F: fs/smb/client/ +F: fs/smb/common/ +F: include/uapi/linux/cifs/ CISCO FCOE HBA (fnic) M: Chris Leech @@ -727,7 +739,6 @@ F: drivers/connector/ Continuous Integration (CKI) M: Tales da Aparecida -M: Tino Calancha M: Michael Hofmann M: Serhii Turivnyi S: Supported @@ -877,7 +888,6 @@ F: include/linux/dma-buf* DMA DRIVERS M: Jerry Snitselaar -M: David Arcari S: Supported F: drivers/dma/ @@ -1036,6 +1046,7 @@ X:fs/nfsd/ X: fs/overlayfs/ X: fs/proc/vmcore.c X: fs/pstore/ +X: fs/smb/ X: fs/squashfs/ X: fs/xfs/ X: fs/proc/namespaces.c @@ -1763,6 +1774,7 @@ R:Nico Pache R: Waiman Long R: Ricardo Robaina R: Audra Mitchell +R: David Hildenbrand S: Supported F: arch/arm64/mm/ F: arch/powerpc/mm/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2751 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 16 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 16 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -152,6 +152,16 @@ M: Eder Zulian S: Supported F: Makefile.rhelver +RHEL 8.9 Kernel Maintainer +M: Patrick Talbert +S: Supported +F: Makefile.rhelver + +RHEL 8.9 Real Time Kernel Maintainer +M: John B. Wyatt IV +S: Supported +F: Makefile.rhelver + RHEL 8.8 Kernel Maintainer M: Lucas Zampieri S: Supported @@ -668,13 +678,15 @@ F:drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM -M: Ronnie Sahlberg -R: Benjamin Coddington -R: Jeffrey Layton -R: Steve Dickson -R: Scott Mayhew +M: Benjamin Coddington +M: Jeffrey Layton +M: Steve Dickson +M: Scott Mayhew S: Supported F: fs/cifs/ +F: fs/smb/client/ +F: fs/smb/common/ +F: include/uapi/linux/cifs/ CISCO FCOE HBA (fnic) M: Chris Leech @@ -727,7 +739,6 @@ F: drivers/connector/ Continuous Integration (CKI) M: Tales da Aparecida -M: Tino Calancha M: Michael Hofmann M: Serhii Turivnyi S: Supported @@ -877,7 +888,6 @@ F: include/linux/dma-buf* DMA DRIVERS M: Jerry Snitselaar -M: David Arcari S: Supported F: drivers/dma/ @@ -1036,6 +1046,7 @@ X:fs/nfsd/ X: fs/overlayfs/ X: fs/proc/vmcore.c X: fs/pstore/ +X: fs/smb/ X: fs/squashfs/ X: fs/xfs/ X: fs/proc/namespaces.c @@ -1763,6 +1774,7 @@ R:Nico Pache R: Waiman Long R: Ricardo Robaina R: Audra Mitchell +R: David Hildenbrand S: Supported F: arch/arm64/mm/ F: arch/powerpc/mm/ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2750 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] enable CONFIG_ADDRESS_MASKING for x86_64
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2735#note_1589699422 Could this break crash and other debug utilities? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Oct 2 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Oct 2 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -81,12 +81,23 @@ F: redhat/ X: redhat/configs/ CentOS Stream 9 Kernel Maintainer -M: Jan Stancek +M: Scott Weaver S: Supported F: Makefile.rhelver T: git https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git CentOS Stream 9 Real Time Kernel Maintainer +M: Eder Zulian +M: Derek Barbosa +S: Supported +F: Makefile.rhelver + +RHEL 9.3 Kernel Maintainer +M: Jan Stancek +S: Supported +F: Makefile.rhelver + +RHEL 9.3 Real Time Kernel Maintainer M: Luis Claudio Goncalves S: Supported F: Makefile.rhelver @@ -237,7 +248,7 @@ S: Supported F: drivers/net/ethernet/realtek/8139cp.c 8169 10/100/1000 GIGABIT ETHERNET DRIVER (r8169) -M: José Ignacio Tornos Martínez +M: Izabela Bakollari S: Supported F: drivers/net/ethernet/realtek/r8169* @@ -524,11 +535,10 @@ F:include/uapi/linux/if_bonding.h F: tools/testing/selftests/drivers/net/bonding/ BPF (Safe dynamic programs and tools) -M: Yauheni Kaliuta +M: Artem Savkov R: Jerome Marchand R: Jiri Benc R: Viktor Malik -R: Artem Savkov S: Supported F: arch/*/net/* F: Documentation/networking/filter.txt @@ -611,6 +621,7 @@ CAN BUS M: Radu Rendec S: Supported F: Documentation/networking/can.rst +F: Documentation/networking/can_ucan_protocol.rst F: include/linux/can/ F: include/uapi/linux/can/ F: include/uapi/linux/can.h @@ -1673,6 +1684,7 @@ F:include/linux/rwsem*.h F: include/linux/seqlock.h F: include/linux/spinlock*.h F: lib/locking*.[ch] +F: kernel/Kconfig.locks F: kernel/locking/ LSI 3ware SAS/SATA-RAID Linux Drive (3w-sas) @@ -1742,7 +1754,6 @@ F:include/linux/memory_hotplug.h MEMORY MANAGEMENT M: Rafael Aquini R: Aristeu Rozanski -R: Artem Savkov R: Baoquan He R: Christoph von Recklinghausen R: Donald Dutile @@ -2050,6 +2061,7 @@ F:tools/testing/selftests/net/ F: tools/testing/selftests/wireguard/ X: Documentation/networking/arcnet* X: Documentation/networking/can.rst +X: Documentation/networking/can_ucan_protocol.rst X: Documentation/networking/device_drivers/ X: Documentation/networking/devlink/ X: Documentation/networking/dsa/ @@ -2144,6 +2156,7 @@ I:net NETWORKING [TUNTAP] M: Jason Wang S: Supported +F: Documentation/networking/tuntap.* F: drivers/net/tap.c F: drivers/net/tun.c F: include/linux/if_tap.h @@ -2339,6 +2352,7 @@ M:Michael Petlan R: Jerome Marchand R: Yauheni Kaliuta R: Cestmir Kalina +R: Artem Savkov S: Supported F: kernel/events/ F: include/linux/perf_event.h @@ -2998,6 +3012,7 @@ F:include/linux/virtio_vsock.h F: include/net/af_vsock.h F: include/net/vsock_addr.h F: include/uapi/linux/virtio_vsock.h +F: include/uapi/linux/vm_sockets_diag.h F: include/uapi/linux/vsockmon.h F: net/vmw_vsock/ F: drivers/net/vsockmon.c @@ -3195,7 +3210,6 @@ F:arch/x86/include/asm/fpu/ F: arch/x86/kernel/fpu/ XDP (eXpress Data Path) -M: Jesper Dangaard Brouer M: Jiri Benc M: Toke Høiland-Jørgensen S: Supported -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2733 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3 3/3] redhat/self-test: Update data for cross compile fields
From: Prarit Bhargava redhat/self-test: Update data for cross compile fields Add CROSS_DISABLED_SUBPACKAGES and update .DEFAULT_GOAL, which now points to dist-cross-setup. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -1,4 +1,4 @@
[OS-BUILD PATCHv3 2/3] redhat/Makefile.cross: Add message for disabled subpackages
From: Prarit Bhargava redhat/Makefile.cross: Add message for disabled subpackages Add a message for the disabled subpackages. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -13,30 +13,31 @@ CROSS_PACKAGE_LIST += binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu # s390x packages CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu -dist-cross-download: +dist-cross-setup: @if [ "$(ARCHCONFIG)" != "X86_64" ]; then \ echo "$(ARCHCONFIG) ERROR: cross compile only enabled for x86_64"; \ exit 1; \ fi; @ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \ $(REDHAT)/scripts/cross-compile/download_cross.sh $(CROSS_PACKAGE_LIST) + @echo "INFO: Adding $(CROSS_DISABLED_SUBPACKAGES) to cross compile targets. These subpackages cannot be built with the existing cross toolchains." -dist-cross-aarch64-rpms: dist-cross-download dist-sources +dist-cross-aarch64-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" -dist-cross-ppc64le-rpms: dist-cross-download dist-sources +dist-cross-ppc64le-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" -dist-cross-s390x-rpms: dist-cross-download dist-sources +dist-cross-s390x-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" -dist-cross-all-rpms: dist-cross-download dist-sources +dist-cross-all-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) @@ -44,22 +45,22 @@ dist-cross-all-rpms: dist-cross-download dist-sources $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" -dist-cross-aarch64-build: dist-cross-download dist-sources +dist-cross-aarch64-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" -dist-cross-ppc64le-build: dist-cross-download dist-sources +dist-cross-ppc64le-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le" -dist-cross-s390x-build: dist-cross-download dist-sources +dist-cross-s390x-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" -dist-cross-all-builds: dist-cross-download dist-sources +dist-cross-all-builds: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3 1/3] redhat/Makefile.cross: Update cross targets with disabled subpackages
From: Prarit Bhargava redhat/Makefile.cross: Update cross targets with disabled subpackages The bpftool, perf, and tools subpackages require architecture-specific packages and currently cannot be built with the existing cross compiler packages. Disable them for cross compiler builds. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,5 +1,7 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools + CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ glibc-static ncurses-devel numactl-devel rng-tools @@ -21,46 +23,46 @@ dist-cross-download: dist-cross-aarch64-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" dist-cross-ppc64le-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" dist-cross-s390x-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" dist-cross-all-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" dist-cross-aarch64-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" dist-cross-ppc64le-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le" dist-cross-s390x-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" dist-cross-all-builds: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc
[OS-BUILD PATCHv3 0/3] redhat/Makefile.cross: Disable subpackages
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723 There are subpackages that won't compile due to architectural differences and cross compiling packaging issues. Disable these packages from cross compiling. This shouldn't be a shock as CKI is not building these in cross compiles either. Signed-off-by: Prarit Bhargava --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 3 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 3 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 3 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 3 +- redhat/self-test/data/rhel-2585cf9dfaad.el7| 3 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/rhel-78e36f3b0dae.el7| 3 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/rhel-df0cc57e057f.el7| 3 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/rhel-fce15c45d3fb.el7| 3 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 3 +- redhat/Makefile.cross | 45 + 25 files changed, 72 insertions(+), 45 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2 3/3] redhat/self-test: Update data for cross compile fields
From: Prarit Bhargava redhat/self-test: Update data for cross compile fields Add CROSS_DISABLED_SUBPACKAGES and update .DEFAULT_GOAL, which now points to dist-cross-setup. Signed-off-by: Prarit Bhargava diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -1,4 +1,4 @@
[OS-BUILD PATCHv2 1/3] redhat/Makefile.cross: Update cross targets with disabled subpackages
From: Prarit Bhargava redhat/Makefile.cross: Update cross targets with disabled subpackages The bpftool, perf, and tools subpackages require architecture-specific packages and currently cannot be built with the existing cross compiler packages. Disable them for cross compiler builds. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,5 +1,7 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools + CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ glibc-static ncurses-devel numactl-devel rng-tools @@ -21,46 +23,46 @@ dist-cross-download: dist-cross-aarch64-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" dist-cross-ppc64le-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" dist-cross-s390x-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" dist-cross-all-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" dist-cross-aarch64-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" dist-cross-ppc64le-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le" dist-cross-s390x-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" dist-cross-all-builds: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc
[OS-BUILD PATCHv2 2/3] redhat/Makefile.cross: Add message for disabled subpackages
From: Prarit Bhargava redhat/Makefile.cross: Add message for disabled subpackages Add a message for the disabled subpackages. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -13,30 +13,31 @@ CROSS_PACKAGE_LIST += binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu # s390x packages CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu -dist-cross-download: +dist-cross-setup: @if [ "$(ARCHCONFIG)" != "X86_64" ]; then \ echo "$(ARCHCONFIG) ERROR: cross compile only enabled for x86_64"; \ exit 1; \ fi; @ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \ $(REDHAT)/scripts/cross-compile/download_cross.sh $(CROSS_PACKAGE_LIST) + @echo "INFO: Adding $(CROSS_DISABLED_SUBPACKAGES) to cross compile targets. These subpackages cannot be built with the existing cross toolchains." -dist-cross-aarch64-rpms: dist-cross-download dist-sources +dist-cross-aarch64-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" -dist-cross-ppc64le-rpms: dist-cross-download dist-sources +dist-cross-ppc64le-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" -dist-cross-s390x-rpms: dist-cross-download dist-sources +dist-cross-s390x-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" -dist-cross-all-rpms: dist-cross-download dist-sources +dist-cross-all-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) @@ -44,22 +45,22 @@ dist-cross-all-rpms: dist-cross-download dist-sources $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" -dist-cross-aarch64-build: dist-cross-download dist-sources +dist-cross-aarch64-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" -dist-cross-ppc64le-build: dist-cross-download dist-sources +dist-cross-ppc64le-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le" -dist-cross-s390x-build: dist-cross-download dist-sources +dist-cross-s390x-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" -dist-cross-all-builds: dist-cross-download dist-sources +dist-cross-all-builds: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2 0/3] redhat/Makefile.cross: Disable subpackages
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723 There are subpackages that won't compile due to architectural differences and cross compiling packaging issues. Disable these packages from cross compiling. This shouldn't be a shock as CKI is not building these in cross compiles either. Signed-off-by: Prarit Bhargava --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 3 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 3 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 3 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 3 +- redhat/self-test/data/rhel-2585cf9dfaad.el7| 3 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/rhel-78e36f3b0dae.el7| 3 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/rhel-df0cc57e057f.el7| 3 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/rhel-fce15c45d3fb.el7| 3 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 3 +- redhat/Makefile.cross | 45 + 25 files changed, 72 insertions(+), 45 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv3] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720#note_1572901766 Ah thanks :) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv3] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720#note_1572279089 I've fixed this in the latest push. But the MR still seems to fail but I can't see an actual test failure? @mh21 any ideas? I just see a red x with no actual test. https://gitlab.com/redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki- trusted-contributors/-/pipelines/1012307469 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH 2/2] redhat/Makefile.cross: Add message for disabled subpackages
From: Prarit Bhargava redhat/Makefile.cross: Add message for disabled subpackages Add a message for the disabled subpackages. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -13,30 +13,31 @@ CROSS_PACKAGE_LIST += binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu # s390x packages CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu -dist-cross-download: +dist-cross-setup: @if [ "$(ARCHCONFIG)" != "X86_64" ]; then \ echo "$(ARCHCONFIG) ERROR: cross compile only enabled for x86_64"; \ exit 1; \ fi; @ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \ $(REDHAT)/scripts/cross-compile/download_cross.sh $(CROSS_PACKAGE_LIST) + @echo "INFO: Adding $(CROSS_DISABLED_SUBPACKAGES) to cross compile targets. These subpackages cannot be built with the existing cross toolchains." -dist-cross-aarch64-rpms: dist-cross-download dist-sources +dist-cross-aarch64-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" -dist-cross-ppc64le-rpms: dist-cross-download dist-sources +dist-cross-ppc64le-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" -dist-cross-s390x-rpms: dist-cross-download dist-sources +dist-cross-s390x-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" -dist-cross-all-rpms: dist-cross-download dist-sources +dist-cross-all-rpms: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) @@ -44,22 +45,22 @@ dist-cross-all-rpms: dist-cross-download dist-sources $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" -dist-cross-aarch64-build: dist-cross-download dist-sources +dist-cross-aarch64-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" -dist-cross-ppc64le-build: dist-cross-download dist-sources +dist-cross-ppc64le-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le" -dist-cross-s390x-build: dist-cross-download dist-sources +dist-cross-s390x-build: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" -dist-cross-all-builds: dist-cross-download dist-sources +dist-cross-all-builds: dist-cross-setup dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH 1/2] redhat/Makefile.cross: Update cross targets with disabled subpackages
From: Prarit Bhargava redhat/Makefile.cross: Update cross targets with disabled subpackages The bpftool, perf, and tools subpackages require architecture-specific packages and currently cannot be built with the existing cross compiler packages. Disable them for cross compiler builds. Signed-off-by: Prarit Bhargava diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,5 +1,7 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools + CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ glibc-static ncurses-devel numactl-devel rng-tools @@ -21,46 +23,46 @@ dist-cross-download: dist-cross-aarch64-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" dist-cross-ppc64le-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" dist-cross-s390x-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" dist-cross-all-rpms: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE) $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" dist-cross-aarch64-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64" dist-cross-ppc64le-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le" dist-cross-s390x-build: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x" dist-cross-all-builds: dist-cross-download dist-sources $(REDHAT)/scripts/cross-compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE) + $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc
[OS-BUILD PATCH 0/2] redhat/Makefile.cross: Disable subpackages
From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723 There are subpackages that won't compile due to architectural differences and cross compiling packaging issues. Disable these packages from cross compiling. This shouldn't be a shock as CKI is not building these in cross compiles either. Signed-off-by: Prarit Bhargava --- redhat/Makefile.cross | 45 - 1 files changed, 24 insertions(+), 21 deletions(-) ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH 0/2] Add rpmbuild --without base option
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719#note_1569939433 I'm with @tales-aparecida on ths, please fixup the commit. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv3] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -298,8 +298,6 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-# selftests turns on bpftool
-%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
%define with_arm64_64k 0
@@ -445,9 +443,9 @@ Summary: The Linux kernel
%define use_vdso 1
%endif
-# selftests require bpftool to be built
-%if %{with_selftests}
-%define with_bpftool 1
+# selftests require bpftool to be built. If bpftools is disabled, then
disable selftests
+%if %{with_bpftool} == 0
+%define with_selftests 0
%endif
%ifnarch noarch
@@ -2716,12 +2714,14 @@ if [ -f $DevelDir/vmlinux.h ]; then
RPM_VMLINUX_H=$DevelDir/vmlinux.h
fi
+%if %{with_bpftool}
%global bpftool_make \
%{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}"
EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts}
VMLINUX_H="${RPM_VMLINUX_H}" V=1
-%if %{with_bpftool}
pushd tools/bpf/bpftool
%{bpftool_make}
popd
+%else
+echo "bpftools disabled ... disabling selftests"
%endif
%if %{with_selftests}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720#note_1569520971 Odd .. this seems to have failed a CI check. Looking into it now. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720#note_1567874681 I updated the message to be a bit more generic. Instead of referencing 'without bpftool' the rpm log will output 'bpftools disabled ... disabling selftests' I've also removed another selftests & bpftools reference. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -298,8 +298,6 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-# selftests turns on bpftool
-%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
%define with_arm64_64k 0
@@ -445,9 +443,10 @@ Summary: The Linux kernel
%define use_vdso 1
%endif
-# selftests require bpftool to be built
-%if %{with_selftests}
-%define with_bpftool 1
+# selftests require bpftool to be built. If bpftools is disabled, then
disable selftests
+%if %{with_bpftool} == 0
+%{echo:bpftools disabled ... disabling selftests}
+%define with_selftests 0
%endif
%ifnarch noarch
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720#note_1567706714
Yeah, TBH, I was thinking this might be better?
```
# selftests require bpftool to be built
%if %{with_bpftool} == 0
%{echo:Disabling selftests build: '--without bpftool' specified}
%define with_selftests 0
%endif
```
@jstancek what do you think?
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] kernel.spec.template: Fix --without bpftool
From: Prarit Bhargava
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -447,8 +447,13 @@ Summary: The Linux kernel
# selftests require bpftool to be built
%if %{with_selftests}
+%if %{with_bpftool} == 0
+%{echo:Disabling selftests build: '--without bpftool' specified}
+%define with_selftests 0
+%else
%define with_bpftool 1
%endif
+%endif
%ifnarch noarch
%define with_kernel_abi_stablelists 0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Sep 15 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Sep 15 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -136,7 +136,8 @@ S: Supported F: Makefile.rhelver CentOS Stream 8 Real Time Kernel Maintainer -M: John B. Wyatt IV +M: Derek Barbosa +M: Eder Zulian S: Supported F: Makefile.rhelver @@ -298,7 +299,6 @@ R: Kamal Heib R: Stefan Assmann R: Corinna Vinschen R: Ivan Vecera -R: Íñigo Huguet R: Izabela Bakollari S: Supported F: Documentation/networking/ena.txt @@ -336,7 +336,7 @@ F: arch/x86/include/asm/sev*.h F: arch/x86/kernel/sev*.[cS] AQUANTIA ATLANTIC ETHERNET DRIVER -M: Íñigo Huguet +M: Dan Campbell R: Michal Schmidt R: Petr Oros R: Ken Cox @@ -512,7 +512,6 @@ R: Kamal Heib R: Stefan Assmann R: Corinna Vinschen R: Ivan Vecera -R: Íñigo Huguet R: Izabela Bakollari S: Supported F: Documentation/networking/bonding.rst @@ -619,12 +618,12 @@ F:drivers/net/can/ F: net/can/ CAVIUM LIQUIDIO NETWORK DRIVER -M: Íñigo Huguet +M: Izabela Bakollari S: Supported F: drivers/net/ethernet/cavium/liquidio/ CAVIUM THUNDERX NETWORK DRIVER -M: Íñigo Huguet +M: Izabela Bakollari S: Supported F: drivers/net/ethernet/cavium/thunder/ F: drivers/net/ethernet/cavium/common/ @@ -924,7 +923,6 @@ R: Kamal Heib R: Stefan Assmann R: Corinna Vinschen R: Ivan Vecera -R: Íñigo Huguet R: Izabela Bakollari S: Supported F: drivers/net/ethernet/ @@ -941,7 +939,7 @@ F: include/uapi/linux/if_bridge.h F: include/uapi/linux/mrp_bridge.h ETHERNET PHY LIBRARY -M: Íñigo Huguet +M: Izabela Bakollari R: Michal Schmidt R: Petr Oros R: Ken Cox @@ -950,7 +948,6 @@ R: Kamal Heib R: Stefan Assmann R: Corinna Vinschen R: Ivan Vecera -R: Izabela Bakollari S: Supported F: Documentation/networking/phy.rst F: drivers/net/mdio/ @@ -1257,7 +1254,6 @@ R:José Ignacio Tornos Martínez R: Stefan Assmann R: Corinna Vinschen R: Ivan Vecera -R: Íñigo Huguet R: Izabela Bakollari S: Supported F: drivers/infiniband/ @@ -1319,7 +1315,6 @@ R:Kamal Heib R: Stefan Assmann R: Corinna Vinschen R: Ivan Vecera -R: Íñigo Huguet R: Izabela Bakollari S: Supported F: drivers/net/ethernet/intel/ice/ @@ -1918,7 +1913,6 @@ R:José Ignacio Tornos Martínez R: Kamal Heib R: Stefan Assmann R: Corinna Vinschen -R: Íñigo Huguet R: Izabela Bakollari S: Supported F: Documentation/devicetree/bindings/net/dsa/ @@ -2523,7 +2517,7 @@ S:Supported F: drivers/net/ethernet/qlogic/qlge/ QUALCOMM IPC ROUTER -M: Íñigo Huguet +M: José Ignacio Tornos Martínez R: Jarod Wilson R: John Linville S: Provided @@ -2697,7 +2691,7 @@ F:include/linux/ata.h F: include/linux/libata.h SFC NETWORK DRIVER -M: Íñigo Huguet +M: Izabela Bakollari R: Jarod Wilson S: Supported F: drivers/net/ethernet/sfc/ @@ -3110,7 +3104,6 @@ F:Documentation/networking/device_drivers/wan/ WIRELESS DRIVERS AND STACK M: José Ignacio Tornos Martínez -M: Íñigo Huguet R: Jarod Wilson R: John Linville R: Michal Schmidt -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2718 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat/docs: Add a mention of bugzilla for bugs
From: Prarit Bhargava redhat/docs: Add a mention of bugzilla for bugs RHEL has moved to Jira, and it is important to let users know that Fedora remains on Bugzilla. Add a section on reporting bugs that points users to Bugzilla. Signed-off-by: Prarit Bhargava diff --git a/redhat/docs/submitting-contributions.rst b/redhat/docs/submitting-contributions.rst index blahblah..blahblah 100644 --- a/redhat/docs/submitting-contributions.rst +++ b/redhat/docs/submitting-contributions.rst @@ -33,6 +33,11 @@ enforced by CI. You can check your changes locally with:: make SPHINXOPTS="-W" html +Reporting Bugs +== + +Fedora bugs are only tracked in Red Hat's Bugzilla instance. Fedora kernel bugs can be filed at https://bugzilla.redhat.com/ under Product "Fedora" and Component "kernel". Please try to be as detailed as possible when reporting a bug. The more detailed you are, the more likely it is that your bug will be resolved. + Patches === -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2715 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv8 0/4] redhat: Keep track of SPDX-License-Identifier tags in the code
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648#note_1544261877 @ptalbert is this waiting on anything else? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] RHMAINTAINERS: Update for Sep 1 2023
From: Prarit Bhargava RHMAINTAINERS: Update for Sep 1 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -72,8 +72,8 @@ S:Supported F: Makefile.rhelver Automotive Stream Distribution Kernel Maintainer +M: Jarod Wilson M: Julio Faracco -M: Scott Weaver S: Supported F: makefile F: Makefile.rhelver @@ -463,8 +463,8 @@ F: include/uapi/linux/audit.h F: kernel/audit* AUTOMOTIVE +M: Jarod Wilson M: Julio Faracco -M: Scott Weaver R: Adrien Thierry R: Alessandro Carminati R: Andrew Halaney @@ -828,6 +828,7 @@ R: Ivan Vecera S: Supported F: Documentation/networking/devlink/ F: net/core/devlink.c +F: net/devlink/ F: include/net/devlink.h F: include/uapi/linux/devlink.h @@ -902,6 +903,17 @@ M: Ewan D. Milne S: Supported F: drivers/scsi/lpfc/ +EROFS FILE SYSTEM +M: Andrew Halaney +M: Lucas Karpinski +M: Alexander Larsson +R: Brian Foster +R: Carlos Maiolino +R: Miklos Szeredi +S: Internal +F: Documentation/filesystems/erofs.rst +F: fs/erofs/ + ETHERNET M: Michal Schmidt R: Jarod Wilson @@ -922,8 +934,11 @@ ETHERNET BRIDGE M: Ivan Vecera M: Hangbin Liu S: Supported +F: Documentation/networking/bridge.rst F: net/bridge/ F: include/linux/if_bridge.h +F: include/uapi/linux/if_bridge.h +F: include/uapi/linux/mrp_bridge.h ETHERNET PHY LIBRARY M: Íñigo Huguet @@ -1835,6 +1850,9 @@ F:drivers/mmc/ MODULES M: Prarit Bhargava +R: Audra Mitchell +R: Donald Dutile +R: Rafael Aquini S: Supported F: kernel/module/ F: kernel/module_signature.c @@ -1865,15 +1883,23 @@ F: tools/testing/selftests/rlimits/ NETFILTER M: Florian Westphal S: Supported +F: Documentation/networking/ipvs-sysctl.* +F: Documentation/networking/netfilter-sysctl.* +F: Documentation/networking/nf_conntrack-sysctl.* +F: Documentation/networking/nf_flowtable.* +F: Documentation/networking/tproxy.* F: net/netfilter/ -F: net/*/netfilter* +F: net/*/*netfilter* F: include/linux/netfilter* F: include/net/netfilter/ +F: include/uapi/linux/ip_vs.h F: include/uapi/linux/netfilter* +F: include/net/ip_vs.h F: include/net/netns/conntrack.h F: include/net/netns/netfilter.h F: include/net/netns/nftables.h F: include/net/netns/x_tables.h +F: tools/testing/selftests/netfilter/ NETWORK LOCK MANAGER (lockd) M: Benjamin Coddington @@ -1953,9 +1979,11 @@ F: include/linux/eth* F: include/linux/filter.h F: include/linux/icmp* F: include/linux/if* +F: include/linux/igmp.h F: include/linux/in[.6e]* F: include/linux/ip.h F: include/linux/ipv6* +F: include/linux/l2tp.h F: include/linux/llc.h F: include/linux/mroute* F: include/linux/net* @@ -1971,48 +1999,78 @@ F: include/linux/sock* F: include/linux/tcp.h F: include/linux/tfrc.h F: include/linux/udp.h +F: include/uapi/asm-generic/socket.h +F: include/uapi/linux/*diag.h +F: include/uapi/linux/dcbnl.h F: include/uapi/linux/devlink.h +F: include/uapi/linux/erspan.h F: include/uapi/linux/eth* +F: include/uapi/linux/fib_rules.h F: include/uapi/linux/filter.h +F: include/uapi/linux/gen_stats.h F: include/uapi/linux/genetlink.h F: include/uapi/linux/hsr_netlink.h F: include/uapi/linux/icmp* F: include/uapi/linux/if* +F: include/uapi/linux/igmp.h F: include/uapi/linux/in[.6e]* +F: include/uapi/linux/in_route.h F: include/uapi/linux/ip[._sv6]* +F: include/uapi/linux/l2tp.h F: include/uapi/linux/llc.h F: include/uapi/linux/lwtunnel.h +F: include/uapi/linux/mpls.h +F: include/uapi/linux/mpls_iptunnel.h +F: include/uapi/linux/mptcp.h F: include/uapi/linux/mroute* +F: include/uapi/linux/mrp_bridge.h +F: include/uapi/linux/neighbour.h F: include/uapi/linux/net* F: include/uapi/linux/netlink* +F: include/uapi/linux/nexthop.h F: include/uapi/linux/openvswitch.h +F: include/uapi/linux/pfkeyv2.h F: include/uapi/linux/pkt_* F: include/uapi/linux/ppp-comp.h F: include/uapi/linux/ppp_defs.h F: include/uapi/linux/ppp-ioctl.h +F: include/uapi/linux/psample.h +F: include/uapi/linux/route.h +F: include/uapi/linux/rpl.h +F: include/uapi/linux/rpl_iptunnel.h F: include/uapi/linux/rtnetlink.h F: include/uapi/linux/sctp.h F: include/uapi/linux/seg6* +F: include/uapi/linux/snmp.h F: include/uapi/linux/sock* F: include/uapi/linux/tc_*/* F: include/uapi/linux/tcp* +F:
Re: [OS-BUILD PATCHv7 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648#note_1539248727 Daniel, the test failure instructions state: ``` ERROR: The kernel RPM spec file License: field does not match the licenses available in the source tree. Fedora, Centos Stream, and RHEL require that the RPM License field match the licenses in the source tree. See https://docs.fedoraproject.org/en-US/legal/license-approval/ for further information. A list of licenses can be generated by executing the redhat/scripts/license/kspdx.py utility. New licenses can be added to the RPM License field only if they are listed in the Allowed Licenses list https://docs.fedoraproject.org/en-US/legal/allowed-licenses/). Licenses cannot be added if they are in the 'Not Allowed' Licenses (https://docs.fedoraproject.org/en-US/legal/not- allowed-licenses/). Licenses can be added to the 'Allowed' or 'Not Allowed' Licenses by following the License Review Process (https://docs.fedoraproject.org/en-US/legal/license-review-process/)." ``` I think that is clear enough on our expectations for licensing. If we find something that doesn't line up with the Fedora Approved Licenses then we will follow the Fedora process for getting that license approved, or making sure the code is never 'compiled' into Fedora (or RHEL of course). If the License is unapproved, it also warrants a discussion with upstream on their decision to include the code. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv7 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648#note_1539242419 >Bottom line: I think we can converge on removing 'redistributable' and adding a sentinel to prevent accidental CONFIG_COPS/CONFIG_COPS_DAYNA enabling in the future (like an explicitly disabled config mentioning dubious license). Agreed. Let's do this and move this MR forward. I'll also start a thread on LKML about the appletalk fw license. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv7 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648#note_1539241008 Agreed, however, the purpose of this MR is to obtain a 'more correct' list of licenses in the kernel and output them in the License field of the RPMs. There are certainly going to be some cases where we're not sure what the right thing to do is, some entries that need more investigation, etc. I don't think it's correct to compare to other distros as they may have modified licenses. The ONLY place I'm comfortable looking at as a 'source of truth' is Linus' upstream repository. Here's my proposal: Let's remove the "Redistributable, no modification permitted" (sorry @vkuznets for reversing course on that), and add an issue to track the missing SPDX license header in the appletalk fw, as well as any other issues we find. I can coordinate with upstream to figure out what the license should be and we can pick that up as we rebase. I don't think we're doing ourselves a favor by continuing to report "GPLv2 and Redistributable, no modification permitted" because we know that is absolutely incorrect. IMO even an incremental change here would be goo. https://gitlab.com/cki-project/kernel-ark/-/issues/131 Thoughts? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv7 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648#note_1537491218 @jstancek, this was rebased. Can you re-approve? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv4 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648#note_1535419840 @jstancek, can you approve? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] Fix tarball creation logic
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2658#note_1533599549 Maybe ``` # convert to short string sha ``` ? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org 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@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
